Changeset 12330 for issm/trunk/src/c/Container/Constraints.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/Constraints.cpp (modified) (1 diff)

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

@@ -48 +48 @@
 
         /*figure out total number of constraints combining all the cpus (no clones here)*/
-        #ifdef _PARALLEL_
-        MPI_Reduce(&localconstraints,&numberofconstraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
-        MPI_Bcast(&numberofconstraints,1,MPI_INT,0,MPI_COMM_WORLD);
+        #ifdef _HAVE_MPI_
+                MPI_Reduce(&localconstraints,&numberofconstraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
+                MPI_Bcast(&numberofconstraints,1,MPI_INT,0,MPI_COMM_WORLD);
         #else
-        numberofconstraints=localconstraints;
+                numberofconstraints=localconstraints;
         #endif
+        
 
         return numberofconstraints;