Index: /issm/trunk/src/c/parallel/thermalstatic.cpp
===================================================================
--- /issm/trunk/src/c/parallel/thermalstatic.cpp	(revision 1815)
+++ /issm/trunk/src/c/parallel/thermalstatic.cpp	(revision 1816)
@@ -26,6 +26,6 @@
 	int   qmu_analysis=0;
 
-	/*Fem models : */
-	FemModel femmodels[7];
+	/*Model: */
+	Model* model=NULL;
 
 	/*Results: */
@@ -61,25 +61,28 @@
 	fid=pfopen(inputfilename,"rb");
 
+	/*Initialize model structure: */
+	model=new Model();
+
 	_printf_("read and create finite element model:\n");
 	_printf_("\n   reading diagnostic horiz model data:\n");
-	CreateFemModel(&femmodels[0],fid,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+	CreateFemModel(model->DiagnosticHorizontal(),fid,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
 	_printf_("\n   reading diagnostic vert model data:\n");
-	CreateFemModel(&femmodels[1],fid,DiagnosticAnalysisEnum(),VertAnalysisEnum());
+	CreateFemModel(model->DiagnosticVertical(),fid,DiagnosticAnalysisEnum(),VertAnalysisEnum());
 	_printf_("\n   reading diagnostic stokes model data:\n");
-	CreateFemModel(&femmodels[2],fid,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+	CreateFemModel(model->DiagnosticStokes(),fid,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
 	_printf_("\n   reading diagnostic hutter model data:\n");
-	CreateFemModel(&femmodels[3],fid,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
+	CreateFemModel(model->DiagnosticHutter(),fid,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
 	_printf_("\n   reading surface and bed slope computation model data:\n");
-	CreateFemModel(&femmodels[4],fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+	CreateFemModel(model->Slope(),fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
 	_printf_("\n   read and create thermal finite element model:\n");
-	CreateFemModel(&femmodels[5],fid,ThermalAnalysisEnum(),SteadyAnalysisEnum());
+	CreateFemModel(model->Thermal(),fid,ThermalAnalysisEnum(),SteadyAnalysisEnum());
 	_printf_("\n   read and create melting finite element model:\n");
-	CreateFemModel(&femmodels[6],fid,MeltingAnalysisEnum(),SteadyAnalysisEnum());
+	CreateFemModel(model->Melting(),fid,MeltingAnalysisEnum(),SteadyAnalysisEnum());
 
 	_printf_("initialize inputs:\n");
-	femmodels[0].parameters->FindParam((void*)&u_g_initial,"u_g");
-	femmodels[0].parameters->FindParam((void*)&numberofnodes,"numberofnodes");
-	femmodels[5].parameters->FindParam((void*)&dt,"dt");
-	femmodels[5].parameters->FindParam((void*)&p_g_initial,"p_g");
+	model->DiagnosticHorizontal()->parameters->FindParam((void*)&u_g_initial,"u_g");
+	model->DiagnosticHorizontal()->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
+	model->Thermal()->parameters->FindParam((void*)&dt,"dt");
+	model->Thermal()->parameters->FindParam((void*)&p_g_initial,"p_g");
 
 	inputs=new ParameterInputs;
@@ -89,6 +92,6 @@
 	
 	/*erase velocities: */
-	param=(Param*)femmodels[0].parameters->FindParamObject("u_g");
-	femmodels[0].parameters->DeleteObject((Object*)param);
+	param=(Param*)model->DiagnosticHorizontal()->parameters->FindParamObject("u_g");
+	model->DiagnosticHorizontal()->parameters->DeleteObject((Object*)param);
 
 	_printf_("initialize results:\n");
@@ -96,10 +99,10 @@
 
 	/*are we running the solution sequence, or a qmu wrapper around it? : */
-	femmodels[0].parameters->FindParam((void*)&qmu_analysis,"qmu_analysis");
+	model->DiagnosticHorizontal()->parameters->FindParam((void*)&qmu_analysis,"qmu_analysis");
 	if(!qmu_analysis){
 
 		/*run diagnostic analysis: */
 		_printf_("call computational core:\n");
-		thermalstatic_core(results,femmodels,inputs);
+		thermalstatic_core(results,model,inputs);
 
 	}
@@ -109,5 +112,5 @@
 
 		#ifdef _HAVE_DAKOTA_ 
-		Qmux(&femmodels[0],inputs,ThermalstaticAnalysisEnum(),NoneAnalysisEnum());
+		Qmux(model,inputs,ThermalstaticAnalysisEnum(),NoneAnalysisEnum());
 	 	#else
 		throw ErrorException(__FUNCT__," Dakota not present, cannot do qmu!");
@@ -120,5 +123,5 @@
 
 	_printf_("process results:\n");
-	ProcessResults(&results,&femmodels[0],ThermalstaticAnalysisEnum());
+	ProcessResults(&results,model,ThermalstaticAnalysisEnum());
 
 	_printf_("write results to disk:\n");
@@ -126,5 +129,5 @@
 
 	_printf_("write lock file:\n");
-	femmodels[0].parameters->FindParam((void*)&waitonlock,"waitonlock");
+	model->DiagnosticHorizontal()->parameters->FindParam((void*)&waitonlock,"waitonlock");
 	if (waitonlock){
 		WriteLockFile(lockname);