Clean examples for new API.

examples/pio/collectData.c

@@ -141,9 +141,6 @@ modelRun(MPI_Comm commModel)
 #endif
         }
     }
-#ifdef USE_MPI
-  pioEndTimestepping();
-#endif
   streamClose(streamID);
   vlistDestroy(vlistID);
   taxisDestroy(taxisID);

examples/pio/collectData2003.F90

@@ -220,12 +220,6 @@ CONTAINS
 #endif
     END DO
 
-#ifdef USE_MPI
-    ! For parallel IO:
-    ! Preparation for local cleanup
-    CALL pioEndTimestepping ()
-#endif
-
     !     Close the output stream
     CALL streamClose(streamID)
 

examples/pio/collectDataNStreams.c

@@ -163,13 +163,9 @@ modelRun(MPI_Comm commModel)
           hoursPassingHack(&vdate, &vtime, hourStep);
           taxisDefVdate(taxisID, vdate);
           taxisDefVtime(taxisID, vtime);
-          /* temporary fix for problem calling streamDefTimestep after
-           * streamWriteVarPart
-           * FIXME: this can be merged with the loop below again once
-           * per-stream RDMA windows are realized */
-          for (i = 0; i < nStreams; i++) streamDefTimestep(streamID[i], tsID);
           for (i = 0; i < nStreams; i++)
             {
+              streamDefTimestep(streamID[i], tsID);
               for (j = 0; j < nVars; j++)
                 {
 #ifdef USE_MPI
@@ -196,7 +192,6 @@ modelRun(MPI_Comm commModel)
     }
 
 #ifdef USE_MPI
-  pioEndTimestepping();
   for (size_t streamIdx = 0; streamIdx < (size_t) nStreams; ++streamIdx)
     for (size_t varIdx = 0; varIdx < (size_t) nVars; ++varIdx) xt_idxlist_delete(varDeco[streamIdx][varIdx].partDesc);
 #endif