Changeset 13589

Timestamp:

10/10/12 20:48:24 (12 years ago)

Author:

Eric.Larour

Message:

CHG: starting transition to model runs where the MPI_Comm is independent
of MPI_COMM_WORLD. To do so, we design a static class IssmComm, which
encapsulate the communicator for the FemModel. FemModel can set its communicator
using a SetStaticComm method.
Adapted EnvironmentInit to return the comm accordingly.
Also put PrintBanner inside the FemModel constructor, as it needs to know about the
communicator to print the banner.

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• classes/FemModel.cpp (modified) (3 diffs)
• classes/FemModel.h (modified) (2 diffs)
• classes/IoModel.cpp (modified) (1 diff)
• classes/IssmComm.cpp (added)
• classes/IssmComm.h (added)
• classes/classes.h (modified) (1 diff)
• include/globals.h (modified) (1 diff)
• include/types.h (modified) (1 diff)
• solutions/EnvironmentInit.cpp (modified) (2 diffs)
• solutions/PrintBanner.cpp (deleted)
• solutions/issm.cpp (modified) (2 diffs)
• solutions/solutions.h (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -68 +68 @@
                                         ./classes/objects/Vertex.cpp\
                                         ./classes/objects/AdolcEdf.h\
+                                        ./classes/IssmComm.h\
+                                        ./classes/IssmComm.cpp\
                                         ./classes/Hook.h\
                                         ./classes/Hook.cpp\
@@ -343 +345 @@
                                         ./modules/InputConvergencex/InputConvergencex.cpp\
                                         ./modules/InputConvergencex/InputConvergencex.h\
-                                        ./solutions/PrintBanner.cpp\
                                         ./solutions/convergence.cpp\
                                         ./solutions/ProcessArguments.cpp\

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -21 +21 @@
 /*Object constructors and destructor*/
 /*FUNCTION FemModel::FemModel(int argc,char** argv){{{*/
-FemModel::FemModel(int argc,char** argv){
+FemModel::FemModel(int argc,char** argv,COMM incomm){
 
         /*configuration: */
@@ -34 +34 @@
         char *petscfilename  = NULL;
         char *rootpath       = NULL;
+
+        /*First things first, store the communicator, and set it as a global variable: */
+        this->comm=incomm;
+        this->SetStaticComm();
+
+        /*Print starting banner:*/
+        this->PrintBanner();
 
         /*Start profiler: */
@@ -264 +271 @@
 }
 /*}}}*/
+/*FUNCTION FemModel::SetStaticComm {{{*/
+void FemModel::SetStaticComm(void){
+
+        /*This routine sets the global communicator variable hidden inside the IssmComm 
+         *class: */
+        IssmComm::SetComm(this->comm);
+
+}
+/*}}}*/
+/*FUNCTION FemModel::PrintBanner {{{*/
+void FemModel::PrintBanner(void){
+
+        _pprintLine_("");
+        _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION);
+        _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")");
+        _pprintLine_("");
+
+}
+/*}}}*/
 
 /*Numerics: */

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -44 +44 @@
                 Parameters  *parameters;           //one set of parameters, independent of the analysis_type
                 Results     *results;              //results that cannot be fit into the elements 
+                COMM        comm;                  //communicator for this particular model
 
                 /*constructors, destructors: */
-                FemModel(int argc,char** argv);
+                FemModel(int argc,char** argv,COMM comm_init);
                 FemModel(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int solution_type,const int* analyses,const int nummodels);
                 ~FemModel();
@@ -55 +56 @@
                 void Solve(void);
                 void OutputResults(void);
+                void SetStaticComm();
+                void PrintBanner(void);
 
                 /*Fem: */

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -1340 +1340 @@
                 }
         }
-#ifdef _HAVE_MPI_
+        #ifdef _HAVE_MPI_
         MPI_Bcast(&found,1,MPI_INT,0,MPI_COMM_WORLD); 
         if(!found)_error_("could not find data with name " << EnumToStringx(data_enum) << " in binary file");
