Changeset 4051

Timestamp:

06/17/10 11:08:39 (15 years ago)

Author:

Eric.Larour

Message:

New enums

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumAsString.cpp (modified) (2 diffs)
• c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• c/EnumDefinitions/StringAsEnum.cpp (modified) (2 diffs)
• m/enum/AccumulationRateEnum.m (modified) (1 diff)
• m/enum/AdjointxEnum.m (modified) (1 diff)
• m/enum/AdjointyEnum.m (modified) (1 diff)
• m/enum/AdjointzEnum.m (modified) (1 diff)
• m/enum/AirEnum.m (modified) (1 diff)
• m/enum/ArtDiffEnum.m (modified) (1 diff)
• m/enum/BeamVertexElementResultEnum.m (added)
• m/enum/BeamVertexResultEnum.m (deleted)
• m/enum/BedEnum.m (modified) (1 diff)
• m/enum/BedSlopeXEnum.m (modified) (1 diff)
• m/enum/BedSlopeYEnum.m (modified) (1 diff)
• m/enum/BetaEnum.m (modified) (1 diff)
• m/enum/BoolExternalResultEnum.m (added)
• m/enum/BoundaryEnum.m (modified) (1 diff)
• m/enum/CmGradientEnum.m (modified) (1 diff)
• m/enum/CmJumpEnum.m (modified) (1 diff)
• m/enum/CmMaxDmpSlopeEnum.m (modified) (1 diff)
• m/enum/CmMaxDmpValueEnum.m (modified) (1 diff)
• m/enum/CmMaxEnum.m (modified) (1 diff)
• m/enum/CmMinDmpSlopeEnum.m (modified) (1 diff)
• m/enum/CmMinDmpValueEnum.m (modified) (1 diff)
• m/enum/CmMinEnum.m (modified) (1 diff)
• m/enum/CmNoiseDmpEnum.m (modified) (1 diff)
• m/enum/CollapseEnum.m (modified) (1 diff)
• m/enum/ConnectivityEnum.m (modified) (1 diff)
• m/enum/ConstantEnum.m (modified) (1 diff)
• m/enum/ControlParameterEnum.m (modified) (1 diff)
• m/enum/ControlSteadyEnum.m (modified) (1 diff)
• m/enum/ControlTypeEnum.m (modified) (1 diff)
• m/enum/ConvergedEnum.m (modified) (1 diff)
• m/enum/DakotaParameterEnum.m (modified) (1 diff)
• m/enum/DhDtEnum.m (modified) (1 diff)
• m/enum/DimEnum.m (modified) (1 diff)
• m/enum/DofVecEnum.m (modified) (1 diff)
• m/enum/DoubleElementResultEnum.m (added)
• m/enum/DoubleExternalResultEnum.m (added)
• m/enum/DoubleResultEnum.m (deleted)
• m/enum/DoubleVecExternalResultEnum.m (added)
• m/enum/DragCoefficientEnum.m (modified) (1 diff)
• m/enum/DragPEnum.m (modified) (1 diff)
• m/enum/DragQEnum.m (modified) (1 diff)
• m/enum/DragTypeEnum.m (modified) (1 diff)
• m/enum/DtEnum.m (modified) (1 diff)
• m/enum/ElementOnBedEnum.m (modified) (1 diff)
• m/enum/ElementOnIceShelfEnum.m (modified) (1 diff)
• m/enum/ElementOnSurfaceEnum.m (modified) (1 diff)
• m/enum/ElementOnWaterEnum.m (modified) (1 diff)
• m/enum/ElementResultEnum.m (added)
• m/enum/EnumAsString.m (modified) (2 diffs)
• m/enum/EpsAbsEnum.m (modified) (1 diff)
• m/enum/EpsCmEnum.m (modified) (1 diff)
• m/enum/EpsRelEnum.m (modified) (1 diff)
• m/enum/EpsResEnum.m (modified) (1 diff)
• m/enum/EpsVelEnum.m (modified) (1 diff)
• m/enum/ExternalResultEnum.m (added)
• m/enum/ExtrudeParamEnum.m (modified) (1 diff)
• m/enum/FillEnum.m (modified) (1 diff)
• m/enum/FitEnum.m (modified) (1 diff)
• m/enum/FractionIncrementEnum.m (modified) (1 diff)
• m/enum/FrictionEnum.m (modified) (1 diff)
• m/enum/GeographyEnum.m (modified) (1 diff)
• m/enum/GeothermalFluxEnum.m (modified) (1 diff)
• m/enum/GradientEnum.m (modified) (1 diff)
• m/enum/HeatCapacityEnum.m (modified) (1 diff)
• m/enum/IceEnum.m (modified) (1 diff)
• m/enum/IceSheetEnum.m (modified) (1 diff)
• m/enum/IceShelfEnum.m (modified) (1 diff)
• m/enum/IntExternalResultEnum.m (added)
• m/enum/InternalEnum.m (modified) (1 diff)
• m/enum/IsHutterEnum.m (modified) (1 diff)
• m/enum/IsMacAyealPattynEnum.m (modified) (1 diff)
• m/enum/IsStokesEnum.m (modified) (1 diff)
• m/enum/JEnum.m (added)
• m/enum/KflagEnum.m (modified) (1 diff)
• m/enum/LatentHeatEnum.m (modified) (1 diff)
• m/enum/LowmemEnum.m (modified) (1 diff)
• m/enum/MaxIterEnum.m (modified) (1 diff)
• m/enum/MaxNonlinearIterationsEnum.m (modified) (1 diff)
• m/enum/MaxPenetrationEnum.m (modified) (1 diff)
• m/enum/MeanVelEnum.m (modified) (1 diff)
• m/enum/MelangeEnum.m (modified) (1 diff)
• m/enum/MeltingOffsetEnum.m (modified) (1 diff)
• m/enum/MeltingPointEnum.m (modified) (1 diff)
• m/enum/MeltingRateEnum.m (modified) (1 diff)
• m/enum/MinMechanicalConstraintsEnum.m (modified) (1 diff)
• m/enum/MinThermalConstraintsEnum.m (modified) (1 diff)
• m/enum/NStepsEnum.m (modified) (1 diff)
• m/enum/NdtEnum.m (modified) (1 diff)
• m/enum/NodeOnBedEnum.m (modified) (1 diff)
• m/enum/NodeOnIceSheetEnum.m (modified) (1 diff)
• m/enum/NodeOnIceShelfEnum.m (modified) (1 diff)
• m/enum/NodeOnSurfaceEnum.m (modified) (1 diff)
• m/enum/NumOutputEnum.m (modified) (1 diff)
• m/enum/NumRiftsEnum.m (modified) (1 diff)
• m/enum/NumberNodeToElementConnectivityEnum.m (modified) (1 diff)
• m/enum/NumberOfDofsPerNodeEnum.m (modified) (1 diff)
• m/enum/NumberOfElementsEnum.m (modified) (1 diff)
• m/enum/NumberOfNodesEnum.m (modified) (1 diff)
• m/enum/NumberOfVerticesEnum.m (modified) (1 diff)
• m/enum/OptScalEnum.m (modified) (1 diff)
• m/enum/OutputFileNameEnum.m (modified) (1 diff)
• m/enum/P0Enum.m (modified) (1 diff)
• m/enum/P1Enum.m (modified) (1 diff)
• m/enum/ParameterOutputEnum.m (modified) (1 diff)
• m/enum/PenaltyMeltingEnum.m (modified) (1 diff)
• m/enum/PenaltyOffsetEnum.m (modified) (1 diff)
• m/enum/PentaVertexElementResultEnum.m (added)
• m/enum/PentaVertexResultEnum.m (deleted)
• m/enum/PetscVecExternalResultEnum.m (added)
• m/enum/PflagEnum.m (modified) (1 diff)
• m/enum/PressureEnum.m (modified) (1 diff)
• m/enum/PressureOldEnum.m (modified) (1 diff)
• m/enum/PressureStokesEnum.m (modified) (1 diff)
• m/enum/QmuAnalysisEnum.m (modified) (1 diff)
• m/enum/QmuErrNameEnum.m (modified) (1 diff)
• m/enum/QmuInNameEnum.m (modified) (1 diff)
• m/enum/QmuMassFluxSegmentsEnum.m (modified) (1 diff)
• m/enum/QmuNPartEnum.m (modified) (1 diff)
• m/enum/QmuOutNameEnum.m (modified) (1 diff)
• m/enum/QmuPartEnum.m (modified) (1 diff)
• m/enum/QmuPressureEnum.m (modified) (1 diff)
• m/enum/QmuVxEnum.m (modified) (1 diff)
• m/enum/QmuVyEnum.m (modified) (1 diff)
• m/enum/QmuVzEnum.m (modified) (1 diff)
• m/enum/ResetPenaltiesEnum.m (modified) (1 diff)
• m/enum/ResponseDescriptorsEnum.m (modified) (1 diff)
• m/enum/ResultEnum.m (deleted)
• m/enum/RgbEnum.m (modified) (1 diff)
• m/enum/RheologyBEnum.m (modified) (1 diff)
• m/enum/RheologyNEnum.m (modified) (1 diff)
• m/enum/SegmentOnIceShelfEnum.m (modified) (1 diff)
• m/enum/SingVertexElementResultEnum.m (added)
• m/enum/SingVertexResultEnum.m (deleted)
• m/enum/SolverStringEnum.m (modified) (1 diff)
• m/enum/SparsityEnum.m (modified) (1 diff)
• m/enum/SpcEnum.m (modified) (1 diff)
• m/enum/StabilizeConstraintsEnum.m (modified) (1 diff)
• m/enum/StokesReconditioningEnum.m (modified) (1 diff)
• m/enum/StringAsEnum.m (modified) (2 diffs)
• m/enum/StringExternalResultEnum.m (added)
• m/enum/SurfaceAreaEnum.m (modified) (1 diff)
• m/enum/SurfaceEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeXEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeYEnum.m (modified) (1 diff)
• m/enum/TemperatureAverageEnum.m (modified) (1 diff)
• m/enum/TemperatureEnum.m (modified) (1 diff)
• m/enum/ThicknessEnum.m (modified) (1 diff)
• m/enum/TolXEnum.m (modified) (1 diff)
• m/enum/TriaVertexElementResultEnum.m (added)
• m/enum/TriaVertexResultEnum.m (deleted)
• m/enum/TypeEnum.m (modified) (1 diff)
• m/enum/VariableDescriptorsEnum.m (modified) (1 diff)
• m/enum/VerboseEnum.m (modified) (1 diff)
• m/enum/ViscosityOvershootEnum.m (modified) (1 diff)
• m/enum/VxAverageEnum.m (modified) (1 diff)
• m/enum/VxEnum.m (modified) (1 diff)
• m/enum/VxObsEnum.m (modified) (1 diff)
• m/enum/VxOldEnum.m (modified) (1 diff)
• m/enum/VyAverageEnum.m (modified) (1 diff)
• m/enum/VyEnum.m (modified) (1 diff)
• m/enum/VyObsEnum.m (modified) (1 diff)
• m/enum/VyOldEnum.m (modified) (1 diff)
• m/enum/VzAverageEnum.m (modified) (1 diff)
• m/enum/VzEnum.m (modified) (1 diff)
• m/enum/VzObsEnum.m (modified) (1 diff)
• m/enum/VzOldEnum.m (modified) (1 diff)
• m/enum/WaitOnLockEnum.m (modified) (1 diff)
• m/enum/WaterEnum.m (modified) (1 diff)
• m/enum/WeightsEnum.m (modified) (1 diff)
• m/enum/YtsEnum.m (modified) (1 diff)

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

