Changeset 1881 for issm/trunk/src/c/parallel/transient.cpp

Timestamp:

08/25/09 13:04:05 (16 years ago)

Author:

Eric.Larour

Message:

Model and FemModel are now classes in their own right.
This changes the cores quite a bit.

File:

• issm/trunk/src/c/parallel/transient.cpp (modified) (4 diffs)

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

@@ -62 +62 @@
         lockname=argv[4];
 
+        /*Initialize model structure: */
+        model=new Model();
+
         /*Open handle to data on disk: */
         fid=pfopen(inputfilename,"rb");
@@ -70 +73 @@
         _printf_("read and create finite element model:\n");
         _printf_("\n   reading diagnostic horiz model data:\n");
-        CreateFemModel(model->DiagnosticHorizontal(),fid,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+        model->AddFormulation(fid,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+
         _printf_("\n   reading diagnostic vert model data:\n");
-        CreateFemModel(model->DiagnosticVertical(),fid,DiagnosticAnalysisEnum(),VertAnalysisEnum());
+        model->AddFormulation(fid,DiagnosticAnalysisEnum(),VertAnalysisEnum());
+        
         _printf_("\n   reading diagnostic stokes model data:\n");
-        CreateFemModel(model->DiagnosticStokes(),fid,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+        model->AddFormulation(fid,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+        
         _printf_("\n   reading diagnostic hutter model data:\n");
-        CreateFemModel(model->DiagnosticHutter(),fid,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
+        model->AddFormulation(fid,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
+        
         _printf_("\n   reading surface and bed slope computation model data:\n");
-        CreateFemModel(model->Slope(),fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+        model->AddFormulation(fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+
         _printf_("\n   reading prognositc model data:\n");
-        CreateFemModel(model->Prognostic(),fid,PrognosticAnalysisEnum(),NoneAnalysisEnum());
+        model->AddFormulation(fid,PrognosticAnalysisEnum(),NoneAnalysisEnum());
         
         /*Do we run in 3d?, in which case we need thermal and melting also:*/
-        model->DiagnosticHorizontal()->parameters->FindParam((void*)&dim,"dim");
+        model->FindParam(&dim,"dim");
         if(dim==3){
                 _printf_("read and create thermal finite element model:\n");
-                CreateFemModel(model->Thermal(),fid,ThermalAnalysisEnum(),TransientAnalysisEnum());
+                model->AddFormulation(fid,ThermalAnalysisEnum(),TransientAnalysisEnum());
                 _printf_("read and create melting finite element model:\n");
-                CreateFemModel(model->Melting(),fid,MeltingAnalysisEnum(),TransientAnalysisEnum());
+                model->AddFormulation(fid,MeltingAnalysisEnum(),TransientAnalysisEnum());
         }
 
         _printf_("initialize inputs:\n");
+        
+        model->FindParam(&u_g,"u_g",ThermalAnalysisEnum());
+        model->FindParam(&m_g,"m_g",ThermalAnalysisEnum());
+        model->FindParam(&a_g,"a_g",ThermalAnalysisEnum());
+        model->FindParam(&numberofnodes,"numberofnodes");
+        model->FindParam(&dt,"dt");
+        model->FindParam(&yts,"yts");
+        model->FindParam(&waitonlock,"waitonlock");
+        model->FindParam(&qmu_analysis,"qmu_analysis");
+
+
         inputs=new ParameterInputs;
-        model->Thermal()->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
-        
-        model->Thermal()->parameters->FindParam((void*)&u_g,"u_g");
         inputs->Add("velocity",u_g,3,numberofnodes);
-
-        model->Thermal()->parameters->FindParam((void*)&m_g,"m_g");
         inputs->Add("melting",m_g,1,numberofnodes);
-
-        model->Thermal()->parameters->FindParam((void*)&a_g,"a_g");
         inputs->Add("accumulation",a_g,1,numberofnodes);
-
-        model->Thermal()->parameters->FindParam((void*)&dt,"dt");
-        model->Thermal()->parameters->FindParam((void*)&yts,"yts");
         inputs->Add("dt",dt*yts);
         
@@ -112 +121 @@
 
         /*are we running the solution sequence, or a qmu wrapper around it? : */
-        model->Thermal()->parameters->FindParam((void*)&qmu_analysis,"qmu_analysis");
         if(!qmu_analysis){
 
@@ -141 +149 @@
 
         _printf_("write lock file:\n");
-        model->DiagnosticHorizontal()->parameters->FindParam((void*)&waitonlock,"waitonlock");
         if (waitonlock){
                 WriteLockFile(lockname);