Changeset 1826

Timestamp:

08/24/09 17:46:34 (16 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

File:

• issm/trunk/src/c/parallel/diagnostic.cpp (modified) (8 diffs)

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

@@ -26 +26 @@
         int   qmu_analysis=0;
 
-        /*Fem models : */
-        FemModel femmodels[5];
+        /*Model: */
+        Model* model=NULL;
 
         /*Results: */
@@ -56 +56 @@
         lockname=argv[4];
 
+        /*Initialize model structure: */
+        model=new Model();
+
         /*Open handle to data on disk: */
         fid=pfopen(inputfilename,"rb");
@@ -61 +64 @@
         _printf_("read and create finite element model:\n");
         _printf_("\n   reading diagnostic horiz model data:\n");
-        CreateFemModel(&femmodels[0],fid,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+        CreateFemModel(model->DiagnosticHorizontal(),fid,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
         _printf_("\n   reading diagnostic vert model data:\n");
-        CreateFemModel(&femmodels[1],fid,DiagnosticAnalysisEnum(),VertAnalysisEnum());
+        CreateFemModel(model->DiagnosticVertical(),fid,DiagnosticAnalysisEnum(),VertAnalysisEnum());
         _printf_("\n   reading diagnostic stokes model data:\n");
-        CreateFemModel(&femmodels[2],fid,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+        CreateFemModel(model->DiagnosticStokes(),fid,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
         _printf_("\n   reading diagnostic hutter model data:\n");
-        CreateFemModel(&femmodels[3],fid,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
+        CreateFemModel(model->DiagnosticHutter(),fid,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
         _printf_("\n   reading surface and bed slope computation model data:\n");
-        CreateFemModel(&femmodels[4],fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+        CreateFemModel(model->Slope(),fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
 
         _printf_("initialize inputs:\n");
-        femmodels[0].parameters->FindParam((void*)&u_g_initial,"u_g");
-        femmodels[0].parameters->FindParam((void*)&numberofnodes,"numberofnodes");
+        model->DiagnosticHorizontal()->parameters->FindParam((void*)&u_g_initial,"u_g");
+        model->DiagnosticHorizontal()->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
 
         inputs=new ParameterInputs;
@@ -79 +82 @@
         
         /*erase velocities: */
-        param=(Param*)femmodels[0].parameters->FindParamObject("u_g");
-        femmodels[0].parameters->DeleteObject((Object*)param);
+        param=(Param*)model->DiagnosticHorizontal()->parameters->FindParamObject("u_g");
+        model->DiagnosticHorizontal()->parameters->DeleteObject((Object*)param);
 
         _printf_("initialize results:\n");
@@ -86 +89 @@
 
         /*are we running the solution sequence, or a qmu wrapper around it? : */
-        femmodels[0].parameters->FindParam((void*)&qmu_analysis,"qmu_analysis");
+        model->DiagnosticHorizontal()->parameters->FindParam((void*)&qmu_analysis,"qmu_analysis");
         if(!qmu_analysis){
 
                 /*run diagnostic analysis: */
                 _printf_("call computational core:\n");
-                diagnostic_core(results,femmodels,inputs);
+                diagnostic_core(results,model,inputs);
 
         }
@@ -99 +102 @@
 
                 #ifdef _HAVE_DAKOTA_ 
-                Qmux(&femmodels[0],inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum());
+                Qmux(model,inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum());
                 #else
                 throw ErrorException(__FUNCT__," Dakota not present, cannot do qmu!");
@@ -110 +113 @@
 
         _printf_("process results:\n");
-        ProcessResults(&results,&femmodels[0],DiagnosticAnalysisEnum());
+        ProcessResults(&results,model,DiagnosticAnalysisEnum());
         
         _printf_("write results to disk:\n");
@@ -116 +119 @@
 
         _printf_("write lock file:\n");
-        femmodels[0].parameters->FindParam((void*)&waitonlock,"waitonlock");
+        model->DiagnosticHorizontal()->parameters->FindParam((void*)&waitonlock,"waitonlock");
         if (waitonlock){
                 WriteLockFile(lockname);