@@ -112 +112 @@
                 case StringArrayParamEnum : return "StringArrayParam";
                 case StringParamEnum : return "StringParam";
-                case ResultEnum : return "Result";
+                case ElementResultEnum : return "ElementResult";
+                case ExternalResultEnum : return "ExternalResult";
                 case RgbEnum : return "Rgb";
                 case SpcEnum : return "Spc";
@@ -207 +208 @@
                 case P0Enum : return "P0";
                 case P1Enum : return "P1";
-                case DoubleResultEnum : return "DoubleResult";
-                case TriaVertexResultEnum : return "TriaVertexResult";
-                case PentaVertexResultEnum : return "PentaVertexResult";
-                case SingVertexResultEnum : return "SingVertexResult";
-                case BeamVertexResultEnum : return "BeamVertexResult";
+                case DoubleElementResultEnum : return "DoubleElementResult";
+                case TriaVertexElementResultEnum : return "TriaVertexElementResult";
+                case PentaVertexElementResultEnum : return "PentaVertexElementResult";
+                case SingVertexElementResultEnum : return "SingVertexElementResult";
+                case BeamVertexElementResultEnum : return "BeamVertexElementResult";
+                case BoolExternalResultEnum : return "BoolExternalResult";
+                case DoubleExternalResultEnum : return "DoubleExternalResult";
+                case DoubleVecExternalResultEnum : return "DoubleVecExternalResult";
+                case IntExternalResultEnum : return "IntExternalResult";
+                case PetscVecExternalResultEnum : return "PetscVecExternalResult";
+                case StringExternalResultEnum : return "StringExternalResult";
+                case JEnum : return "J";
                 case BetaEnum : return "Beta";
                 case CmGradientEnum : return "CmGradient";

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

