Changeset 18377

Timestamp:

08/13/14 13:43:52 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added some Enums for Sylvestre (Stress related)

Location:

issm/trunk-jpl

Files:

• externalpackages/vim/addons/vim/syntax/c.vim (modified) (12 diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)
• src/m/enum/EnumDefinitions.py (modified) (7 diffs)
• src/m/enum/QmuBaseEnum.m (deleted)
• src/m/enum/QmuDamageDEnum.m (deleted)
• src/m/enum/QmuMaskGroundediceLevelsetEnum.m (deleted)
• src/m/enum/QmuMaskIceLevelsetEnum.m (deleted)
• src/m/enum/QmuMaterialsRheologyBEnum.m (deleted)
• src/m/enum/QmuMeltingEnum.m (deleted)
• src/m/enum/QmuPressureEnum.m (deleted)
• src/m/enum/QmuSurfaceEnum.m (deleted)
• src/m/enum/QmuTemperatureEnum.m (deleted)
• src/m/enum/QmuThicknessEnum.m (deleted)
• src/m/enum/QmuVxEnum.m (deleted)
• src/m/enum/QmuVxMeshEnum.m (deleted)
• src/m/enum/QmuVyEnum.m (deleted)
• src/m/enum/QmuVyMeshEnum.m (deleted)
• src/m/enum/QmuVzEnum.m (deleted)
• src/m/enum/QmuVzMeshEnum.m (deleted)
• src/m/enum/StressEnum.m (added)
• src/m/enum/StressxxEnum.m (added)
• src/m/enum/StressxyEnum.m (added)
• src/m/enum/StressxzEnum.m (added)
• src/m/enum/StressyyEnum.m (added)
• src/m/enum/StressyzEnum.m (added)
• src/m/enum/StresszzEnum.m (added)

issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim

@@ -548 +548 @@
 syn keyword cType StressbalanceVerticalAnalysis
 syn keyword cType ThermalAnalysis
+syn keyword cType UzawaPressureAnalysis
 "ISSM's objects end
 "ISSM's Enums begin
@@ -708 +709 @@
 syn keyword cConstant InversionVzObsEnum
 syn keyword cConstant MaskIceLevelsetEnum
-syn keyword cConstant QmuMaskIceLevelsetEnum
 syn keyword cConstant MaterialsBetaEnum
 syn keyword cConstant MaterialsHeatcapacityEnum
@@ -721 +721 @@
 syn keyword cConstant DamageDEnum
 syn keyword cConstant DamageFEnum
-syn keyword cConstant QmuDamageDEnum
 syn keyword cConstant DamageDbarEnum
 syn keyword cConstant DamageLawEnum
@@ -741 +740 @@
 syn keyword cConstant DamageEvolutionNumRequestedOutputsEnum
 syn keyword cConstant DamageEvolutionRequestedOutputsEnum
+syn keyword cConstant NewDamageEnum
 syn keyword cConstant MaterialsRhoIceEnum
 syn keyword cConstant MaterialsRhoSeawaterEnum
@@ -794 +794 @@
 syn keyword cConstant QmuResponsedescriptorsEnum
 syn keyword cConstant QmuVariabledescriptorsEnum
-syn keyword cConstant QmuMaterialsRheologyBEnum
 syn keyword cConstant RiftsNumriftsEnum
 syn keyword cConstant RiftsRiftstructEnum
@@ -926 +925 @@
 syn keyword cConstant ThermalSolutionEnum
 syn keyword cConstant TransientSolutionEnum
+syn keyword cConstant UzawaPressureAnalysisEnum
 syn keyword cConstant GiaSolutionEnum
 syn keyword cConstant GiaAnalysisEnum
@@ -1035 +1035 @@
 syn keyword cConstant PressureEnum
 syn keyword cConstant PressurePicardEnum
-syn keyword cConstant QmuPressureEnum
-syn keyword cConstant QmuVxEnum
-syn keyword cConstant QmuVyEnum
-syn keyword cConstant QmuVzEnum
-syn keyword cConstant QmuThicknessEnum
-syn keyword cConstant QmuBaseEnum
-syn keyword cConstant QmuSurfaceEnum
-syn keyword cConstant QmuMeltingEnum
-syn keyword cConstant QmuVxMeshEnum
-syn keyword cConstant QmuVyMeshEnum
-syn keyword cConstant QmuVzMeshEnum
 syn keyword cConstant AndroidFrictionCoefficientEnum
 syn keyword cConstant ResetPenaltiesEnum
