Index: /issm/trunk/src/c/parallel/ProcessResults.cpp
===================================================================
--- /issm/trunk/src/c/parallel/ProcessResults.cpp	(revision 1811)
+++ /issm/trunk/src/c/parallel/ProcessResults.cpp	(revision 1812)
@@ -21,5 +21,5 @@
 #include "../shared/shared.h"
 
-void ProcessResults(DataSet** presults,FemModel* fems,int analysis_type){
+void ProcessResults(DataSet** presults,Model* model,int analysis_type){
 
 	int i,n;
@@ -104,9 +104,9 @@
 	/*Recover femmodels first: */
 	if(analysis_type==DiagnosticAnalysisEnum()){
-		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();
 	
 		/*some flags needed: */
@@ -117,10 +117,10 @@
 	}
 	if(analysis_type==ThermalstaticAnalysisEnum()){
-		fem_dh=fems+0;
-		fem_dv=fems+1;
-		fem_ds=fems+2;
-		fem_dhu=fems+3;
-		fem_sl=fems+4;
-		fem_t=fems+5;
+		fem_dh=model->DiagnosticHorizontal();
+		fem_dv=model->DiagnosticVertical();
+		fem_ds=model->DiagnosticStokes();
+		fem_dhu=model->DiagnosticHutter();
+		fem_sl=model->Slope();
+		fem_t=model->Thermal();
 	
 		/*some flags needed: */
@@ -132,10 +132,10 @@
 
 	if(analysis_type==TransientAnalysisEnum()){
-		fem_dh=fems+0;
-		fem_dv=fems+1;
-		fem_ds=fems+2;
-		fem_dhu=fems+3;
-		fem_sl=fems+4;
-		fem_p=fems+5;
+		fem_dh=model->DiagnosticHorizontal();
+		fem_dv=model->DiagnosticVertical();
+		fem_ds=model->DiagnosticStokes();
+		fem_dhu=model->DiagnosticHutter();
+		fem_sl=model->Slope();
+		fem_p=model->Prognostic();
 	
 		/*some flags needed: */
@@ -146,23 +146,24 @@
 
 		if (dim==3){
-			fem_t=fems+6;
+			fem_t=model->Thermal();
 		}
 	}
 	
 	if(analysis_type==PrognosticAnalysisEnum()){
-		fem_p=fems+0;
+		fem_p=model->Prognostic();
 	}
 
 	if(analysis_type==ThermalAnalysisEnum()){
-		fem_t=fems+0;
+		fem_t=model->Thermal();
 	}
 
 	if(analysis_type==ControlAnalysisEnum()){
-		fem_dh=fems+0;
-		fem_dv=fems+1;
-		fem_ds=fems+2;
-		fem_dhu=fems+3;
-		fem_sl=fems+4;
-		fem_c=fems+0;  //load param_g
+		fem_dh=model->DiagnosticHorizontal();
+		fem_dv=model->DiagnosticVertical();
+		fem_ds=model->DiagnosticStokes();
+		fem_dhu=model->DiagnosticHutter();
+		fem_sl=model->Slope();
+		fem_p=model->Prognostic();
+		fem_c=model->DiagnosticHorizontal(); //load param_g
 
 		/*some flags needed: */