@@ -132 +132 @@
         StringParamEnum,
         /*Results: */
-        ResultEnum,
+        ElementResultEnum,
+        ExternalResultEnum,
         /*Rgb: */
         RgbEnum,
@@ -240 +241 @@
         /*}}}*/
         /*Results{{{1*/
-        DoubleResultEnum,
-        TriaVertexResultEnum,
-        PentaVertexResultEnum,
-        SingVertexResultEnum,
-        BeamVertexResultEnum,
+        DoubleElementResultEnum,
+        TriaVertexElementResultEnum,
+        PentaVertexElementResultEnum,
+        SingVertexElementResultEnum,
+        BeamVertexElementResultEnum,
+        BoolExternalResultEnum,
+        DoubleExternalResultEnum,
+        DoubleVecExternalResultEnum,
+        IntExternalResultEnum,
+        PetscVecExternalResultEnum,
+        StringExternalResultEnum,
+        JEnum,
         /*}}}*/
         /*Parameters{{{1*/

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

@@ -110 +110 @@
         else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
         else if (strcmp(name,"StringParam")==0) return StringParamEnum;
-        else if (strcmp(name,"Result")==0) return ResultEnum;
+        else if (strcmp(name,"ElementResult")==0) return ElementResultEnum;
+        else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
         else if (strcmp(name,"Rgb")==0) return RgbEnum;
         else if (strcmp(name,"Spc")==0) return SpcEnum;
@@ -205 +206 @@
         else if (strcmp(name,"P0")==0) return P0Enum;
         else if (strcmp(name,"P1")==0) return P1Enum;
-        else if (strcmp(name,"DoubleResult")==0) return DoubleResultEnum;
-        else if (strcmp(name,"TriaVertexResult")==0) return TriaVertexResultEnum;
-        else if (strcmp(name,"PentaVertexResult")==0) return PentaVertexResultEnum;
-        else if (strcmp(name,"SingVertexResult")==0) return SingVertexResultEnum;
-        else if (strcmp(name,"BeamVertexResult")==0) return BeamVertexResultEnum;
+        else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
+        else if (strcmp(name,"TriaVertexElementResult")==0) return TriaVertexElementResultEnum;
+        else if (strcmp(name,"PentaVertexElementResult")==0) return PentaVertexElementResultEnum;
+        else if (strcmp(name,"SingVertexElementResult")==0) return SingVertexElementResultEnum;
+        else if (strcmp(name,"BeamVertexElementResult")==0) return BeamVertexElementResultEnum;
+        else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
+        else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
+        else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
+        else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
+        else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum;
+        else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
+        else if (strcmp(name,"J")==0) return JEnum;
         else if (strcmp(name,"Beta")==0) return BetaEnum;
         else if (strcmp(name,"CmGradient")==0) return CmGradientEnum;

