Changeset 14628

Timestamp:

04/17/13 11:05:58 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moving things around to adapt new naming of petsc options to toolkits options

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/FemModel.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -242 +242 @@
                                         ./modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp\
                                         ./modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp\
-                                        ./modules/ParsePetscOptionsx/ParsePetscOptionsx.h\
-                                        ./modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp\
+                                        ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h\
+                                        ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp\
                                         ./modules/NodesDofx/NodesDofx.h\
                                         ./modules/NodesDofx/NodesDofx.cpp\

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -71 +71 @@
 }
 /*}}}*/
-/*FUNCTION FemModel::FemModel(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int in_solution_type,const int* analyses,const int nummodels){{{*/
-FemModel::FemModel(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int in_solution_type,const int* analyses,const int nummodels){
+/*FUNCTION FemModel::FemModel(char* rootpath, char* inputfilename, char* outputfilename, char* toolkitsfilename, char* lockfilename, const int in_solution_type,const int* analyses,const int nummodels){{{*/
+FemModel::FemModel(char* rootpath, char* inputfilename, char* outputfilename, char* toolkitsfilename, char* lockfilename, const int in_solution_type,const int* analyses,const int nummodels){
 
         /*Call InitFromFiles. This constructor is just a wrapper: */
-        this->InitFromFiles(rootpath, inputfilename, outputfilename, petscfilename, lockfilename, in_solution_type,analyses,nummodels);
+        this->InitFromFiles(rootpath, inputfilename, outputfilename, toolkitsfilename, lockfilename, in_solution_type,analyses,nummodels);
 
 }
@@ -152 +152 @@
 }
 /*}}}*/
-/*FUNCTION FemModel::InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int in_solution_type,const int* analyses,const int nummodels){{{*/
-void FemModel::InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int in_solution_type,const int* analyses,const int nummodels){
+/*FUNCTION FemModel::InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* toolkitsfilename, char* lockfilename, const int in_solution_type,const int* analyses,const int nummodels){{{*/
+void FemModel::InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* toolkitsfilename, char* lockfilename, const int in_solution_type,const int* analyses,const int nummodels){
 
         /*intermediary*/
@@ -159 +159 @@
         int         analysis_type;
         FILE       *IOMODEL = NULL;
-        FILE       *petscoptionsfid = NULL;
+        FILE       *toolkitsoptionsfid = NULL;
         FILE       *output_fid = NULL;
         int         my_rank;
@@ -217 +217 @@
         this->parameters->AddObject(new StringParam(LockFileNameEnum,lockfilename));
 
-        /*Now, deal with petsc options, which need to be put into the parameters dataset: */
-        petscoptionsfid=pfopen(petscfilename,"r");
-        ParsePetscOptionsx(this->parameters,petscoptionsfid);
-        pfclose(petscoptionsfid,petscfilename);
+        /*Now, deal with toolkits options, which need to be put into the parameters dataset: */
+        toolkitsoptionsfid=pfopen(toolkitsfilename,"r");
+        ParseToolkitsOptionsx(this->parameters,toolkitsoptionsfid);
+        pfclose(toolkitsoptionsfid,toolkitsfilename);
 }
 /*}}}*/