Changeset 1881 for issm/trunk/src/c/parallel/ControlInitialization.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/ControlInitialization.cpp (modified) (2 diffs)

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

@@ -52 +52 @@
         int dof3[1]={3};
 
+        /*first recover parameters common to all solutions:*/
+        model->FindParam(&debug,"debug");
+        model->FindParam(&dim,"dim");
+        model->FindParam(&ishutter,"ishutter");
+        model->FindParam(&ismacayealpattyn,"ismacayealpattyn");
+        model->FindParam(&numberofnodes,"numberofnodes");
+        model->FindParam(&isstokes,"isstokes");
+        model->FindParam(&stokesreconditioning,"stokesreconditioning");
+
         /*recover fem models: */
-        fem_dh=model->DiagnosticHorizontal();
-        fem_dv=model->DiagnosticVertical();
-        fem_ds=model->DiagnosticStokes();
-        fem_dhu=model->DiagnosticHutter();
-        fem_sl=model->Slope();
-
-        //first recover parameters common to all solutions
-        fem_dh->parameters->FindParam((void*)&debug,"debug");
-        fem_dh->parameters->FindParam((void*)&dim,"dim");
-        fem_dhu->parameters->FindParam((void*)&ishutter,"ishutter");
-        fem_dh->parameters->FindParam((void*)&ismacayealpattyn,"ismacayealpattyn");
-        fem_dh->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
-        fem_ds->parameters->FindParam((void*)&isstokes,"isstokes");
-        fem_ds->parameters->FindParam((void*)&stokesreconditioning,"stokesreconditioning");
+        fem_dh=model->GetFormulation(DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+        fem_dv=model->GetFormulation(DiagnosticAnalysisEnum(),VertAnalysisEnum());
+        fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+        fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum(),HutterAnalysisEnum());
+        fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum());
 
         //specific parameters for specific models
-        fem_dh->parameters->FindParam((void*)&numberofdofspernode_dh,"numberofdofspernode");
-        fem_sl->parameters->FindParam((void*)&numberofdofspernode_sl,"numberofdofspernode");
-        fem_ds->parameters->FindParam((void*)&numberofdofspernode_ds,"numberofdofspernode");
+        fem_dh->FindParam((void*)&numberofdofspernode_dh,"numberofdofspernode");
+        fem_sl->FindParam((void*)&numberofdofspernode_sl,"numberofdofspernode");
+        fem_ds->FindParam((void*)&numberofdofspernode_ds,"numberofdofspernode");
 
         /*if no Stokes, assign output and return*/
         if (!isstokes){
-                model->SetActive(fem_dh);
+                model->SetActiveFormulation(fem_dh);
                 return;
         }
@@ -146 +146 @@
 
         /*Assign output*/
-        model->SetActive(fem_ds);
+        model->SetActiveFormulation(fem_ds);
 }