issm/trunk/src/m/enum/AccumulationRateEnum.m

@@ -9 +9 @@
 %      macro=AccumulationRateEnum()
 
-macro=107;
+macro=108;

issm/trunk/src/m/enum/AdjointxEnum.m

@@ -9 +9 @@
 %      macro=AdjointxEnum()
 
-macro=108;
+macro=109;

issm/trunk/src/m/enum/AdjointyEnum.m

@@ -9 +9 @@
 %      macro=AdjointyEnum()
 
-macro=109;
+macro=110;

issm/trunk/src/m/enum/AdjointzEnum.m

@@ -9 +9 @@
 %      macro=AdjointzEnum()
 
-macro=110;
+macro=111;

issm/trunk/src/m/enum/AirEnum.m

@@ -9 +9 @@
 %      macro=AirEnum()
 
-macro=105;
+macro=106;

issm/trunk/src/m/enum/ArtDiffEnum.m

@@ -9 +9 @@
 %      macro=ArtDiffEnum()
 
-macro=111;
+macro=112;

issm/trunk/src/m/enum/BedEnum.m

@@ -9 +9 @@
 %      macro=BedEnum()
 
-macro=112;
+macro=113;

issm/trunk/src/m/enum/BedSlopeXEnum.m

@@ -9 +9 @@
 %      macro=BedSlopeXEnum()
 
-macro=113;
+macro=114;

issm/trunk/src/m/enum/BedSlopeYEnum.m

@@ -9 +9 @@
 %      macro=BedSlopeYEnum()
 
-macro=114;
+macro=115;

issm/trunk/src/m/enum/BetaEnum.m

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=196;
+macro=204;

issm/trunk/src/m/enum/BoundaryEnum.m

@@ -9 +9 @@
 %      macro=BoundaryEnum()
 
-macro=115;
+macro=116;

issm/trunk/src/m/enum/CmGradientEnum.m

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=197;
+macro=205;

issm/trunk/src/m/enum/CmJumpEnum.m

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=198;
+macro=206;

issm/trunk/src/m/enum/CmMaxDmpSlopeEnum.m

@@ -9 +9 @@
 %      macro=CmMaxDmpSlopeEnum()
 
-macro=116;
+macro=117;

issm/trunk/src/m/enum/CmMaxDmpValueEnum.m

@@ -9 +9 @@
 %      macro=CmMaxDmpValueEnum()
 
-macro=117;
+macro=118;

issm/trunk/src/m/enum/CmMaxEnum.m

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=199;
+macro=207;

issm/trunk/src/m/enum/CmMinDmpSlopeEnum.m

@@ -9 +9 @@
 %      macro=CmMinDmpSlopeEnum()
 
-macro=118;
+macro=119;

issm/trunk/src/m/enum/CmMinDmpValueEnum.m

@@ -9 +9 @@
 %      macro=CmMinDmpValueEnum()
 
-macro=119;
+macro=120;

issm/trunk/src/m/enum/CmMinEnum.m

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=200;
+macro=208;

issm/trunk/src/m/enum/CmNoiseDmpEnum.m

@@ -9 +9 @@
 %      macro=CmNoiseDmpEnum()
 
-macro=120;
+macro=121;

issm/trunk/src/m/enum/CollapseEnum.m

@@ -9 +9 @@
 %      macro=CollapseEnum()
 
-macro=121;
+macro=122;

issm/trunk/src/m/enum/ConnectivityEnum.m

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=202;
+macro=210;

issm/trunk/src/m/enum/ConstantEnum.m

@@ -9 +9 @@
 %      macro=ConstantEnum()
 
-macro=122;
+macro=123;

issm/trunk/src/m/enum/ControlParameterEnum.m

@@ -9 +9 @@
 %      macro=ControlParameterEnum()
 
-macro=203;
+macro=211;

issm/trunk/src/m/enum/ControlSteadyEnum.m

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=204;
+macro=212;

issm/trunk/src/m/enum/ControlTypeEnum.m

@@ -9 +9 @@
 %      macro=ControlTypeEnum()
 
-macro=123;
+macro=124;

issm/trunk/src/m/enum/ConvergedEnum.m

@@ -9 +9 @@
 %      macro=ConvergedEnum()
 
-macro=124;
+macro=125;

issm/trunk/src/m/enum/DakotaParameterEnum.m

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=205;
+macro=213;

issm/trunk/src/m/enum/DhDtEnum.m

@@ -9 +9 @@
 %      macro=DhDtEnum()
 
-macro=125;
+macro=126;

issm/trunk/src/m/enum/DimEnum.m

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=206;
+macro=214;

issm/trunk/src/m/enum/DofVecEnum.m

@@ -9 +9 @@
 %      macro=DofVecEnum()
 
-macro=99;
+macro=100;

issm/trunk/src/m/enum/DragCoefficientEnum.m

@@ -9 +9 @@
 %      macro=DragCoefficientEnum()
 
-macro=126;
+macro=127;

issm/trunk/src/m/enum/DragPEnum.m

@@ -9 +9 @@
 %      macro=DragPEnum()
 
