Changeset 1601 for XIOS/dev/dev_trunk_omp/src/node/field.cpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/node/field.cpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/node/field.cpp

@@ -343 +343 @@
     while (currentDate >= lastDataRequestedFromServer)
     {
-      info(20) << "currentDate : " << currentDate << endl ;
-      info(20) << "lastDataRequestedFromServer : " << lastDataRequestedFromServer << endl ;
-      info(20) << "file->output_freq.getValue() : " << file->output_freq.getValue() << endl ;
-      info(20) << "lastDataRequestedFromServer + file->output_freq.getValue() : " << lastDataRequestedFromServer + file->output_freq << endl ;
+      #pragma omp critical (_output)
+      {
+        info(20) << "currentDate : " << currentDate << endl ;
+        info(20) << "lastDataRequestedFromServer : " << lastDataRequestedFromServer << endl ;
+        info(20) << "file->output_freq.getValue() : " << file->output_freq.getValue() << endl ;
+        info(20) << "lastDataRequestedFromServer + file->output_freq.getValue() : " << lastDataRequestedFromServer + file->output_freq << endl ;
+      }
 
       dataRequested |= sendReadDataRequest(lastDataRequestedFromServer + file->output_freq);
@@ -502 +505 @@
     if (!nstepMaxRead)
     {
-       MPI_Allreduce(MPI_IN_PLACE, &nstepMax, 1, MPI_INT, MPI_MAX, context->server->intraComm);
+       MPI_Allreduce(&nstepMax, &nstepMax, 1, MPI_INT, MPI_MAX, context->server->intraComm);
        nstepMaxRead = true;
     }
@@ -919 +922 @@
      {
         areAllReferenceSolved = true;
-       
+
         if (context->hasClient && !context->hasServer)
         {