Changeset 14537

Timestamp:

04/11/13 13:36:54 (12 years ago)

Author:

Eric.Larour

Message:

CHG: new GIA enum, new solution for GIA test330

Location:

issm/trunk-jpl

Files:

• src/c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (3 diffs)
• src/m/enum/EnumDefinitions.py (modified) (2 diffs)
• src/m/enum/GiaSolutionEnum.m (added)
• src/m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• src/mobile/android/ISSM_APP/project.properties (modified) (1 diff)
• test/NightlyRun/test330.m (modified) (1 diff)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -261 +261 @@
         ThermalSolutionEnum,
         TransientSolutionEnum,
+        GiaSolutionEnum,
         /*}}}*/
         /*Approximations {{{1*/

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

@@ -264 +264 @@
                 case ThermalSolutionEnum : return "ThermalSolution";
                 case TransientSolutionEnum : return "TransientSolution";
+                case GiaSolutionEnum : return "GiaSolution";
                 case ApproximationEnum : return "Approximation";
                 case NoneApproximationEnum : return "NoneApproximation";

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

@@ -271 +271 @@
               else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
+              else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
               else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
               else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
@@ -383 +384 @@
               else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
               else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
-              else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
+              if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
+              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
               else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
@@ -506 +507 @@
               else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
               else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum;
-              else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
+              if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
+              else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
               else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
               else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -2479 +2479 @@
         return StringToEnum('TransientSolution')[0]
 
+def GiaSolutionEnum():
+        """
+        GIASOLUTIONENUM - Enum of GiaSolution
+
+           Usage:
+              macro=GiaSolutionEnum()
+        """
+
+        return StringToEnum('GiaSolution')[0]
+
 def ApproximationEnum():
         """
@@ -5037 +5047 @@
         """
 
-        return 502
-
+        return 503
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=502;
+macro=503;

issm/trunk-jpl/src/mobile/android/ISSM_APP/project.properties

@@ -12 +12 @@
 
 # Project target.
-target=android-17
+target=android-16

issm/trunk-jpl/test/NightlyRun/test330.m

@@ -1 @@
-%GIT test, inspired on test101
+%GIA test, inspired on test101
 md=triangle(model(),'../Exp/Square.exp',50000.);
 md=setmask(md,'all','');