Changeset 12011 for issm/trunk-jpl/src/c/modules/Dakotax/SpawnCore.cpp

Timestamp:

04/16/12 17:40:30 (13 years ago)

Author:

Eric.Larour

Message:

Preliminary commit of new issm version, where serial code is starting to be stripped away. Will not run before some major debugging is done

File:

• issm/trunk-jpl/src/c/modules/Dakotax/SpawnCore.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/Dakotax/SpawnCore.cpp

@@ -21 +21 @@
         /*Branch into a serial SpawnCore and a parallel SpawnCore: */
 
-        #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-                SpawnCoreSerial(responses, numresponses, variables, variables_descriptors,numvariables, (mxArray*)femmodel, counter);
-        #else
-                /*Call SpawnCoreParallel unless counter=-1 on cpu0, in which case, bail out and return 0: */
-                MPI_Bcast(&counter,1,MPI_INT,0,MPI_COMM_WORLD); 
-                if(counter==-1)return 0;
-                SpawnCoreParallel(responses, numresponses, variables, variables_descriptors,numvariables, (FemModel*)femmodel,counter);
-        #endif
+        /*Call SpawnCoreParallel unless counter=-1 on cpu0, in which case, bail out and return 0: */
+        MPI_Bcast(&counter,1,MPI_INT,0,MPI_COMM_WORLD); 
+        if(counter==-1)return 0;
+
+        SpawnCoreParallel(responses, numresponses, variables, variables_descriptors,numvariables, (FemModel*)femmodel,counter);
         return 1;
 }