Changeset 3725

Timestamp:

05/11/10 12:28:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumAsString.cpp (modified) (2 diffs)
• EnumDefinitions/StringAsEnum.cpp (modified) (2 diffs)
• ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

@@ -358 +358 @@
                 case ConstantEnum :
                         return "Constant";
+                case KflagEnum :
+                        return "Kflag";
+                case PflagEnum :
+                        return "Pflag";
                 case OutputFileNameEnum :
                         return "OutputFileName";
@@ -426 +430 @@
                 case ControlSteadyEnum :
                         return "ControlSteady";
+                case NStepsEnum :
+                        return "NSteps";
                 case TolXEnum :
                         return "TolX";

issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp

@@ -185 +185 @@
         else if (strcmp(name,"PenaltyOffset")==0) return PenaltyOffsetEnum;
         else if (strcmp(name,"Constant")==0) return ConstantEnum;
+        else if (strcmp(name,"Kflag")==0) return KflagEnum;
+        else if (strcmp(name,"Pflag")==0) return PflagEnum;
         else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
         else if (strcmp(name,"Dim")==0) return DimEnum;
@@ -219 +221 @@
         else if (strcmp(name,"ExtrudeParam")==0) return ExtrudeParamEnum;
         else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
+        else if (strcmp(name,"NSteps")==0) return NStepsEnum;
         else if (strcmp(name,"TolX")==0) return TolXEnum;
         else if (strcmp(name,"CmMin")==0) return CmMinEnum;

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

@@ -34 +34 @@
 
                 parameters->AddObject(new BoolParam(ControlSteadyEnum,false));
-                parameters->AddObject(new IntParam(NSteps,iomodel->nsteps));
+                parameters->AddObject(new IntParam(NStepsEnum,iomodel->nsteps));
                 parameters->AddObject(new DoubleParam(TolXEnum,iomodel->tolx));
                 parameters->AddObject(new DoubleParam(EpsCmEnum,iomodel->eps_cm));