Changeset 4351

Timestamp:

06/30/10 13:10:35 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor bug fix

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• solutions/stokescontrolinit.cpp (modified) (2 diffs)

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

@@ -25 +25 @@
         if(iomodel->control_analysis){
 
-                if (strcmp(iomodel->control_type,"drag")==0){
+                if (strcmp(iomodel->control_type,"drag_coefficient")==0){
                         parameters->AddObject(new BoolParam(ExtrudeParamEnum,false));
                         parameters->AddObject(new IntParam(ControlTypeEnum,DragCoefficientEnum));
                 }
-                else  if (strcmp(iomodel->control_type,"B")==0){
+                else  if (strcmp(iomodel->control_type,"rheology_B")==0){
                         parameters->AddObject(new BoolParam(ExtrudeParamEnum,true));
                         parameters->AddObject(new IntParam(ControlTypeEnum,RheologyBEnum));

issm/trunk/src/c/solutions/stokescontrolinit.cpp

@@ -15 +15 @@
 
         /*flags: */
-        int verbose=0;
-        int isstokes=0;
+        int    verbose = 0;
+        bool   isstokes;
         double stokesreconditioning;
-        bool conserve_loads=true;
+        bool   conserve_loads = true;
         
         /*first recover parameters common to all solutions:*/
@@ -26 +26 @@
 
         /*if no Stokes analysis carried out, assign output and return*/
-        if (!isstokes)femmodel->SetCurrentAnalysis(DiagnosticHorizAnalysisEnum);
+        if (!isstokes){
+                femmodel->SetCurrentAnalysis(DiagnosticHorizAnalysisEnum);
+                return;
+        }
 
         /* For Stokes inverse control method, we are going to carry out the inversion only on the Stokes part. So we need