Changeset 14624

Timestamp:

04/17/13 10:58:07 (12 years ago)

Author:

Eric.Larour

Message:

CHG: updated petsc file name to toolkits file name in issm.exe

Location:

issm/trunk-jpl/src

Files:

• c/solutions/ProcessArguments.cpp (modified) (4 diffs)
• c/solutions/kriging.cpp (modified) (1 diff)
• c/solutions/solutions.h (modified) (1 diff)
• m/solve/solve.m (modified) (1 diff)
• m/solve/solve.py (modified) (1 diff)

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

@@ -9 +9 @@
 #include "../include/include.h"
 
-void ProcessArguments(int* solution_type,char** pbinfilename,char** poutbinfilename,char** ppetscfilename,char** plockfilename,char** prootpath, int argc,char **argv){
+void ProcessArguments(int* solution_type,char** pbinfilename,char** poutbinfilename,char** ptoolkitsfilename,char** plockfilename,char** prootpath, int argc,char **argv){
 
         char *modelname      = NULL;
         char *binfilename    = NULL;
         char *outbinfilename = NULL;
-        char *petscfilename  = NULL;
+        char *toolkitsfilename  = NULL;
         char *lockfilename   = NULL;
         char *rootpath       = NULL;
@@ -39 +39 @@
                 binfilename    = xNew<char>(strlen(rootpath)+strlen(modelname)+strlen(".bin")   +1); sprintf(binfilename,   "%s%s%s",rootpath,modelname,".bin");
                 outbinfilename = xNew<char>(strlen(rootpath)+strlen(modelname)+strlen(".outbin")+1); sprintf(outbinfilename,"%s%s%s",rootpath,modelname,".outbin");
-                petscfilename  = xNew<char>(strlen(rootpath)+strlen(modelname)+strlen(".petsc") +1); sprintf(petscfilename, "%s%s%s",rootpath,modelname,".petsc");
+                toolkitsfilename  = xNew<char>(strlen(rootpath)+strlen(modelname)+strlen(".toolkits") +1); sprintf(toolkitsfilename, "%s%s%s",rootpath,modelname,".toolkits");
                 lockfilename   = xNew<char>(strlen(rootpath)+strlen(modelname)+strlen(".lock")  +1); sprintf(lockfilename,  "%s%s%s",rootpath,modelname,".lock");
         }
@@ -45 +45 @@
                 binfilename    = xNew<char>(strlen(modelname)+strlen(".bin")   +1); sprintf(binfilename,   "%s%s",modelname,".bin");
                 outbinfilename = xNew<char>(strlen(modelname)+strlen(".outbin")+1); sprintf(outbinfilename,"%s%s",modelname,".outbin");
-                petscfilename  = xNew<char>(strlen(modelname)+strlen(".petsc") +1); sprintf(petscfilename, "%s%s",modelname,".petsc");
+                toolkitsfilename  = xNew<char>(strlen(modelname)+strlen(".toolkits") +1); sprintf(toolkitsfilename, "%s%s",modelname,".toolkits");
                 lockfilename   = xNew<char>(strlen(modelname)+strlen(".lock")  +1); sprintf(lockfilename,  "%s%s",modelname,".lock");
         }
@@ -52 +52 @@
         *pbinfilename=binfilename;
         *poutbinfilename=outbinfilename;
-        *ppetscfilename=petscfilename;
+        *ptoolkitsfilename=toolkitsfilename;
         *plockfilename=lockfilename;
         *prootpath=rootpath;

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

@@ -67 +67 @@
         }
 
-        /*Close output and petsc options file and write lock file if requested*/
+        /*Close output and toolkits options file and write lock file if requested*/
         _pprintLine_("write lock file:");
         WriteLockFile(lockfilename);

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

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

issm/trunk-jpl/src/m/solve/solve.m

@@ -76 +76 @@
 %Write all input files
 marshall(md);                                          % bin file
-ToolkitsFile(md.solver,[md.miscellaneous.name '.toolkits']); % toolkits file
+ToolkitsFile(md.toolkits,[md.miscellaneous.name '.toolkits']); % toolkits file
 BuildQueueScript(cluster,md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof); % queue file
 

issm/trunk-jpl/src/m/solve/solve.py

@@ -80 +80 @@
         #Write all input files
         marshall(md)                                           # bin file
-        md.solver.ToolkitsFile(md.miscellaneous.name+'.toolkits')    # toolkits file
+        md.toolkits.ToolkitsFile(md.miscellaneous.name+'.toolkits')    # toolkits file
         cluster.BuildQueueScript(md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof)    # queue file