Changeset 1842

Timestamp:

08/24/09 17:57:54 (16 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

Location:

issm/trunk/src/c/Qmux

Files:

• DakotaResponses.cpp (modified) (2 diffs)
• Qmux.h (modified) (1 diff)
• SpawnCore.cpp (modified) (1 diff)
• SpawnCoreSerial.cpp (modified) (2 diffs)

issm/trunk/src/c/Qmux/DakotaResponses.cpp

@@ -14 +14 @@
 #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 +24 @@
 
         /*recover first model: */
-        fem=femmodels;
+        fem=model->DiagnosticHorizontal();
 
         /*some data needed across the responses: */

issm/trunk/src/c/Qmux/Qmux.h

@@ -9 +9 @@
 
 /* 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
 

issm/trunk/src/c/Qmux/SpawnCore.cpp

@@ -19 +19 @@
 #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
 

issm/trunk/src/c/Qmux/SpawnCoreSerial.cpp

@@ -21 +21 @@
 #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 +58 @@
 
         //call SpwanCore matlab routine.
-        array[0]=femmodels;
+        array[0]=model;
         array[1]=inputs;
         array[2]=mxvariables;