Changeset 1829

Timestamp:

08/24/09 17:48:21 (15 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

File:

• issm/trunk/src/c/parallel/ControlInitialization.cpp (modified) (6 diffs)

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

@@ -13 +13 @@
 #include "../issm.h"
 
-void ControlInitialization(FemModel** pmodel, FemModel* fems, ParameterInputs* inputs){
+void ControlInitialization(Model* model, ParameterInputs* inputs){
 
         extern int my_rank;
@@ -53 +53 @@
 
         /*recover fem models: */
-        fem_dh=fems+0;
-        fem_dv=fems+1;
-        fem_ds=fems+2;
-        fem_dhu=fems+3;
-        fem_sl=fems+4;
+        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
@@ -75 +75 @@
         /*if no Stokes, assign output and return*/
         if (!isstokes){
-                *pmodel=fem_dh;
+                model->SetActive(fem_dh);
                 return;
         }
@@ -97 +97 @@
         //horizontal velocity
         if(debug)_printf_("%s\n"," computing horizontal velocities...");
-        diagnostic_core_nonlinear(&ug,NULL,NULL,NULL, fem_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+        diagnostic_core_nonlinear(&ug,NULL,NULL,fem_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
         if(debug)_printf_("%s\n"," extruding horizontal velocities...");
         VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh->loads,fem_dh-> materials,"velocity",1);
@@ -138 +138 @@
         if(debug)_printf_("%s\n"," computing stokes velocities and pressure ...");
         VecFree(&ug);
-        diagnostic_core_nonlinear(&ug,NULL,NULL,NULL, fem_ds,inputs,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+        diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_ds,inputs,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
         VecFree(&pg);
 
@@ -146 +146 @@
 
         /*Assign output*/
-        *pmodel=fem_ds;
+        model->SetActive(fem_ds);
 }