Changeset 5043

Timestamp:

08/06/10 15:33:20 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed control method steady: parameter ControlSteady was never set as true

Location:

issm/trunk/src/c/modules/ModelProcessorx

Files:

• Control/CreateParametersControl.cpp (modified) (3 diffs)
• CreateParameters.cpp (modified) (1 diff)
• ModelProcessorx.h (modified) (1 diff)
• Qmu/CreateParametersQmu.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -12 +12 @@
 #include "../ModelProcessorx.h"
 
-void CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type){
+void CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type){
         
         int i;
@@ -25 +25 @@
         if(iomodel->control_analysis){
 
+                /*What control type?*/
                 if (strcmp(iomodel->control_type,"drag_coefficient")==0){
                         parameters->AddObject(new IntParam(ControlTypeEnum,DragCoefficientEnum));
@@ -34 +35 @@
                  ISSMERROR("control_type %s not supported yet!",iomodel->control_type);
 
-                parameters->AddObject(new BoolParam(ControlSteadyEnum,false));
+                /*What solution type?*/
+                if (solution_type==DiagnosticSolutionEnum){
+                        parameters->AddObject(new BoolParam(ControlSteadyEnum,false));
+                }
+                else if (solution_type==SteadystateSolutionEnum){
+                        parameters->AddObject(new BoolParam(ControlSteadyEnum,true));
+                }
+                else{
+                        ISSMERROR("Control for solution of type %s not supported yet",EnumAsString(solution_type));
+                }
                 parameters->AddObject(new IntParam(NStepsEnum,iomodel->nsteps));
                 parameters->AddObject(new DoubleParam(TolXEnum,iomodel->tolx));

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -108 +108 @@
 
         /*Before returning, create parameters in case we are running Qmu or control types runs: */
-        CreateParametersControl(&parameters,iomodel,iomodel_handle,analysis_type);
-        CreateParametersQmu(&parameters,iomodel,iomodel_handle,analysis_type);
+        CreateParametersControl(&parameters,iomodel,iomodel_handle,solution_type,analysis_type);
+        CreateParametersQmu(&parameters,iomodel,iomodel_handle,solution_type,analysis_type);
 
         /*Assign output pointer: */

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -19 +19 @@
 void  CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,const int nummodels);
 void  CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,const int solution_type,int analysis_type,int analysis_counter);
-void  CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);
-void  CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);
+void  CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type);
+void  CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type);
 
 /*Creation of fem datasets: specialised drivers: */

issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp

@@ -13 +13 @@
 #include "../ModelProcessorx.h"
 
-void CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type){
+void CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type){
 
         /*variable declarations: {{{1*/