Changeset 10188

Timestamp:

10/13/11 07:14:11 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added ModuleEnd for debugging purposes

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• include/macros.h (modified) (1 diff)
• shared/Matlab/ModuleBoot.cpp (modified) (1 diff)
• shared/Matlab/ModuleEnd.cpp (added)
• shared/Matlab/matlabshared.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -306 +306 @@
                                         ./shared/Matlab/matlabshared.h\
                                         ./shared/Matlab/ModuleBoot.cpp\
+                                        ./shared/Matlab/ModuleEnd.cpp\
                                         ./shared/Matlab/mxGetAssignedField.cpp\
                                         ./shared/Matlab/mxGetField.cpp\

issm/trunk/src/c/include/macros.h

@@ -49 +49 @@
         try{
 
-#define MODULEEND(); }\
+#define MODULEEND(); ModuleEnd(); }\
         catch(ErrorException &exception){\
                 exception.Report(); \

issm/trunk/src/c/shared/Matlab/ModuleBoot.cpp

@@ -15 +15 @@
         num_procs=1;
 
+        /*Some test for MPI_Init crash with mpich2 1.4 on larsen, just ignore*/
+        if(0){
+                int              mp_init = 0;
+                PetscErrorCode   ierr;
+                extern PetscBool PetscBeganMPI;
+                MPI_Initialized(&mp_init); 
+                if(mp_init!=1){
+                        MPI_Init(NULL,NULL); 
+                        PetscBeganMPI = PETSC_TRUE;
+                        ierr=PetscInitializeNoArguments();CHKERRQ(ierr);
+                } 
+        }
+        else if (0){
+                PetscBool flg;
+                ierr=PetscInitialized(&flg);CHKERRQ(ierr);
+                if(flg){
+                        extern PetscBool PetscBeganMPI;
+                        PetscBeganMPI = PETSC_FALSE;
+                        ierr=PetscFinalize();CHKERRQ(ierr);
+                }
+                ierr=PetscInitializeNoArguments();CHKERRQ(ierr);
+                ierr=PetscPopSignalHandler();CHKERRQ(ierr);
+        }
+
         /*Initialize Petsc: */
         PetscInitializeNoArguments();

issm/trunk/src/c/shared/Matlab/matlabshared.h

@@ -11 +11 @@
 #ifdef _SERIAL_
 #include "mex.h"
+#include "engine.h"
         int ModuleBoot(void);
+        int ModuleEnd(void);
         mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, char* field);
         int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, char* THISFUNCTION, void (*function)( void ));