Changeset 1831

Timestamp:

08/24/09 17:49:31 (16 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

File:

• issm/trunk/src/c/parallel/diagnostic_core.cpp (modified) (3 diffs)

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

@@ -13 +13 @@
 #include "../issm.h"
 
-void diagnostic_core(DataSet* results,FemModel* fems, ParameterInputs* inputs){
+void diagnostic_core(DataSet* results,Model* model, ParameterInputs* inputs){
 
         extern int my_rank;
@@ -58 +58 @@
 
         /*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
@@ -186 +186 @@
         result=new Result(results->Size()+1,0,1,"p_g",pg);
         results->AddObject(result);
-
         /*output if we have rifts: */
         if(numrifts){