@@ -1089 +1078 @@
 syn keyword cConstant BasalFrictionEnum
 syn keyword cConstant ViscousHeatingEnum
-syn keyword cConstant QmuTemperatureEnum
 syn keyword cConstant HydrologyWaterVxEnum
 syn keyword cConstant HydrologyWaterVyEnum
@@ -1107 +1095 @@
 syn keyword cConstant DeviatoricStressyzEnum
 syn keyword cConstant DeviatoricStresszzEnum
+syn keyword cConstant StressEnum
+syn keyword cConstant StressxxEnum
+syn keyword cConstant StressxyEnum
+syn keyword cConstant StressxzEnum
+syn keyword cConstant StressyyEnum
+syn keyword cConstant StressyzEnum
+syn keyword cConstant StresszzEnum
 syn keyword cConstant StrainRateEnum
 syn keyword cConstant StrainRatexxEnum
@@ -1135 +1130 @@
 syn keyword cConstant MINIcondensedEnum
 syn keyword cConstant TaylorHoodEnum
+syn keyword cConstant LATaylorHoodEnum
 syn keyword cConstant XTaylorHoodEnum
 syn keyword cConstant OneLayerP4zEnum
@@ -1179 +1175 @@
 syn keyword cConstant IncrementalEnum
 syn keyword cConstant AugmentedLagrangianREnum
+syn keyword cConstant AugmentedLagrangianRhopEnum
+syn keyword cConstant AugmentedLagrangianRlambdaEnum
+syn keyword cConstant AugmentedLagrangianRholambdaEnum
 syn keyword cConstant AugmentedLagrangianThetaEnum
 syn keyword cConstant NoneEnum
@@ -1187 +1186 @@
 syn keyword cConstant ContactEnum
 syn keyword cConstant MaskGroundediceLevelsetEnum
-syn keyword cConstant QmuMaskGroundediceLevelsetEnum
 syn keyword cConstant GaussSegEnum
 syn keyword cConstant GaussTriaEnum

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

@@ -570 +570 @@
         DeviatoricStressyzEnum,
         DeviatoricStresszzEnum,
+        StressEnum,
+        StressxxEnum,
+        StressxyEnum,
+        StressxzEnum,
+        StressyyEnum,
+        StressyzEnum,
+        StresszzEnum,
         StrainRateEnum,
         StrainRatexxEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -561 +561 @@
                 case DeviatoricStressyzEnum : return "DeviatoricStressyz";
                 case DeviatoricStresszzEnum : return "DeviatoricStresszz";
+                case StressEnum : return "Stress";
+                case StressxxEnum : return "Stressxx";
+                case StressxyEnum : return "Stressxy";
+                case StressxzEnum : return "Stressxz";
+                case StressyyEnum : return "Stressyy";
+                case StressyzEnum : return "Stressyz";
+                case StresszzEnum : return "Stresszz";
                 case StrainRateEnum : return "StrainRate";
                 case StrainRatexxEnum : return "StrainRatexx";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -573 +573 @@
               else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
               else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
+              else if (strcmp(name,"Stress")==0) return StressEnum;
+              else if (strcmp(name,"Stressxx")==0) return StressxxEnum;
+              else if (strcmp(name,"Stressxy")==0) return StressxyEnum;
+              else if (strcmp(name,"Stressxz")==0) return StressxzEnum;
+              else if (strcmp(name,"Stressyy")==0) return StressyyEnum;
+              else if (strcmp(name,"Stressyz")==0) return StressyzEnum;
+              else if (strcmp(name,"Stresszz")==0) return StresszzEnum;
               else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
               else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
@@ -622 +629 @@
               else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
               else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
-              else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
               else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
               else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
@@ -629 +639 @@
               else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
               else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
