Index: /issm/trunk/src/c/Qmux/DakotaResponses.cpp
===================================================================
--- /issm/trunk/src/c/Qmux/DakotaResponses.cpp	(revision 1841)
+++ /issm/trunk/src/c/Qmux/DakotaResponses.cpp	(revision 1842)
@@ -14,5 +14,5 @@
 #undef __FUNCT__ 
 #define __FUNCT__ "DakotaResponses"
-void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,FemModel* femmodels,DataSet* results,int analysis_type,int sub_analysis_type){
+void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,Model* model,DataSet* results,int analysis_type,int sub_analysis_type){
 
 	int i,j;
@@ -24,5 +24,5 @@
 
 	/*recover first model: */
-	fem=femmodels;
+	fem=model->DiagnosticHorizontal();
 
 	/*some data needed across the responses: */
Index: /issm/trunk/src/c/Qmux/Qmux.h
===================================================================
--- /issm/trunk/src/c/Qmux/Qmux.h	(revision 1841)
+++ /issm/trunk/src/c/Qmux/Qmux.h	(revision 1842)
@@ -9,12 +9,12 @@
 
 /* local prototypes: */
-void SpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodels,void* inputs,int analysis_type,int sub_analysis_type,int counter);
+void SpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* model,void* inputs,int analysis_type,int sub_analysis_type,int counter);
 #ifdef _SERIAL_
-void Qmux(mxArray* femmodels,mxArray* inputs,int analysis_type,int sub_analysis_type,char* dakota_input_file,char* dakota_output_file,char* dakota_error_file);
-void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* femmodels,mxArray* inputs,int analysis_type,int sub_analysis_type,int counter);
+void Qmux(mxArray* model,mxArray* inputs,int analysis_type,int sub_analysis_type,char* dakota_input_file,char* dakota_output_file,char* dakota_error_file);
+void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* model,mxArray* inputs,int analysis_type,int sub_analysis_type,int counter);
 #else
-void Qmux(FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
-void SpawnCoreParallel(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type,int counter);
-void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,FemModel* femmodels, DataSet* results,int analysis_type,int sub_analysis_type);
+void Qmux(Model* model,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
+void SpawnCoreParallel(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, Model* model,ParameterInputs* inputs,int analysis_type,int sub_analysis_type,int counter);
+void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,Model* model, DataSet* results,int analysis_type,int sub_analysis_type);
 #endif
 
Index: /issm/trunk/src/c/Qmux/SpawnCore.cpp
===================================================================
--- /issm/trunk/src/c/Qmux/SpawnCore.cpp	(revision 1841)
+++ /issm/trunk/src/c/Qmux/SpawnCore.cpp	(revision 1842)
@@ -19,12 +19,12 @@
 #include "../include/macros.h"
 
-void SpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodels,void* inputs,int analysis_type,int sub_analysis_type,int counter){
+void SpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* model,void* inputs,int analysis_type,int sub_analysis_type,int counter){
 
 
 	/*Branch into a serial SpawnCore and a parallel SpawnCore: */
 	#ifdef _SERIAL_
-	SpawnCoreSerial(responses, numresponses, variables, variables_descriptors,numvariables, (mxArray*)femmodels, (mxArray*)inputs,analysis_type,sub_analysis_type,counter);
+	SpawnCoreSerial(responses, numresponses, variables, variables_descriptors,numvariables, (mxArray*)model, (mxArray*)inputs,analysis_type,sub_analysis_type,counter);
 	#else
-	SpawnCoreParallel(responses, numresponses, variables, variables_descriptors,numvariables, (FemModel*)femmodels, (ParameterInputs*)inputs,analysis_type,sub_analysis_type,counter);
+	SpawnCoreParallel(responses, numresponses, variables, variables_descriptors,numvariables, (Model*)model, (ParameterInputs*)inputs,analysis_type,sub_analysis_type,counter);
 	#endif
 
Index: /issm/trunk/src/c/Qmux/SpawnCoreSerial.cpp
===================================================================
--- /issm/trunk/src/c/Qmux/SpawnCoreSerial.cpp	(revision 1841)
+++ /issm/trunk/src/c/Qmux/SpawnCoreSerial.cpp	(revision 1842)
@@ -21,5 +21,5 @@
 #include "../include/macros.h"
 
-void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* femmodels,mxArray* inputs,int analysis_type,int sub_analysis_type,int counter){
+void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* model,mxArray* inputs,int analysis_type,int sub_analysis_type,int counter){
 
 	int i;
@@ -58,5 +58,5 @@
 
 	//call SpwanCore matlab routine.
-	array[0]=femmodels;
+	array[0]=model;
 	array[1]=inputs;
 	array[2]=mxvariables;