-macro=127;
+macro=128;

issm/trunk/src/m/enum/DragQEnum.m

@@ -9 +9 @@
 %      macro=DragQEnum()
 
-macro=128;
+macro=129;

issm/trunk/src/m/enum/DragTypeEnum.m

@@ -9 +9 @@
 %      macro=DragTypeEnum()
 
-macro=129;
+macro=130;

issm/trunk/src/m/enum/DtEnum.m

@@ -9 +9 @@
 %      macro=DtEnum()
 
-macro=130;
+macro=131;

issm/trunk/src/m/enum/ElementOnBedEnum.m

@@ -9 +9 @@
 %      macro=ElementOnBedEnum()
 
-macro=131;
+macro=132;

issm/trunk/src/m/enum/ElementOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=ElementOnIceShelfEnum()
 
-macro=132;
+macro=133;

issm/trunk/src/m/enum/ElementOnSurfaceEnum.m

@@ -9 +9 @@
 %      macro=ElementOnSurfaceEnum()
 
-macro=133;
+macro=134;

issm/trunk/src/m/enum/ElementOnWaterEnum.m

@@ -9 +9 @@
 %      macro=ElementOnWaterEnum()
 
-macro=134;
+macro=135;

issm/trunk/src/m/enum/EnumAsString.m

@@ -107 +107 @@
         case StringArrayParamEnum(), string='StringArrayParam'; return
         case StringParamEnum(), string='StringParam'; return
-        case ResultEnum(), string='Result'; return
+        case ElementResultEnum(), string='ElementResult'; return
+        case ExternalResultEnum(), string='ExternalResult'; return
         case RgbEnum(), string='Rgb'; return
         case SpcEnum(), string='Spc'; return
@@ -202 +203 @@
         case P0Enum(), string='P0'; return
         case P1Enum(), string='P1'; return
-        case DoubleResultEnum(), string='DoubleResult'; return
-        case TriaVertexResultEnum(), string='TriaVertexResult'; return
-        case PentaVertexResultEnum(), string='PentaVertexResult'; return
-        case SingVertexResultEnum(), string='SingVertexResult'; return
-        case BeamVertexResultEnum(), string='BeamVertexResult'; return
+        case DoubleElementResultEnum(), string='DoubleElementResult'; return
+        case TriaVertexElementResultEnum(), string='TriaVertexElementResult'; return
+        case PentaVertexElementResultEnum(), string='PentaVertexElementResult'; return
+        case SingVertexElementResultEnum(), string='SingVertexElementResult'; return
+        case BeamVertexElementResultEnum(), string='BeamVertexElementResult'; return
+        case BoolExternalResultEnum(), string='BoolExternalResult'; return
+        case DoubleExternalResultEnum(), string='DoubleExternalResult'; return
+        case DoubleVecExternalResultEnum(), string='DoubleVecExternalResult'; return
+        case IntExternalResultEnum(), string='IntExternalResult'; return
+        case PetscVecExternalResultEnum(), string='PetscVecExternalResult'; return
+        case StringExternalResultEnum(), string='StringExternalResult'; return
+        case JEnum(), string='J'; return
         case BetaEnum(), string='Beta'; return
         case CmGradientEnum(), string='CmGradient'; return

issm/trunk/src/m/enum/EpsAbsEnum.m

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=207;
+macro=215;

issm/trunk/src/m/enum/EpsCmEnum.m

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=208;
+macro=216;

issm/trunk/src/m/enum/EpsRelEnum.m

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=209;
+macro=217;

issm/trunk/src/m/enum/EpsResEnum.m

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=210;
+macro=218;

issm/trunk/src/m/enum/EpsVelEnum.m

@@ -9 +9 @@
 %      macro=EpsVelEnum()
 
-macro=135;
+macro=136;

issm/trunk/src/m/enum/ExtrudeParamEnum.m

@@ -9 +9 @@
 %      macro=ExtrudeParamEnum()
 
-macro=211;
+macro=219;

issm/trunk/src/m/enum/FillEnum.m

@@ -9 +9 @@
 %      macro=FillEnum()
 
-macro=136;
+macro=137;

issm/trunk/src/m/enum/FitEnum.m

@@ -9 +9 @@
 %      macro=FitEnum()
 
-macro=137;
+macro=138;

issm/trunk/src/m/enum/FractionIncrementEnum.m

@@ -9 +9 @@
 %      macro=FractionIncrementEnum()
 
-macro=138;
+macro=139;

issm/trunk/src/m/enum/FrictionEnum.m

@@ -9 +9 @@
 %      macro=FrictionEnum()
 
-macro=139;
+macro=140;

issm/trunk/src/m/enum/GeographyEnum.m

@@ -9 +9 @@
 %      macro=GeographyEnum()
 
-macro=100;
+macro=101;

issm/trunk/src/m/enum/GeothermalFluxEnum.m

@@ -9 +9 @@
 %      macro=GeothermalFluxEnum()
 
-macro=140;
+macro=141;

issm/trunk/src/m/enum/GradientEnum.m

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=201;
+macro=209;

issm/trunk/src/m/enum/HeatCapacityEnum.m

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=212;
+macro=220;

issm/trunk/src/m/enum/IceEnum.m

@@ -9 +9 @@
 %      macro=IceEnum()
 
-macro=104;
+macro=105;

issm/trunk/src/m/enum/IceSheetEnum.m