-         else stage=6;
-   }
-   if(stage==6){
-              if (strcmp(name,"MinVel")==0) return MinVelEnum;
+              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
               else if (strcmp(name,"MinVx")==0) return MinVxEnum;

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

@@ -167 +167 @@
 def InversionVzObsEnum(): return StringToEnum("InversionVzObs")[0]
 def MaskIceLevelsetEnum(): return StringToEnum("MaskIceLevelset")[0]
-def QmuMaskIceLevelsetEnum(): return StringToEnum("QmuMaskIceLevelset")[0]
 def MaterialsBetaEnum(): return StringToEnum("MaterialsBeta")[0]
 def MaterialsHeatcapacityEnum(): return StringToEnum("MaterialsHeatcapacity")[0]
@@ -180 +179 @@
 def DamageDEnum(): return StringToEnum("DamageD")[0]
 def DamageFEnum(): return StringToEnum("DamageF")[0]
-def QmuDamageDEnum(): return StringToEnum("QmuDamageD")[0]
 def DamageDbarEnum(): return StringToEnum("DamageDbar")[0]
 def DamageLawEnum(): return StringToEnum("DamageLaw")[0]
@@ -254 +252 @@
 def QmuResponsedescriptorsEnum(): return StringToEnum("QmuResponsedescriptors")[0]
 def QmuVariabledescriptorsEnum(): return StringToEnum("QmuVariabledescriptors")[0]
-def QmuMaterialsRheologyBEnum(): return StringToEnum("QmuMaterialsRheologyB")[0]
 def RiftsNumriftsEnum(): return StringToEnum("RiftsNumrifts")[0]
 def RiftsRiftstructEnum(): return StringToEnum("RiftsRiftstruct")[0]
@@ -496 +493 @@
 def PressureEnum(): return StringToEnum("Pressure")[0]
 def PressurePicardEnum(): return StringToEnum("PressurePicard")[0]
-def QmuPressureEnum(): return StringToEnum("QmuPressure")[0]
-def QmuVxEnum(): return StringToEnum("QmuVx")[0]
-def QmuVyEnum(): return StringToEnum("QmuVy")[0]
-def QmuVzEnum(): return StringToEnum("QmuVz")[0]
-def QmuThicknessEnum(): return StringToEnum("QmuThickness")[0]
-def QmuBaseEnum(): return StringToEnum("QmuBase")[0]
-def QmuSurfaceEnum(): return StringToEnum("QmuSurface")[0]
-def QmuMeltingEnum(): return StringToEnum("QmuMelting")[0]
-def QmuVxMeshEnum(): return StringToEnum("QmuVxMesh")[0]
-def QmuVyMeshEnum(): return StringToEnum("QmuVyMesh")[0]
-def QmuVzMeshEnum(): return StringToEnum("QmuVzMesh")[0]
 def AndroidFrictionCoefficientEnum(): return StringToEnum("AndroidFrictionCoefficient")[0]
 def ResetPenaltiesEnum(): return StringToEnum("ResetPenalties")[0]
@@ -550 +536 @@
 def BasalFrictionEnum(): return StringToEnum("BasalFriction")[0]
 def ViscousHeatingEnum(): return StringToEnum("ViscousHeating")[0]
-def QmuTemperatureEnum(): return StringToEnum("QmuTemperature")[0]
 def HydrologyWaterVxEnum(): return StringToEnum("HydrologyWaterVx")[0]
 def HydrologyWaterVyEnum(): return StringToEnum("HydrologyWaterVy")[0]
@@ -568 +553 @@
 def DeviatoricStressyzEnum(): return StringToEnum("DeviatoricStressyz")[0]
 def DeviatoricStresszzEnum(): return StringToEnum("DeviatoricStresszz")[0]
+def StressEnum(): return StringToEnum("Stress")[0]
+def StressxxEnum(): return StringToEnum("Stressxx")[0]
+def StressxyEnum(): return StringToEnum("Stressxy")[0]
+def StressxzEnum(): return StringToEnum("Stressxz")[0]
+def StressyyEnum(): return StringToEnum("Stressyy")[0]
+def StressyzEnum(): return StringToEnum("Stressyz")[0]
+def StresszzEnum(): return StringToEnum("Stresszz")[0]
 def StrainRateEnum(): return StringToEnum("StrainRate")[0]
 def StrainRatexxEnum(): return StringToEnum("StrainRatexx")[0]
@@ -652 +644 @@
 def ContactEnum(): return StringToEnum("Contact")[0]
 def MaskGroundediceLevelsetEnum(): return StringToEnum("MaskGroundediceLevelset")[0]
-def QmuMaskGroundediceLevelsetEnum(): return StringToEnum("QmuMaskGroundediceLevelset")[0]
 def GaussSegEnum(): return StringToEnum("GaussSeg")[0]
 def GaussTriaEnum(): return StringToEnum("GaussTria")[0]