Changeset 13736

Timestamp:

10/18/12 11:43:20 (12 years ago)

Author:

Eric.Larour

Message:

CHG: pushed PetscInitialize and Finalize phases into FemModel constructors and destructors.
MPI_Init and MPI_Finalize are still done in EnvironmentInit and EnvironmentFinalize.
This ensures that we split our communicators and run fully communicator oriented!

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (3 diffs)
• solutions/EnvironmentFinalize.cpp (modified) (1 diff)
• solutions/EnvironmentInit.cpp (modified) (1 diff)

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

@@ -27 +27 @@
         int  numanalyses;
         int  solution_type;
+        int  ierr;
 
         /*File names*/
@@ -38 +39 @@
         this->comm=incomm;
         this->SetStaticComm();
+        
+        /*Now, initialize PETSC: */
+        PETSC_COMM_WORLD=this->comm;
+        ierr=PetscInitialize(&argc,&argv,(char*)0,"");  if(ierr) _error_("Could not initialize Petsc");
 
         /*Start profiler: */
@@ -122 +127 @@
         /*Now delete: */
         delete profiler;
+        
+        /*Finalize PETSC for this model: */
+        _pprintLine_("closing Petsc");
+        PetscFinalize(); 
+
 }
 /*}}}*/

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

@@ -13 +13 @@
 void EnvironmentFinalize(void){
 
-        #ifdef _HAVE_PETSC_
-        _pprintLine_("closing MPI and Petsc");
-        PetscFinalize(); 
-        #else
+        int my_rank=0;
         #ifdef _HAVE_MPI_
-        _pprintLine_("closing MPI");
+        /*Make sure we are all here!)*/
+        MPI_Barrier(MPI_COMM_WORLD);
+        
+        /*Print closing statement: */
+        #ifdef _HAVE_MPI_
+        MPI_Comm_rank(MPI_COMM_WORLD,&my_rank);
+        #endif
+        if(!my_rank) printf("closing MPI\n");
+
+        /*Finalize: */
         MPI_Finalize();
         #endif
-        #endif
 }

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

@@ -16 +16 @@
         COMM comm = 0;
 
-        /*Initialize environments: Petsc, MPI, etc...: */
-        #if defined (_HAVE_PETSC_)
-        int ierr=PetscInitialize(&argc,&argv,(char*)0,"");  
-        if(ierr) _error_("Could not initialize Petsc");
-        comm = MPI_COMM_WORLD;
-        #elif defined(_HAVE_MPI_)
+        /*Initialize MPI environment: */
+        #if defined(_HAVE_MPI_)
         MPI_Init(&argc,&argv);
         comm = MPI_COMM_WORLD;