Changeset 1840

Timestamp:

08/24/09 17:57:05 (15 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

File:

• issm/trunk/src/c/Qmux/Qmux.cpp (modified) (4 diffs)

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

@@ -57 +57 @@
 
 #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 Qmux(mxArray* model,mxArray* inputs,int analysis_type,int sub_analysis_type,char* dakota_input_file,char* dakota_output_file,char* dakota_error_file){
 #else
-void Qmux(FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){
+void Qmux(Model* model,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){
 #endif
 
@@ -76 +76 @@
         #ifdef _PARALLEL_
         /*Recover dakota_input_file, dakota_output_file and dakota_error_file, in the parameters dataset in parallel */
-        femmodels->parameters->FindParam((void*)&dakota_input_file,"qmuinname");
-        femmodels->parameters->FindParam((void*)&dakota_output_file,"qmuoutname");
-        femmodels->parameters->FindParam((void*)&dakota_error_file,"qmuerrname");
+        model->DiagnosticHorizontal()->parameters->FindParam((void*)&dakota_input_file,"qmuinname");
+        model->DiagnosticHorizontal()->parameters->FindParam((void*)&dakota_output_file,"qmuoutname");
+        model->DiagnosticHorizontal()->parameters->FindParam((void*)&dakota_error_file,"qmuerrname");
         #endif
 
@@ -117 +117 @@
 
                         // Serial case: plug in derived Interface object without an analysisComm
-                        interface.assign_rep(new SIM::DakotaPlugin(problem_db,(void*)femmodels,(void*)inputs,analysis_type,sub_analysis_type), false);
+                        interface.assign_rep(new SIM::DakotaPlugin(problem_db,(void*)model,(void*)inputs,analysis_type,sub_analysis_type), false);
                 }
         
@@ -134 +134 @@
                 for(;;){
 
-                        SpawnCore(NULL,0, NULL,NULL,0,femmodels,inputs,analysis_type,sub_analysis_type,0);
+                        SpawnCore(NULL,0, NULL,NULL,0,model,inputs,analysis_type,sub_analysis_type,0);
 
                         //Figure out if cpu 0 is done iterating