Changeset 12330 for issm/trunk/src/c/Container/Elements.cpp

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/Container/Elements.cpp (modified) (6 diffs)

issm/trunk/src/c/Container/Elements.cpp

@@ -124 +124 @@
         }
 
-        #ifdef _PARALLEL_
         /*Synchronize across cluster, so as to not end up with different sizes for each patch on each cpu: */
+        #ifdef _HAVE_MPI_
         MPI_Reduce (&numvertices,&max_numvertices,1,MPI_INT,MPI_MAX,0,MPI_COMM_WORLD );
         MPI_Bcast(&max_numvertices,1,MPI_INT,0,MPI_COMM_WORLD);
@@ -193 +193 @@
 
                 /*Get rank of first cpu that has results*/
+                #ifdef _HAVE_MPI_
                 if(this->Size()) rank=my_rank;
                 else rank=num_procs;
                 MPI_Allreduce (&rank,&minrank,1,MPI_INT,MPI_MIN,MPI_COMM_WORLD);
+                #else
+                minrank=my_rank;
+                #endif
 
                 /*see what the first element of this partition has in stock (this is common to all partitions)*/
@@ -203 +207 @@
                         element->ListResultsInfo(&resultsenums,&resultssizes,&resultstimes,&resultssteps,&numberofresults);
                 }
+                #ifdef _HAVE_MPI_
                 MPI_Bcast(&numberofresults,1,MPI_DOUBLE,minrank,MPI_COMM_WORLD);
+                #endif
 
                 /*Get out if there is no results. Otherwise broadcast info*/
                 if(!numberofresults) return;
+                #ifdef _HAVE_MPI_
                 if(my_rank!=minrank){
                         resultsenums=(int*)xmalloc(numberofresults*sizeof(int));
@@ -217 +224 @@
                 MPI_Bcast(resultstimes,numberofresults,MPI_DOUBLE,minrank,MPI_COMM_WORLD);
                 MPI_Bcast(resultssteps,numberofresults,MPI_INT,minrank,MPI_COMM_WORLD);
+                #endif
 
                 /*Loop over all results and get nodal vector*/
@@ -250 +258 @@
 
                 /*Gather onto master cpu 0, if needed: */
-#ifdef _PARALLEL_
                 if(io_gather)patch->Gather();
-#endif
 
                 /*create result object and add to results dataset:*/
@@ -276 +282 @@
         int numberofelements;
 
-        #ifdef _PARALLEL_
         local_nelem=this->Size();
+        #ifdef _HAVE_MPI_
         MPI_Allreduce ( (void*)&local_nelem,(void*)&numberofelements,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
         #else
-        numberofelements=this->Size();
+        numberofelements=local_nelem;
         #endif