Changeset 3710

Timestamp:

05/11/10 09:39:27 (15 years ago)

Author:

Mathieu Morlighem

Message:

Use Enums to find params

Location:

issm/trunk/src/c

Files:

• Qmux/Qmux.cpp (modified) (1 diff)
• parallel/steadystate.cpp (modified) (1 diff)
• parallel/transient_core.cpp (modified) (1 diff)
• parallel/transient_core_3d.cpp (modified) (1 diff)

issm/trunk/src/c/Qmux/Qmux.cpp

@@ -70 +70 @@
         #ifdef _PARALLEL_
         /*Recover dakota_input_file, dakota_output_file and dakota_error_file, in the parameters dataset in parallel */
-        model->FindParam(&dakota_input_file,"qmuinname");
-        model->FindParam(&dakota_output_file,"qmuoutname");
-        model->FindParam(&dakota_error_file,"qmuerrname");
+        model->FindParam(&dakota_input_file,QmuInNameEnum);
+        model->FindParam(&dakota_output_file,QmuOutNameEnum);
+        model->FindParam(&dakota_error_file,QmuErrNameEnum);
         #endif
 

issm/trunk/src/c/parallel/steadystate.cpp

@@ -128 +128 @@
                         fem_dh=model->GetFormulation(DiagnosticAnalysisEnum,HorizAnalysisEnum);
                         fem_ds=model->GetFormulation(DiagnosticAnalysisEnum,StokesAnalysisEnum);
-                        param=(Param*)fem_dh->parameters->FindParamObject("control_steady");
+                        param=(Param*)fem_dh->parameters->FindParamObject(ControlSteadyEnum);
                         param->SetDouble(1);
-                        param=(Param*)fem_ds->parameters->FindParamObject("control_steady");
+                        param=(Param*)fem_ds->parameters->FindParamObject(ControlSteadyEnum);
                         param->SetDouble(1);
                         /*run control analysis: */

issm/trunk/src/c/parallel/transient_core.cpp

@@ -17 +17 @@
 
         //first recover parameters common to all solutions
-        model->FindParam(&dim,"dim");
+        model->FindParam(&dim,DimEnum);
 
         //branch out 

issm/trunk/src/c/parallel/transient_core_3d.cpp

@@ -160 +160 @@
                         char*    outputfilename=NULL;
 
-                        model->FindParam(&outputfilename,"outputfilename");
+                        model->FindParam(&outputfilename,OutputFileNameEnum);
                         ProcessResults(&processed_results,results,model,TransientAnalysisEnum);
                         OutputResults(processed_results,outputfilename);