Changeset 13047 for issm/trunk-jpl/src/c/modules

Timestamp:

08/15/12 17:09:02 (13 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added new Enums to support l1l2 equations (still under development)

Location:

issm/trunk-jpl/src/c/modules

Files:

• EnumToStringx/EnumToStringx.cpp (modified) (6 diffs)
• StringToEnumx/StringToEnumx.cpp (modified) (9 diffs)

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -55 +55 @@
                 case FlowequationElementEquationEnum : return "FlowequationElementEquation";
                 case FlowequationIshutterEnum : return "FlowequationIshutter";
+                case FlowequationIsl1l2Enum : return "FlowequationIsl1l2";
                 case FlowequationIsmacayealpattynEnum : return "FlowequationIsmacayealpattyn";
                 case FlowequationIsstokesEnum : return "FlowequationIsstokes";
@@ -237 +238 @@
                 case TransientSolutionEnum : return "TransientSolution";
                 case ApproximationEnum : return "Approximation";
+                case NoneApproximationEnum : return "NoneApproximation";
                 case HutterApproximationEnum : return "HutterApproximation";
                 case MacAyealApproximationEnum : return "MacAyealApproximation";
                 case MacAyealPattynApproximationEnum : return "MacAyealPattynApproximation";
                 case MacAyealStokesApproximationEnum : return "MacAyealStokesApproximation";
-                case NoneApproximationEnum : return "NoneApproximation";
+                case L1L2ApproximationEnum : return "L1L2Approximation";
                 case PattynApproximationEnum : return "PattynApproximation";
                 case PattynStokesApproximationEnum : return "PattynStokesApproximation";
@@ -281 +283 @@
                 case NumericalfluxEnum : return "Numericalflux";
                 case ParamEnum : return "Param";
+                case L1L2IceFrontEnum : return "L1L2IceFront";
                 case PattynIceFrontEnum : return "PattynIceFront";
                 case PengridEnum : return "Pengrid";
@@ -372 +375 @@
                 case EnthalpyPicardEnum : return "EnthalpyPicard";
                 case ThicknessAbsGradientEnum : return "ThicknessAbsGradient";
+                case ThicknessAlongGradientEnum : return "ThicknessAlongGradient";
+                case ThicknessAcrossGradientEnum : return "ThicknessAcrossGradient";
                 case StepResponsesEnum : return "StepResponses";
                 case IntMatParamEnum : return "IntMatParam";
@@ -392 +397 @@
                 case StressTensoryzEnum : return "StressTensoryz";
                 case StressTensorzzEnum : return "StressTensorzz";
-                case IceVolumeEnum : return "IceVolume";
-                case TotalSmbEnum : return "TotalSmb";
-                case ThicknessAlongGradientEnum : return "ThicknessAlongGradient";
-                case ThicknessAcrossGradientEnum : return "ThicknessAcrossGradient";
                 case P0Enum : return "P0";
                 case P1Enum : return "P1";
@@ -429 +430 @@
                 case MaxVzEnum : return "MaxVz";
                 case MaxAbsVzEnum : return "MaxAbsVz";
+                case IceVolumeEnum : return "IceVolume";
+                case TotalSmbEnum : return "TotalSmb";
                 case RelativeEnum : return "Relative";
                 case AbsoluteEnum : return "Absolute";

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -56 +56 @@
               else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum;
               else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum;
+              else if (strcmp(name,"FlowequationIsl1l2")==0) return FlowequationIsl1l2Enum;
               else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum;
               else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum;
@@ -137 +138 @@
               else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum;
               else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum;
-              else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
+              if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
+              else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
               else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
               else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
@@ -241 +242 @@
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
               else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
+              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
               else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum;
               else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum;
               else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum;
               else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum;
-              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
+              else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
               else if (strcmp(name,"PattynApproximation")==0) return PattynApproximationEnum;
               else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum;
@@ -259 +261 @@
               else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
               else if (strcmp(name,"Contour")==0) return ContourEnum;
-              else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
-              else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
+              if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
+              else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
+              else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
               else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
               else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
@@ -288 +290 @@
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
+              else if (strcmp(name,"L1L2IceFront")==0) return L1L2IceFrontEnum;
               else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
               else if (strcmp(name,"Pengrid")==0) return PengridEnum;
@@ -379 +382 @@
               else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
               else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
-              else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
+              else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
+              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
+         else stage=4;
+   }
+   if(stage==4){
+              if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
               else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
               else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
               else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
               else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
-         else stage=4;
-   }
-   if(stage==4){
-              if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum;
+              else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum;
               else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
               else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
@@ -402 +407 @@
               else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
               else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
-              else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
-              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
-              else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
-              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
               else if (strcmp(name,"P0")==0) return P0Enum;
               else if (strcmp(name,"P1")==0) return P1Enum;
@@ -439 +440 @@
               else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
               else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
+              else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
+              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
               else if (strcmp(name,"Relative")==0) return RelativeEnum;
               else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
@@ -488 +491 @@
    }
         /*If we reach this point, the string provided has not been found*/
-        _error_("Enum " << name << " not found");
+        _error2_("Enum " << name << " not found");
 }