Changeset 9561

Timestamp:

09/01/11 10:30:21 (14 years ago)

Author:

Mathieu Morlighem

Message:

Big change for parallel runs: only the model name is provided. outbin petsc and lock filnames are generated using the modelname (less variables and clearer):

Location:

issm/trunk/src

Files:

• c/shared/Numerics/PetscOptionsFromAnalysis.cpp (modified) (2 diffs)
• c/solutions/issm.cpp (modified) (6 diffs)
• m/classes/clusters/astrid.m (deleted)
• m/classes/clusters/castor.m (modified) (1 diff)
• m/classes/clusters/cosmos.m (modified) (1 diff)
• m/classes/clusters/gemini.m (modified) (1 diff)
• m/classes/clusters/generic.m (modified) (1 diff)
• m/classes/clusters/pfe.m (modified) (3 diffs)
• m/classes/clusters/pollux.m (modified) (1 diff)
• m/classes/model/model.m (modified) (1 diff)
• m/model/presolve.m (modified) (1 diff)
• m/model/solve.m (modified) (1 diff)

issm/trunk/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp

@@ -81 +81 @@
 
 
-        /*Free ressources:{{{1*/
+        /*Free ressources*/
         xfree((void**)&analyses);
         for(i=0;i<numanalyses;i++){
@@ -88 +88 @@
         }
         xfree((void**)&strings);
-        /*}}}*/
 
 }

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

@@ -5 +5 @@
 #include "./issm.h"
 
-int main(int argc,char* *argv){
+int main(int argc,char  **argv){
 
         /*MPI: */
@@ -14 +14 @@
         FILE *output_fid       = NULL;
         FILE *petscoptionsfid  = NULL;
-        char *lockname         = NULL;
         bool  qmu_analysis     = false;
         bool  control_analysis = false;
@@ -27 +26 @@
         int  numanalyses;
         int  solution_type;
+
+        /*File names*/
+        char *modelname      = NULL;
+        char *lockfilename   = NULL;
+        char *binfilename    = NULL;
+        char *outbinfilename = NULL;
+        char *petscfilename  = NULL;
 
         /*time*/
@@ -48 +54 @@
         MPI_Comm_size(MPI_COMM_WORLD,&num_procs); 
 
-        /*First check number of inputs*/
+        /*First process inputs*/
         _printf_(true,"Launching solution sequence\n");
         if(argc<2)_error_("Usage error: no solution requested");
         solution_type=StringToEnumx(argv[1]);
-        lockname=argv[6];
+        if(argc<3)_error_("Usage error: missing model name");
+        modelname=argv[3];
+        binfilename    = (char*)xmalloc((strlen(modelname)+strlen(".bin")   +1)*sizeof(char)); sprintf(binfilename,   "%s%s",modelname,".bin");
+        outbinfilename = (char*)xmalloc((strlen(modelname)+strlen(".outbin")+1)*sizeof(char)); sprintf(outbinfilename,"%s%s",modelname,".outbin");
+        petscfilename  = (char*)xmalloc((strlen(modelname)+strlen(".petsc") +1)*sizeof(char)); sprintf(petscfilename, "%s%s",modelname,".petsc");
+        lockfilename   = (char*)xmalloc((strlen(modelname)+strlen(".lock")  +1)*sizeof(char)); sprintf(lockfilename,  "%s%s",modelname,".lock");
 
         MPI_Barrier(MPI_COMM_WORLD); start_init=MPI_Wtime();
@@ -61 +72 @@
 
         /*Create femmodel, using input file: */
-        femmodel=new FemModel(argv[3] /*input*/,argv[5] /*output*/,solution_type,analyses,numanalyses);
+        femmodel=new FemModel(binfilename,outbinfilename,solution_type,analyses,numanalyses);
 
         /*Open output file once for all*/
-        output_fid=pfopen(argv[5],"wb");
+        output_fid=pfopen(outbinfilename,"wb");
         femmodel->parameters->SetParam(output_fid,OutputFilePointerEnum);
 
         /*add petsc options to parameters: */
-        petscoptionsfid=pfopen(argv[4],"r");
+        petscoptionsfid=pfopen(petscfilename,"r");
         ParsePetscOptionsx(femmodel->parameters,petscoptionsfid);
-        pfclose(petscoptionsfid,argv[4]);
+        pfclose(petscoptionsfid,petscfilename);
 
         /*get parameters: */
@@ -114 +125 @@
 
         /*Close output and petsc options file and write lock file if requested*/
-        pfclose(output_fid,argv[5]);
+        pfclose(output_fid,lockfilename);
         if (waitonlock>0){
                 _printf_(true,"write lock file:\n");
-                WriteLockFile(lockname);
+                WriteLockFile(lockfilename);
         }
 
         /*Free ressources */
         xfree((void**)&analyses);
+        xfree((void**)&lockfilename);
+        xfree((void**)&binfilename);
+        xfree((void**)&outbinfilename);
+        xfree((void**)&petscfilename);
         delete femmodel;
 

issm/trunk/src/m/classes/clusters/castor.m

@@ -78 +78 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
 
                          %close file

issm/trunk/src/m/classes/clusters/cosmos.m

@@ -77 +77 @@
                          fprintf(fid,'ulimit -s unlimited\n');
                          fprintf(fid,'ulimit -c 0\n');
-                         fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpiexec -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock',cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname);
+                         fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpiexec -np %i %s/issm.exe %s %s %s',cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
 
                          %close file

issm/trunk/src/m/classes/clusters/gemini.m

@@ -78 +78 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
 
                          %close file

issm/trunk/src/m/classes/clusters/generic.m

@@ -83 +83 @@
                          if mem_debug==0,
                                  if cluster.interactive
-                                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock ',...
-                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname);
+                                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s ',...
+                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
                                  else
-                                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog ',...
-                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
+                                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
+                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname);
                                  end
                          else