@@ -9 +9 @@
 %      macro=IceSheetEnum()
 
-macro=101;
+macro=102;

issm/trunk/src/m/enum/IceShelfEnum.m

@@ -9 +9 @@
 %      macro=IceShelfEnum()
 
-macro=102;
+macro=103;

issm/trunk/src/m/enum/InternalEnum.m

@@ -9 +9 @@
 %      macro=InternalEnum()
 
-macro=141;
+macro=142;

issm/trunk/src/m/enum/IsHutterEnum.m

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=213;
+macro=221;

issm/trunk/src/m/enum/IsMacAyealPattynEnum.m

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=214;
+macro=222;

issm/trunk/src/m/enum/IsStokesEnum.m

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=215;
+macro=223;

issm/trunk/src/m/enum/KflagEnum.m

@@ -9 +9 @@
 %      macro=KflagEnum()
 
-macro=142;
+macro=143;

issm/trunk/src/m/enum/LatentHeatEnum.m

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=216;
+macro=224;

issm/trunk/src/m/enum/LowmemEnum.m

@@ -9 +9 @@
 %      macro=LowmemEnum()
 
-macro=217;
+macro=225;

issm/trunk/src/m/enum/MaxIterEnum.m

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=218;
+macro=226;

issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=219;
+macro=227;

issm/trunk/src/m/enum/MaxPenetrationEnum.m

@@ -9 +9 @@
 %      macro=MaxPenetrationEnum()
 
-macro=143;
+macro=144;

issm/trunk/src/m/enum/MeanVelEnum.m

@@ -9 +9 @@
 %      macro=MeanVelEnum()
 
-macro=144;
+macro=145;

issm/trunk/src/m/enum/MelangeEnum.m

@@ -9 +9 @@
 %      macro=MelangeEnum()
 
-macro=106;
+macro=107;

issm/trunk/src/m/enum/MeltingOffsetEnum.m

@@ -9 +9 @@
 %      macro=MeltingOffsetEnum()
 
-macro=145;
+macro=146;

issm/trunk/src/m/enum/MeltingPointEnum.m

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=220;
+macro=228;

issm/trunk/src/m/enum/MeltingRateEnum.m

@@ -9 +9 @@
 %      macro=MeltingRateEnum()
 
-macro=146;
+macro=147;

issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=221;
+macro=229;

issm/trunk/src/m/enum/MinThermalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=222;
+macro=230;

issm/trunk/src/m/enum/NStepsEnum.m

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=223;
+macro=231;

issm/trunk/src/m/enum/NdtEnum.m

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=224;
+macro=232;

issm/trunk/src/m/enum/NodeOnBedEnum.m

@@ -9 +9 @@
 %      macro=NodeOnBedEnum()
 
-macro=147;
+macro=148;

issm/trunk/src/m/enum/NodeOnIceSheetEnum.m

@@ -9 +9 @@
 %      macro=NodeOnIceSheetEnum()
 
-macro=148;
+macro=149;

issm/trunk/src/m/enum/NodeOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=NodeOnIceShelfEnum()
 
-macro=149;
+macro=150;

issm/trunk/src/m/enum/NodeOnSurfaceEnum.m

@@ -9 +9 @@
 %      macro=NodeOnSurfaceEnum()
 
-macro=150;
+macro=151;

issm/trunk/src/m/enum/NumOutputEnum.m

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=225;
+macro=233;

issm/trunk/src/m/enum/NumRiftsEnum.m

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=226;
+macro=234;

issm/trunk/src/m/enum/NumberNodeToElementConnectivityEnum.m

@@ -9 +9 @@
 %      macro=NumberNodeToElementConnectivityEnum()
 
-macro=151;
+macro=152;

issm/trunk/src/m/enum/NumberOfDofsPerNodeEnum.m

@@ -9 +9 @@
 %      macro=NumberOfDofsPerNodeEnum()
 
-macro=227;
+macro=235;

issm/trunk/src/m/enum/NumberOfElementsEnum.m

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=228;
+macro=236;

issm/trunk/src/m/enum/NumberOfNodesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=229;
+macro=237;

issm/trunk/src/m/enum/NumberOfVerticesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=230;
+macro=238;

issm/trunk/src/m/enum/OptScalEnum.m

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=231;
+macro=239;

issm/trunk/src/m/enum/OutputFileNameEnum.m

@@ -9 +9 @@
 %      macro=OutputFileNameEnum()
 
-macro=232;
+macro=240;

issm/trunk/src/m/enum/P0Enum.m

@@ -9 +9 @@
 %      macro=P0Enum()
 
-macro=189;
+macro=190;

issm/trunk/src/m/enum/P1Enum.m

@@ -9 +9 @@
 %      macro=P1Enum()
 
-macro=190;
+macro=191;

issm/trunk/src/m/enum/ParameterOutputEnum.m

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=233;
+macro=241;

issm/trunk/src/m/enum/PenaltyMeltingEnum.m

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=234;
+macro=242;

issm/trunk/src/m/enum/PenaltyOffsetEnum.m

@@ -9 +9 @@
 %      macro=PenaltyOffsetEnum()
 
-macro=152;
+macro=153;

issm/trunk/src/m/enum/PflagEnum.m

@@ -9 +9 @@
 %      macro=PflagEnum()
 
-macro=153;
+macro=154;

