Changeset 10568

Timestamp:

11/10/11 08:56:59 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added ProcessArguments

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• solutions/ProcessArguments.cpp (added)
• solutions/issm.cpp (modified) (6 diffs)
• solutions/solutions.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -344 +344 @@
                                         ./modules/InputConvergencex/InputConvergencex.h\
                                         ./solutions/convergence.cpp\
+                                        ./solutions/ProcessArguments.cpp\
                                         ./solutions/WriteLockFile.cpp\
                                         ./solutions/ResetBoundaryConditions.cpp\

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

@@ -6 +6 @@
 #include "../include/globals.h"
 
-int main(int argc,char  **argv){
+int main(int argc,char **argv){
 
         /*MPI: */
@@ -29 +29 @@
 
         /*File names*/
-        char *modelname      = NULL;
         char *lockfilename   = NULL;
         char *binfilename    = NULL;
@@ -57 +56 @@
         /*First process inputs*/
         _printf_(true,"Launching solution sequence\n");
-        if(argc<2)_error_("Usage error: no solution requested");
-        solution_type=StringToEnumx(argv[1]);
-        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();
+        ProcessArguments(&solution_type,&binfilename,&outbinfilename,&petscfilename,&lockfilename,argc,argv);
 
         /*out of solution_type, figure out types of analyses needed in the femmodel: */
@@ -72 +62 @@
         
         /*Create femmodel, using input file: */
+        MPI_Barrier(MPI_COMM_WORLD); start_init=MPI_Wtime();
         femmodel=new FemModel(binfilename,outbinfilename,solution_type,analyses,numanalyses);
         
@@ -90 +81 @@
         femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum);
-
         MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();
 
@@ -152 +142 @@
         return 0; //unix success return;
 }
+

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

@@ -42 +42 @@
 
 //diverse
+void ProcessArguments(int* solution,char** pbinname,char** poutbinname,char** ppetscname,char** plockname,int argc,char **argv);
 void WriteLockFile(char* filename);
 void controlrestart(FemModel* femmodel,double* J);