Changeset 9356 for issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

Timestamp:

08/19/11 18:04:03 (14 years ago)

Author:

Eric.Larour

Message:

Major rewrite of the code so that IoModel now has a parameters dataset, which gets
loaded with all the int,char and double objects in the input file.
This is a lot more flexible, as anyone can add a field to the model, and it will
automatically appear in the IoModel parameters dataset.

Not debugged with respect to nightly runs yet. Trying to get the whole change finished.

File:

• issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -20 +20 @@
         int i;
         int analysis_type;
+        int dim;
+        int verbose;
         
         /*output: */
@@ -30 +32 @@
         Parameters  *parameters  = NULL;
 
+        
         /*Initialize IoModel from input file*/
         IoModel* iomodel = new IoModel(IOMODEL);
-        SetVerbosityLevel(iomodel->verbose);
+
+        /*Fetch parameters: */
+        iomodel->parameters->FindParam(&dim,DimEnum);
+        iomodel->parameters->FindParam(&verbose,VerboseEnum);
+        
+        SetVerbosityLevel(verbose);
 
         for(i=0;i<nummodels;i++){
@@ -39 +47 @@
 
                 /*Hack for trasient runs (to be improved)*/
-                if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && iomodel->dim==2) continue;
-                if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && iomodel->dim==2) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && dim==2) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && dim==2) continue;
         
                 _printf_(VerboseMProcessor(),"   create datasets for analysis %s\n",EnumToStringx(analysis_type));