issm/trunk/src/m/enum/PressureEnum.m

@@ -9 +9 @@
 %      macro=PressureEnum()
 
-macro=154;
+macro=155;

issm/trunk/src/m/enum/PressureOldEnum.m

@@ -9 +9 @@
 %      macro=PressureOldEnum()
 
-macro=155;
+macro=156;

issm/trunk/src/m/enum/PressureStokesEnum.m

@@ -9 +9 @@
 %      macro=PressureStokesEnum()
 
-macro=157;
+macro=158;

issm/trunk/src/m/enum/QmuAnalysisEnum.m

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=235;
+macro=243;

issm/trunk/src/m/enum/QmuErrNameEnum.m

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=236;
+macro=244;

issm/trunk/src/m/enum/QmuInNameEnum.m

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=237;
+macro=245;

issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=238;
+macro=246;

issm/trunk/src/m/enum/QmuNPartEnum.m

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=239;
+macro=247;

issm/trunk/src/m/enum/QmuOutNameEnum.m

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=240;
+macro=248;

issm/trunk/src/m/enum/QmuPartEnum.m

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=241;
+macro=249;

issm/trunk/src/m/enum/QmuPressureEnum.m

@@ -9 +9 @@
 %      macro=QmuPressureEnum()
 
-macro=156;
+macro=157;

issm/trunk/src/m/enum/QmuVxEnum.m

@@ -9 +9 @@
 %      macro=QmuVxEnum()
 
-macro=177;
+macro=178;

issm/trunk/src/m/enum/QmuVyEnum.m

@@ -9 +9 @@
 %      macro=QmuVyEnum()
 
-macro=182;
+macro=183;

issm/trunk/src/m/enum/QmuVzEnum.m

@@ -9 +9 @@
 %      macro=QmuVzEnum()
 
-macro=187;
+macro=188;

issm/trunk/src/m/enum/ResetPenaltiesEnum.m

@@ -9 +9 @@
 %      macro=ResetPenaltiesEnum()
 
-macro=158;
+macro=159;

issm/trunk/src/m/enum/ResponseDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=242;
+macro=250;

issm/trunk/src/m/enum/RgbEnum.m

@@ -9 +9 @@
 %      macro=RgbEnum()
 
-macro=97;
+macro=98;

issm/trunk/src/m/enum/RheologyBEnum.m

@@ -9 +9 @@
 %      macro=RheologyBEnum()
 
-macro=159;
+macro=160;

issm/trunk/src/m/enum/RheologyNEnum.m

@@ -9 +9 @@
 %      macro=RheologyNEnum()
 
-macro=160;
+macro=161;

issm/trunk/src/m/enum/SegmentOnIceShelfEnum.m

@@ -9 +9 @@
 %      macro=SegmentOnIceShelfEnum()
 
-macro=161;
+macro=162;

issm/trunk/src/m/enum/SolverStringEnum.m

@@ -9 +9 @@
 %      macro=SolverStringEnum()
 
-macro=243;
+macro=251;

issm/trunk/src/m/enum/SparsityEnum.m

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=244;
+macro=252;

issm/trunk/src/m/enum/SpcEnum.m

@@ -9 +9 @@
 %      macro=SpcEnum()
 
-macro=98;
+macro=99;

issm/trunk/src/m/enum/StabilizeConstraintsEnum.m

@@ -9 +9 @@
 %      macro=StabilizeConstraintsEnum()
 
-macro=162;
+macro=163;

issm/trunk/src/m/enum/StokesReconditioningEnum.m

@@ -9 +9 @@
 %      macro=StokesReconditioningEnum()
 
-macro=163;
+macro=164;

issm/trunk/src/m/enum/StringAsEnum.m

@@ -105 +105 @@
 elseif (strcmpi(name,'StringArrayParam')), enum=StringArrayParamEnum(); return
 elseif (strcmpi(name,'StringParam')), enum=StringParamEnum(); return
-elseif (strcmpi(name,'Result')), enum=ResultEnum(); return
+elseif (strcmpi(name,'ElementResult')), enum=ElementResultEnum(); return
+elseif (strcmpi(name,'ExternalResult')), enum=ExternalResultEnum(); return
 elseif (strcmpi(name,'Rgb')), enum=RgbEnum(); return
 elseif (strcmpi(name,'Spc')), enum=SpcEnum(); return
@@ -200 +201 @@
 elseif (strcmpi(name,'P0')), enum=P0Enum(); return
 elseif (strcmpi(name,'P1')), enum=P1Enum(); return
