Changeset 10188
- Timestamp:
- 10/13/11 07:14:11 (13 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r10144 r10188 306 306 ./shared/Matlab/matlabshared.h\ 307 307 ./shared/Matlab/ModuleBoot.cpp\ 308 ./shared/Matlab/ModuleEnd.cpp\ 308 309 ./shared/Matlab/mxGetAssignedField.cpp\ 309 310 ./shared/Matlab/mxGetField.cpp\ -
issm/trunk/src/c/include/macros.h
r9320 r10188 49 49 try{ 50 50 51 #define MODULEEND(); }\51 #define MODULEEND(); ModuleEnd(); }\ 52 52 catch(ErrorException &exception){\ 53 53 exception.Report(); \ -
issm/trunk/src/c/shared/Matlab/ModuleBoot.cpp
r8285 r10188 15 15 num_procs=1; 16 16 17 /*Some test for MPI_Init crash with mpich2 1.4 on larsen, just ignore*/ 18 if(0){ 19 int mp_init = 0; 20 PetscErrorCode ierr; 21 extern PetscBool PetscBeganMPI; 22 MPI_Initialized(&mp_init); 23 if(mp_init!=1){ 24 MPI_Init(NULL,NULL); 25 PetscBeganMPI = PETSC_TRUE; 26 ierr=PetscInitializeNoArguments();CHKERRQ(ierr); 27 } 28 } 29 else if (0){ 30 PetscBool flg; 31 ierr=PetscInitialized(&flg);CHKERRQ(ierr); 32 if(flg){ 33 extern PetscBool PetscBeganMPI; 34 PetscBeganMPI = PETSC_FALSE; 35 ierr=PetscFinalize();CHKERRQ(ierr); 36 } 37 ierr=PetscInitializeNoArguments();CHKERRQ(ierr); 38 ierr=PetscPopSignalHandler();CHKERRQ(ierr); 39 } 40 17 41 /*Initialize Petsc: */ 18 42 PetscInitializeNoArguments(); -
issm/trunk/src/c/shared/Matlab/matlabshared.h
r9761 r10188 11 11 #ifdef _SERIAL_ 12 12 #include "mex.h" 13 #include "engine.h" 13 14 int ModuleBoot(void); 15 int ModuleEnd(void); 14 16 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, char* field); 15 17 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, char* THISFUNCTION, void (*function)( void ));
Note:
See TracChangeset
for help on using the changeset viewer.