-                                 %fprintf(fid,'LD_PRELOAD=%s mpiexec -np %i %s --leak-check=full --gen-suppressions=all --suppressions=%s %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog ',cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
-                                 fprintf(fid,'LD_PRELOAD=%s mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog ',...
-                                         cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
+                                 %fprintf(fid,'LD_PRELOAD=%s mpiexec -np %i %s --leak-check=full --gen-suppressions=all --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname);
+                                 fprintf(fid,'LD_PRELOAD=%s mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
+                                         cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname);
                          end
 

issm/trunk/src/m/classes/clusters/pfe.m

@@ -138 +138 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n\n');
 
-                         fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s.bin %s.petsc %s.outbin %s.lock\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname,modelname,modelname,modelname);
+                         fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname);
 
                          if ~md.io_gather,
@@ -147 +147 @@
                          %close file
                          fclose(fid);
-
 
                          %in interactive mode, create a run file, and errlog and outlog file
@@ -153 +152 @@
                                  fid=fopen([modelname '.run'],'w');
                                  if ~mem_debug,
-                                         fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s.bin %s.petsc %s.outbin %s.lock\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname,modelname,modelname,modelname);
-                                 else
-                                         fprintf(fid,'mpiexec -verbose -np %i valgrind --leak-check=full %s/issm.exe %s $PBS_O_WORKDIR %s.bin %s.petsc %s.outbin %s.lock\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname,modelname,modelname,modelname);
+                                         fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname);
+                                 else
+                                         fprintf(fid,'mpiexec -verbose -np %i valgrind --leak-check=full %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname);
                                  end
 

issm/trunk/src/m/classes/clusters/pollux.m

@@ -78 +78 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
 
                          %close file

issm/trunk/src/m/classes/model/model.m

@@ -204 +204 @@
                  output_frequency               = modelfield('default',0,'marshall',true,'format','Integer');
                  results_on_vertices            = modelfield('default',0,'marshall',true,'format','Boolean');
-                 outputfilename                 = modelfield('default','','marshall',true,'format','String');
                  results                        = modelfield('default',struct(),'marshall',false);
                  vx                             = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);

issm/trunk/src/m/model/presolve.m

@@ -4 +4 @@
 %   Usage:
 %      md=presolve(md)
-
-%deal with outputfilename and inputfilename
-md.outputfilename=[md.name '.outbin'];
 
 %deal with rifts.

issm/trunk/src/m/model/solve.m

@@ -60 +60 @@
 marshall(md);
 
-
 %write a template file for issm to use, in parallel
 PetscOptions2PetscFile(md.petscoptions,[md.name '.petsc']);