-elseif (strcmpi(name,'DoubleResult')), enum=DoubleResultEnum(); return
-elseif (strcmpi(name,'TriaVertexResult')), enum=TriaVertexResultEnum(); return
-elseif (strcmpi(name,'PentaVertexResult')), enum=PentaVertexResultEnum(); return
-elseif (strcmpi(name,'SingVertexResult')), enum=SingVertexResultEnum(); return
-elseif (strcmpi(name,'BeamVertexResult')), enum=BeamVertexResultEnum(); return
+elseif (strcmpi(name,'DoubleElementResult')), enum=DoubleElementResultEnum(); return
+elseif (strcmpi(name,'TriaVertexElementResult')), enum=TriaVertexElementResultEnum(); return
+elseif (strcmpi(name,'PentaVertexElementResult')), enum=PentaVertexElementResultEnum(); return
+elseif (strcmpi(name,'SingVertexElementResult')), enum=SingVertexElementResultEnum(); return
+elseif (strcmpi(name,'BeamVertexElementResult')), enum=BeamVertexElementResultEnum(); return
+elseif (strcmpi(name,'BoolExternalResult')), enum=BoolExternalResultEnum(); return
+elseif (strcmpi(name,'DoubleExternalResult')), enum=DoubleExternalResultEnum(); return
+elseif (strcmpi(name,'DoubleVecExternalResult')), enum=DoubleVecExternalResultEnum(); return
+elseif (strcmpi(name,'IntExternalResult')), enum=IntExternalResultEnum(); return
+elseif (strcmpi(name,'PetscVecExternalResult')), enum=PetscVecExternalResultEnum(); return
+elseif (strcmpi(name,'StringExternalResult')), enum=StringExternalResultEnum(); return
+elseif (strcmpi(name,'J')), enum=JEnum(); return
 elseif (strcmpi(name,'Beta')), enum=BetaEnum(); return
 elseif (strcmpi(name,'CmGradient')), enum=CmGradientEnum(); return

issm/trunk/src/m/enum/SurfaceAreaEnum.m

@@ -9 +9 @@
 %      macro=SurfaceAreaEnum()
 
-macro=164;
+macro=165;

issm/trunk/src/m/enum/SurfaceEnum.m

@@ -9 +9 @@
 %      macro=SurfaceEnum()
 
-macro=165;
+macro=166;

issm/trunk/src/m/enum/SurfaceSlopeXEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeXEnum()
 
-macro=166;
+macro=167;

issm/trunk/src/m/enum/SurfaceSlopeYEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeYEnum()
 
-macro=167;
+macro=168;

issm/trunk/src/m/enum/TemperatureAverageEnum.m

@@ -9 +9 @@
 %      macro=TemperatureAverageEnum()
 
-macro=169;
+macro=170;

issm/trunk/src/m/enum/TemperatureEnum.m

@@ -9 +9 @@
 %      macro=TemperatureEnum()
 
-macro=168;
+macro=169;

issm/trunk/src/m/enum/ThicknessEnum.m

@@ -9 +9 @@
 %      macro=ThicknessEnum()
 
-macro=170;
+macro=171;

issm/trunk/src/m/enum/TolXEnum.m

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=245;
+macro=253;

issm/trunk/src/m/enum/TypeEnum.m

@@ -9 +9 @@
 %      macro=TypeEnum()
 
-macro=171;
+macro=172;

issm/trunk/src/m/enum/VariableDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=246;
+macro=254;

issm/trunk/src/m/enum/VerboseEnum.m

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=247;
+macro=255;

issm/trunk/src/m/enum/ViscosityOvershootEnum.m

@@ -9 +9 @@
 %      macro=ViscosityOvershootEnum()
 
-macro=172;
+macro=173;

issm/trunk/src/m/enum/VxAverageEnum.m

@@ -9 +9 @@
 %      macro=VxAverageEnum()
 
-macro=173;
+macro=174;

issm/trunk/src/m/enum/VxEnum.m

@@ -9 +9 @@
 %      macro=VxEnum()
 
-macro=174;
+macro=175;

issm/trunk/src/m/enum/VxObsEnum.m

@@ -9 +9 @@
 %      macro=VxObsEnum()
 
-macro=175;
+macro=176;

issm/trunk/src/m/enum/VxOldEnum.m

@@ -9 +9 @@
 %      macro=VxOldEnum()
 
-macro=176;
+macro=177;

issm/trunk/src/m/enum/VyAverageEnum.m

@@ -9 +9 @@
 %      macro=VyAverageEnum()
 
-macro=178;
+macro=179;

issm/trunk/src/m/enum/VyEnum.m

@@ -9 +9 @@
 %      macro=VyEnum()
 
-macro=179;
+macro=180;

issm/trunk/src/m/enum/VyObsEnum.m

@@ -9 +9 @@
 %      macro=VyObsEnum()
 
-macro=180;
+macro=181;

issm/trunk/src/m/enum/VyOldEnum.m

@@ -9 +9 @@
 %      macro=VyOldEnum()
 
-macro=181;
+macro=182;

issm/trunk/src/m/enum/VzAverageEnum.m

@@ -9 +9 @@
 %      macro=VzAverageEnum()
 
-macro=183;
+macro=184;

issm/trunk/src/m/enum/VzEnum.m

@@ -9 +9 @@
 %      macro=VzEnum()
 
-macro=184;
+macro=185;

issm/trunk/src/m/enum/VzObsEnum.m

@@ -9 +9 @@
 %      macro=VzObsEnum()
 
-macro=185;
+macro=186;

issm/trunk/src/m/enum/VzOldEnum.m

@@ -9 +9 @@
 %      macro=VzOldEnum()
 
-macro=186;
+macro=187;

issm/trunk/src/m/enum/WaitOnLockEnum.m

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=248;
+macro=256;

issm/trunk/src/m/enum/WaterEnum.m

@@ -9 +9 @@
 %      macro=WaterEnum()
 
-macro=103;
+macro=104;

issm/trunk/src/m/enum/WeightsEnum.m

@@ -9 +9 @@
 %      macro=WeightsEnum()
 
-macro=188;
+macro=189;

issm/trunk/src/m/enum/YtsEnum.m

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=249;
+macro=257;