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

issm/trunk/src/c/modules/MaxVelx/MaxVelx.cpp

@@ -32 +32 @@
         }
 
-        #ifdef _PARALLEL_
         /*Figure out maximum across the cluster: */
+        #ifdef _HAVE_MPI_
         MPI_Reduce (&maxvel,&node_maxvel,1,MPI_DOUBLE,MPI_MAX,0,MPI_COMM_WORLD );
         MPI_Bcast(&node_maxvel,1,MPI_DOUBLE,0,MPI_COMM_WORLD);