Changeset 25248

Timestamp:

07/10/20 10:01:33 (5 years ago)

Author:

jdquinn

Message:

BUG: Synchronized enums

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• Enum.vim (modified) (2 diffs)
• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -182 +182 @@
 syn keyword cConstant HydrologyStorageEnum
 syn keyword cConstant HydrologydcEplColapseThicknessEnum
-syn keyword cConstant HydrologydcEplCompressibilityEnum
 syn keyword cConstant HydrologydcEplConductivityEnum
 syn keyword cConstant HydrologydcEplInitialThicknessEnum
+syn keyword cConstant HydrologydcEplLayerCompressibilityEnum
 syn keyword cConstant HydrologydcEplMaxThicknessEnum
-syn keyword cConstant HydrologydcEplPorosityEnum
+syn keyword cConstant HydrologydcEplPoreWaterMassEnum
 syn keyword cConstant HydrologydcEplThickCompEnum
 syn keyword cConstant HydrologydcEplflipLockEnum
@@ -195 +195 @@
 syn keyword cConstant HydrologydcPenaltyLockEnum
 syn keyword cConstant HydrologydcRelTolEnum
-syn keyword cConstant HydrologydcSedimentCompressibilityEnum
 syn keyword cConstant HydrologydcSedimentlimitEnum
 syn keyword cConstant HydrologydcSedimentlimitFlagEnum
+syn keyword cConstant HydrologydcSedimentLayerCompressibilityEnum
+syn keyword cConstant HydrologydcSedimentPoreWaterMassEnum
 syn keyword cConstant HydrologydcSedimentPorosityEnum
 syn keyword cConstant HydrologydcSedimentThicknessEnum
 syn keyword cConstant HydrologydcTransferFlagEnum
 syn keyword cConstant HydrologydcUnconfinedFlagEnum
-syn keyword cConstant HydrologydcWaterCompressibilityEnum
 syn keyword cConstant HydrologyshreveStabilizationEnum
 syn keyword cConstant IcecapToEarthCommEnum

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

@@ -184 +184 @@
                 case HydrologyStorageEnum : return "HydrologyStorage";
                 case HydrologydcEplColapseThicknessEnum : return "HydrologydcEplColapseThickness";
-                case HydrologydcEplCompressibilityEnum : return "HydrologydcEplCompressibility";
                 case HydrologydcEplConductivityEnum : return "HydrologydcEplConductivity";
                 case HydrologydcEplInitialThicknessEnum : return "HydrologydcEplInitialThickness";
+                case HydrologydcEplLayerCompressibilityEnum : return "HydrologydcEplLayerCompressibility";
                 case HydrologydcEplMaxThicknessEnum : return "HydrologydcEplMaxThickness";
-                case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity";
+                case HydrologydcEplPoreWaterMassEnum : return "HydrologydcEplPoreWaterMass";
                 case HydrologydcEplThickCompEnum : return "HydrologydcEplThickComp";
                 case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock";
@@ -197 +197 @@
                 case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock";
                 case HydrologydcRelTolEnum : return "HydrologydcRelTol";
-                case HydrologydcSedimentCompressibilityEnum : return "HydrologydcSedimentCompressibility";
                 case HydrologydcSedimentlimitEnum : return "HydrologydcSedimentlimit";
                 case HydrologydcSedimentlimitFlagEnum : return "HydrologydcSedimentlimitFlag";
+                case HydrologydcSedimentLayerCompressibilityEnum : return "HydrologydcSedimentLayerCompressibility";
+                case HydrologydcSedimentPoreWaterMassEnum : return "HydrologydcSedimentPoreWaterMass";
                 case HydrologydcSedimentPorosityEnum : return "HydrologydcSedimentPorosity";
                 case HydrologydcSedimentThicknessEnum : return "HydrologydcSedimentThickness";
                 case HydrologydcTransferFlagEnum : return "HydrologydcTransferFlag";
                 case HydrologydcUnconfinedFlagEnum : return "HydrologydcUnconfinedFlag";
-                case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility";
                 case HydrologyshreveStabilizationEnum : return "HydrologyshreveStabilization";
                 case IcecapToEarthCommEnum : return "IcecapToEarthComm";

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

@@ -187 +187 @@
               else if (strcmp(name,"HydrologyStorage")==0) return HydrologyStorageEnum;
               else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum;
-              else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum;
               else if (strcmp(name,"HydrologydcEplConductivity")==0) return HydrologydcEplConductivityEnum;
               else if (strcmp(name,"HydrologydcEplInitialThickness")==0) return HydrologydcEplInitialThicknessEnum;
+              else if (strcmp(name,"HydrologydcEplLayerCompressibility")==0) return HydrologydcEplLayerCompressibilityEnum;
               else if (strcmp(name,"HydrologydcEplMaxThickness")==0) return HydrologydcEplMaxThicknessEnum;
-              else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum;
+              else if (strcmp(name,"HydrologydcEplPoreWaterMass")==0) return HydrologydcEplPoreWaterMassEnum;
               else if (strcmp(name,"HydrologydcEplThickComp")==0) return HydrologydcEplThickCompEnum;
               else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
@@ -200 +200 @@
               else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
               else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
-              else if (strcmp(name,"HydrologydcSedimentCompressibility")==0) return HydrologydcSedimentCompressibilityEnum;
               else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
               else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum;
+              else if (strcmp(name,"HydrologydcSedimentLayerCompressibility")==0) return HydrologydcSedimentLayerCompressibilityEnum;
+              else if (strcmp(name,"HydrologydcSedimentPoreWaterMass")==0) return HydrologydcSedimentPoreWaterMassEnum;
               else if (strcmp(name,"HydrologydcSedimentPorosity")==0) return HydrologydcSedimentPorosityEnum;
               else if (strcmp(name,"HydrologydcSedimentThickness")==0) return HydrologydcSedimentThicknessEnum;
               else if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum;
               else if (strcmp(name,"HydrologydcUnconfinedFlag")==0) return HydrologydcUnconfinedFlagEnum;
-              else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum;
               else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
               else if (strcmp(name,"IcecapToEarthComm")==0) return IcecapToEarthCommEnum;