Changeset 23370 for issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

Timestamp:

10/02/18 10:00:01 (6 years ago)

Author:

bdef

Message:

BUG:partial fix, issues remain in Hydro

File:

• issm/trunk-jpl/src/c/classes/Params/Parameters.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

@@ -92 +92 @@
 }
 /*}}}*/
-void Parameters::DeepEcho(void){/*{{{*/ 
+void Parameters::DeepEcho(void){/*{{{*/
         for(int i=0;i<NUMPARAMS;i++) {
                 if(this->params[i]) this->params[i]->DeepEcho();
@@ -99 +99 @@
 }
 /*}}}*/
-void Parameters::Echo(void){/*{{{*/     
+void Parameters::Echo(void){/*{{{*/
         for(int i=0;i<NUMPARAMS;i++) {
                 if(this->params[i]) this->params[i]->Echo();
@@ -139 +139 @@
 
                         /*Recover enum of object first: */
-                        MARSHALLING(obj_enum); 
+                        MARSHALLING(obj_enum);
 
                         if(obj_enum==DoubleParamEnum){
@@ -200 +200 @@
                                 fileparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
                                 delete fileparam;
-                                /* No need to add this object, the pointer is not valid             
+                                /* No need to add this object, the pointer is not valid
                                         The FemModel should reset all FileParams in the restart function */
                         }
@@ -649 +649 @@
 char* OptionsFromAnalysis(char** pouttoolkit,Parameters* parameters,int analysis_type){ /*{{{*/
 
-        /* figure out ISSM options for current analysis, return a string. */ 
+        /* figure out ISSM options for current analysis, return a string. */
 
         /*output: */
@@ -667 +667 @@
 
         parameters->FindParam(&strings,&numanalyses,ToolkitsOptionsStringsEnum);
-        parameters->FindParam(&toolkits,&dummy,ToolkitsTypesEnum); _assert_(dummy==numanalyses); 
-        parameters->FindParam(&analyses,&dummy,ToolkitsOptionsAnalysesEnum); _assert_(dummy==numanalyses); 
+        parameters->FindParam(&toolkits,&dummy,ToolkitsTypesEnum); _assert_(dummy==numanalyses);
+        parameters->FindParam(&analyses,&dummy,ToolkitsOptionsAnalysesEnum); _assert_(dummy==numanalyses);
 
         if(numanalyses==0)return NULL; //we did not find petsc options, don't bother.
@@ -710 +710 @@
         xDelete<int>(analyses);
         return outstring;
-} 
+}
 /*}}}*/
 void ToolkitsOptionsFromAnalysis(Parameters* parameters,int analysis_type){ /*{{{*/
 
         /*!\file:  ToolkitsOptionsFromAnalysis.cpp
-         * \brief: for each analysis, setup the issmoptions string. 
-         * This is mainly for the case where we run our toolkits using petsc. In this case, we need to 
-         * plug our toolkits options directly into the petsc options database. This is the case for each analysis type 
+         * \brief: for each analysis, setup the issmoptions string.
+         * This is mainly for the case where we run our toolkits using petsc. In this case, we need to
+         * plug our toolkits options directly into the petsc options database. This is the case for each analysis type
          * and parameters
-         */ 
+         */
 
         char* options = NULL;
@@ -731 +731 @@
 
         #ifdef _HAVE_PETSC_
-                /*In case we are using PETSC, we do not rely on issmoptions. Instead, we dump issmoptions into the Petsc 
+                /*In case we are using PETSC, we do not rely on issmoptions. Instead, we dump issmoptions into the Petsc
                  * options database: */
                 #if (_PETSC_MINOR_>=7)