-#endif
+        #endif
 
         /*Broadcast code and vector type: */
-#ifdef _HAVE_MPI_
+        #ifdef _HAVE_MPI_
         MPI_Bcast(&record_code,1,MPI_INT,0,MPI_COMM_WORLD); 
         MPI_Bcast(&vector_type,1,MPI_INT,0,MPI_COMM_WORLD); 
         if(record_code==5) MPI_Bcast(&vector_type,1,MPI_INT,0,MPI_COMM_WORLD); 
-#endif
+        #endif
 
         /*Assign output pointers:*/

issm/trunk-jpl/src/c/classes/classes.h

@@ -31 +31 @@
 #include "./OptPars.h"
 #include "./AdolcEdf.h"
+#include "./IssmComm.h"
 
 #endif

issm/trunk-jpl/src/c/include/globals.h

@@ -6 +6 @@
 #define GLOBALS_H_
 
+
+#include "./types.h"
+#include "../classes/IssmComm.h"
+COMM IssmComm::comm;
+
 int my_rank=0;
 int num_procs=1;

issm/trunk-jpl/src/c/include/types.h

@@ -40 +40 @@
 #endif
 
+/*Define communicator: */
+#ifdef _HAVE_MPI_
+#include "mpi.h"
+typedef MPI_Comm COMM;
+#else
+typedef int COMM;
+#endif
+
 #endif //ifndef _TYPES_H_

issm/trunk-jpl/src/c/solutions/EnvironmentInit.cpp

@@ -10 +10 @@
 #include "../toolkits/toolkits.h"
 
-void EnvironmentInit(int argc,char** argv){
-        
-        extern int my_rank;
-        extern int num_procs;
+COMM EnvironmentInit(int argc,char** argv){
 
         /*Initialize environments: Petsc, MPI, etc...: */
@@ -19 +16 @@
         int ierr=PetscInitialize(&argc,&argv,(char*)0,"");  
         if(ierr) _error_("Could not initialize Petsc");
+        return MPI_COMM_WORLD;
         #else
         #ifdef _HAVE_MPI_
         MPI_Init(&argc,&argv);
+        return MPI_COMM_WORLD;
+        #else
+        return 1; //return bogus number for comm, which does not exist anyway.
         #endif
         #endif
         
-        /*Size and rank: */
-        #ifdef _HAVE_MPI_
-        MPI_Comm_rank(MPI_COMM_WORLD,&my_rank);  
-        MPI_Comm_size(MPI_COMM_WORLD,&num_procs); 
-        #endif
+
 }

issm/trunk-jpl/src/c/solutions/issm.cpp

@@ -7 +7 @@
 int main(int argc,char **argv){
 
-        /*Print starting banner:*/
-        PrintBanner();
+        COMM comm_init;
 
         /*Initialize exception trapping: */
@@ -14 +13 @@
 
         /*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
-        EnvironmentInit(argc,argv);
-                
+        comm_init=EnvironmentInit(argc,argv);
+
+        /*Hack for now: */
+        MPI_Comm_rank(comm_init,&my_rank);
+        MPI_Comm_size(comm_init,&num_procs);
+
         /*Initialize femmodel from arguments provided command line: */
-        FemModel *femmodel = new FemModel(argc,argv);
+        FemModel *femmodel = new FemModel(argc,argv,comm_init);
 
         /*Solve: */

issm/trunk-jpl/src/c/solutions/solutions.h

@@ -8 +8 @@
 #include "../classes/objects/objects.h"
 #include "../io/io.h"
+#include "../toolkits/toolkits.h"
 
 struct OptArgs;
@@ -47 +48 @@
 void controlrestart(FemModel* femmodel,IssmDouble* J);
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
-void EnvironmentInit(int argc,char** argv);
+COMM EnvironmentInit(int argc,char** argv);
 void EnvironmentFinalize(void);
 int  DakotaSpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodel,int counter);