Changeset 4899

Timestamp:

07/30/10 09:07:48 (15 years ago)

Author:

seroussi

Message:

removed all Sing elements

Location:

issm/trunk/src

Files:

• c/Container/DataSet.cpp (modified) (2 diffs)
• c/Container/Inputs.cpp (modified) (1 diff)
• c/Container/Inputs.h (modified) (1 diff)
• c/Container/Results.cpp (modified) (1 diff)
• c/Container/Results.h (modified) (1 diff)
• c/EnumDefinitions/EnumAsString.cpp (modified) (3 diffs)
• c/EnumDefinitions/EnumDefinitions.h (modified) (3 diffs)
• c/EnumDefinitions/StringAsEnum.cpp (modified) (3 diffs)
• c/Makefile.am (modified) (6 diffs)
• c/objects/ElementResults/BeamVertexElementResult.h (modified) (1 diff)
• c/objects/ElementResults/DoubleElementResult.cpp (modified) (4 diffs)
• c/objects/ElementResults/DoubleElementResult.h (modified) (1 diff)
• c/objects/ElementResults/ElementResult.h (modified) (1 diff)
• c/objects/ElementResults/PentaVertexElementResult.cpp (modified) (1 diff)
• c/objects/ElementResults/PentaVertexElementResult.h (modified) (1 diff)
• c/objects/ElementResults/SingVertexElementResult.cpp (deleted)
• c/objects/ElementResults/SingVertexElementResult.h (deleted)
• c/objects/ElementResults/TriaVertexElementResult.cpp (modified) (1 diff)
• c/objects/ElementResults/TriaVertexElementResult.h (modified) (1 diff)
• c/objects/Elements/Penta.cpp (modified) (1 diff)
• c/objects/Elements/Penta.h (modified) (1 diff)
• c/objects/Elements/Sing.cpp (deleted)
• c/objects/Elements/Sing.h (deleted)
• c/objects/Elements/Tria.cpp (modified) (5 diffs)
• c/objects/Elements/Tria.h (modified) (1 diff)
• c/objects/Inputs/BeamVertexInput.cpp (modified) (1 diff)
• c/objects/Inputs/BeamVertexInput.h (modified) (1 diff)
• c/objects/Inputs/BoolInput.cpp (modified) (1 diff)
• c/objects/Inputs/BoolInput.h (modified) (1 diff)
• c/objects/Inputs/DoubleInput.cpp (modified) (1 diff)
• c/objects/Inputs/DoubleInput.h (modified) (1 diff)
• c/objects/Inputs/Input.h (modified) (1 diff)
• c/objects/Inputs/IntInput.cpp (modified) (1 diff)
• c/objects/Inputs/IntInput.h (modified) (1 diff)
• c/objects/Inputs/PentaVertexInput.cpp (modified) (2 diffs)
• c/objects/Inputs/PentaVertexInput.h (modified) (1 diff)
• c/objects/Inputs/SingVertexInput.cpp (deleted)
• c/objects/Inputs/SingVertexInput.h (deleted)
• c/objects/Inputs/TriaVertexInput.cpp (modified) (1 diff)
• c/objects/Inputs/TriaVertexInput.h (modified) (1 diff)
• c/objects/objects.h (modified) (3 diffs)
• m/enum/AbsoluteEnum.m (modified) (1 diff)
• m/enum/AccumulationRateEnum.m (modified) (1 diff)
• m/enum/AdjointEnum.m (modified) (1 diff)
• m/enum/AdjointpEnum.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 (modified) (1 diff)
• m/enum/BeamVertexInputEnum.m (modified) (1 diff)
• 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 (modified) (1 diff)
• m/enum/BoolInputEnum.m (modified) (1 diff)
• m/enum/BoolParamEnum.m (modified) (1 diff)
• 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/ColinearEnum.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/DoubleElementResultEnum.m (modified) (1 diff)
• m/enum/DoubleExternalResultEnum.m (modified) (1 diff)
• m/enum/DoubleInputEnum.m (modified) (1 diff)
• m/enum/DoubleMatArrayParamEnum.m (modified) (1 diff)
• m/enum/DoubleMatExternalResultEnum.m (modified) (1 diff)
• m/enum/DoubleMatParamEnum.m (modified) (1 diff)
• m/enum/DoubleParamEnum.m (modified) (1 diff)
• m/enum/DoubleVecExternalResultEnum.m (modified) (1 diff)
• m/enum/DoubleVecParamEnum.m (modified) (1 diff)
• 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 (modified) (1 diff)
• m/enum/EnumAsString.m (modified) (3 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 (modified) (1 diff)
• m/enum/ExtrudeParamEnum.m (modified) (1 diff)
• m/enum/FileParamEnum.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/GravityEnum.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/IcefrontEnum.m (modified) (1 diff)
• m/enum/InputEnum.m (modified) (1 diff)
• m/enum/IntExternalResultEnum.m (modified) (1 diff)
• m/enum/IntInputEnum.m (modified) (1 diff)
• m/enum/IntParamEnum.m (modified) (1 diff)
• m/enum/InternalEnum.m (modified) (1 diff)
• m/enum/IntersectEnum.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 (modified) (1 diff)
• m/enum/KflagEnum.m (modified) (1 diff)
• m/enum/LatentHeatEnum.m (modified) (1 diff)
• m/enum/LoadEnum.m (modified) (1 diff)
• m/enum/LowmemEnum.m (modified) (1 diff)
• m/enum/MaterialEnum.m (modified) (1 diff)
• m/enum/MaticeEnum.m (modified) (1 diff)
• m/enum/MatparEnum.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/MiniEnum.m (modified) (1 diff)
• m/enum/MixedLayerCapacityEnum.m (modified) (1 diff)
• m/enum/NStepsEnum.m (modified) (1 diff)
• m/enum/NdtEnum.m (modified) (1 diff)
• m/enum/NodeEnum.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/NumericalfluxEnum.m (modified) (1 diff)
• m/enum/OldGradientEnum.m (modified) (1 diff)
• m/enum/OptScalEnum.m (modified) (1 diff)
• m/enum/OutputFilePointerEnum.m (modified) (1 diff)
• m/enum/P0Enum.m (modified) (1 diff)
• m/enum/P1DGEnum.m (modified) (1 diff)
• m/enum/P1Enum.m (modified) (1 diff)
• m/enum/ParamEnum.m (modified) (1 diff)
• m/enum/ParameterOutputEnum.m (modified) (1 diff)
• m/enum/PatchEnum.m (modified) (1 diff)
• m/enum/PatchNodesEnum.m (modified) (1 diff)
• m/enum/PatchVerticesEnum.m (modified) (1 diff)
• m/enum/PenaltyMeltingEnum.m (modified) (1 diff)
• m/enum/PenaltyOffsetEnum.m (modified) (1 diff)
• m/enum/PengridEnum.m (modified) (1 diff)
• m/enum/PenpairEnum.m (modified) (1 diff)
• m/enum/PentaVertexElementResultEnum.m (modified) (1 diff)
• m/enum/PentaVertexInputEnum.m (modified) (1 diff)
• m/enum/PetscMatParamEnum.m (modified) (1 diff)
• m/enum/PetscVecExternalResultEnum.m (modified) (1 diff)
• m/enum/PetscVecParamEnum.m (modified) (1 diff)
• m/enum/PflagEnum.m (modified) (1 diff)
• m/enum/PressureEnum.m (modified) (1 diff)
• m/enum/PressureOldEnum.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/QuadIceFrontEnum.m (modified) (1 diff)
• m/enum/QuadRiftFrontEnum.m (modified) (1 diff)
• m/enum/RelativeEnum.m (modified) (1 diff)
• m/enum/ResetPenaltiesEnum.m (modified) (1 diff)
• m/enum/ResidualEnum.m (modified) (1 diff)
• m/enum/ResponseDescriptorsEnum.m (modified) (1 diff)
• m/enum/RgbEnum.m (modified) (1 diff)
• m/enum/RheologyBEnum.m (modified) (1 diff)
• m/enum/RheologyNEnum.m (modified) (1 diff)
• m/enum/RhoIceEnum.m (modified) (1 diff)
• m/enum/RhoWaterEnum.m (modified) (1 diff)
• m/enum/RiftfrontEnum.m (modified) (1 diff)
• m/enum/SegmentIcefrontEnum.m (modified) (1 diff)
• m/enum/SegmentOnIceShelfEnum.m (modified) (1 diff)
• m/enum/SegmentRiftfrontEnum.m (modified) (1 diff)
• m/enum/SeparateEnum.m (modified) (1 diff)
• m/enum/SingEnum.m (deleted)
• m/enum/SingVertexElementResultEnum.m (deleted)
• m/enum/SingVertexInputEnum.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/StringArrayParamEnum.m (modified) (1 diff)
• m/enum/StringAsEnum.m (modified) (3 diffs)
• m/enum/StringExternalResultEnum.m (modified) (1 diff)
• m/enum/StringParamEnum.m (modified) (1 diff)
• 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/TemperatureOldEnum.m (modified) (1 diff)
• m/enum/ThermalConductivityEnum.m (modified) (1 diff)
• m/enum/ThermalExchangeVelocityEnum.m (modified) (1 diff)
• m/enum/ThicknessEnum.m (modified) (1 diff)
• m/enum/TimeEnum.m (modified) (1 diff)
• m/enum/TolXEnum.m (modified) (1 diff)
• m/enum/TriaEnum.m (modified) (1 diff)
• m/enum/TriaVertexElementResultEnum.m (modified) (1 diff)
• m/enum/TriaVertexInputEnum.m (modified) (1 diff)
• m/enum/TypeEnum.m (modified) (1 diff)
• m/enum/VariableDescriptorsEnum.m (modified) (1 diff)
• m/enum/VelEnum.m (modified) (1 diff)
• m/enum/VelObsEnum.m (modified) (1 diff)
• m/enum/VerboseEnum.m (modified) (1 diff)
• m/enum/VertexEnum.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/Container/DataSet.cpp

@@ -234 +234 @@
                         dataset->AddObject(pentavertexinput);
                 }
-                else if(enum_type==SingVertexInputEnum){
-                        SingVertexInput* singvertexinput=NULL;
-                        singvertexinput=new SingVertexInput();
-                        singvertexinput->Demarshall(&marshalled_dataset);
-                        dataset->AddObject(singvertexinput);
-                }
                 else if(enum_type==BeamVertexInputEnum){
                         BeamVertexInput* beamvertexinput=NULL;
@@ -258 +252 @@
                         dataset->AddObject(pentavertexelementresult);
                 }
-                else if(enum_type==SingEnum){
-                        Sing* sing=NULL;
-                        sing=new Sing();
-                        sing->Demarshall(&marshalled_dataset);
-                        dataset->AddObject(sing);
-                }
                 else if(enum_type==BeamEnum){
                         Beam* beam=NULL;

issm/trunk/src/c/Container/Inputs.cpp

@@ -386 +386 @@
 }
 /*}}}*/
-/*FUNCTION Inputs::SpawnSingInputs{{{1*/
-Inputs* Inputs::SpawnSingInputs(int index){
-
-        /*Intermediary*/
-        vector<Object*>::iterator object;
-        Input* inputin=NULL;
-        Input* inputout=NULL;
-
-        /*Output*/
-        Inputs* newinputs=new Inputs();
-
-        /*Go through inputs and call Spawn function*/
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                /*Create new input*/
-                inputin=(Input*)(*object); 
-                inputout=inputin->SpawnSingInput(index);
-
-                /*Add input to new inputs*/
-                newinputs->AddObject(inputout);
-        }
-
-        /*Assign output pointer*/
-        return newinputs;
-}
-/*}}}*/
 /*FUNCTION Inputs::SpawnTriaInputs{{{1*/
 Inputs* Inputs::SpawnTriaInputs(int* indices){

issm/trunk/src/c/Container/Inputs.h

@@ -32 +32 @@
                 Inputs* SpawnTriaInputs(int* indices);
                 Inputs* SpawnBeamInputs(int* indices);
-                Inputs* SpawnSingInputs(int  index  );
                 
                 void GetParameterValue(bool* pvalue,int enum_type);

issm/trunk/src/c/Container/Results.cpp

@@ -69 +69 @@
 }
 /*}}}*/
-/*FUNCTION Results::SpawnSingResults{{{1*/
-Results* Results::SpawnSingResults(int index){
-
-        /*Intermediary*/
-        vector<Object*>::iterator object;
-        ElementResult* resultin=NULL;
-        ElementResult* resultout=NULL;
-
-        /*Output*/
-        Results* newresults=new Results();
-
-        /*Go through results and call Spawn function*/
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                /*Create new result*/
-                resultin=(ElementResult*)(*object); 
-                resultout=resultin->SpawnSingElementResult(index);
-
-                /*Add result to new results*/
-                newresults->AddObject((Object*)resultout);
-        }
-
-        /*Assign output pointer*/
-        return newresults;
-}
-/*}}}*/
 /*FUNCTION Results::SpawnTriaResults{{{1*/
 Results* Results::SpawnTriaResults(int* indices){

issm/trunk/src/c/Container/Results.h

@@ -28 +28 @@
                 Results* SpawnTriaResults(int* indices);
                 Results* SpawnBeamResults(int* indices);
-                Results* SpawnSingResults(int  index  );
                 /*}}}*/
 

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

@@ -89 +89 @@
                 case NodePropertiesEnum : return "NodeProperties";
                 case PentaEnum : return "Penta";
-                case SingEnum : return "Sing";
                 case TriaEnum : return "Tria";
                 case NodeEnum : return "Node";
@@ -112 +111 @@
                 case IntInputEnum : return "IntInput";
                 case PentaVertexInputEnum : return "PentaVertexInput";
-                case SingVertexInputEnum : return "SingVertexInput";
                 case TriaVertexInputEnum : return "TriaVertexInput";
                 case ParamEnum : return "Param";
@@ -229 +227 @@
                 case TriaVertexElementResultEnum : return "TriaVertexElementResult";
                 case PentaVertexElementResultEnum : return "PentaVertexElementResult";
-                case SingVertexElementResultEnum : return "SingVertexElementResult";
                 case BeamVertexElementResultEnum : return "BeamVertexElementResult";
                 case BoolExternalResultEnum : return "BoolExternalResult";

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

@@ -102 +102 @@
         NodePropertiesEnum,
         PentaEnum,
-        SingEnum,
         TriaEnum,
         /*Grids: */
@@ -129 +128 @@
         IntInputEnum,
         PentaVertexInputEnum,
-        SingVertexInputEnum,
         TriaVertexInputEnum,
         /*Params: */
@@ -260 +258 @@
         TriaVertexElementResultEnum,
         PentaVertexElementResultEnum,
-        SingVertexElementResultEnum,
         BeamVertexElementResultEnum,
         BoolExternalResultEnum,

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

@@ -87 +87 @@
         else if (strcmp(name,"NodeProperties")==0) return NodePropertiesEnum;
         else if (strcmp(name,"Penta")==0) return PentaEnum;
-        else if (strcmp(name,"Sing")==0) return SingEnum;
         else if (strcmp(name,"Tria")==0) return TriaEnum;
         else if (strcmp(name,"Node")==0) return NodeEnum;
@@ -110 +109 @@
         else if (strcmp(name,"IntInput")==0) return IntInputEnum;
         else if (strcmp(name,"PentaVertexInput")==0) return PentaVertexInputEnum;
-        else if (strcmp(name,"SingVertexInput")==0) return SingVertexInputEnum;
         else if (strcmp(name,"TriaVertexInput")==0) return TriaVertexInputEnum;
         else if (strcmp(name,"Param")==0) return ParamEnum;
@@ -227 +225 @@
         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;

issm/trunk/src/c/Makefile.am

@@ -114 +114 @@
                                         ./objects/ElementResults/PentaVertexElementResult.h\
                                         ./objects/ElementResults/PentaVertexElementResult.cpp\
-                                        ./objects/ElementResults/SingVertexElementResult.h\
-                                        ./objects/ElementResults/SingVertexElementResult.cpp\
                                         ./objects/ElementResults/BeamVertexElementResult.h\
                                         ./objects/ElementResults/BeamVertexElementResult.cpp\
@@ -143 +141 @@
                                         ./objects/Inputs/TriaVertexInput.h\
                                         ./objects/Inputs/TriaVertexInput.cpp\
-                                        ./objects/Inputs/SingVertexInput.h\
-                                        ./objects/Inputs/SingVertexInput.cpp\
                                         ./objects/Inputs/BeamVertexInput.h\
                                         ./objects/Inputs/BeamVertexInput.cpp\
@@ -155 +151 @@
                                         ./objects/Inputs/DoubleInput.h\
                                         ./objects/Inputs/DoubleInput.cpp\
-                                        ./objects/Elements/Sing.h\
-                                        ./objects/Elements/Sing.cpp\
                                         ./objects/Elements/Beam.h\
                                         ./objects/Elements/Beam.cpp\
@@ -680 +674 @@
                                         ./objects/ElementResults/PentaVertexElementResult.h\
                                         ./objects/ElementResults/PentaVertexElementResult.cpp\
-                                        ./objects/ElementResults/SingVertexElementResult.h\
-                                        ./objects/ElementResults/SingVertexElementResult.cpp\
                                         ./objects/ElementResults/BeamVertexElementResult.h\
                                         ./objects/ElementResults/BeamVertexElementResult.cpp\
@@ -709 +701 @@
                                         ./objects/Inputs/TriaVertexInput.h\
                                         ./objects/Inputs/TriaVertexInput.cpp\
-                                        ./objects/Inputs/SingVertexInput.h\
-                                        ./objects/Inputs/SingVertexInput.cpp\
                                         ./objects/Inputs/BeamVertexInput.h\
                                         ./objects/Inputs/BeamVertexInput.cpp\
@@ -721 +711 @@
                                         ./objects/Inputs/DoubleInput.h\
                                         ./objects/Inputs/DoubleInput.cpp\
-                                        ./objects/Elements/Sing.h\
-                                        ./objects/Elements/Sing.cpp\
                                         ./objects/Elements/Beam.h\
                                         ./objects/Elements/Beam.cpp\

issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.h

@@ -40 +40 @@
                 /*}}}*/
                 /*ElementResult virtual functions definitions: {{{1*/
-                ElementResult* SpawnSingElementResult(int  index){ISSMERROR("Not implemented yet!");}
                 ElementResult* SpawnBeamElementResult(int* indices){ISSMERROR("Not implemented yet!");}
                 ElementResult* SpawnTriaElementResult(int* indices){ISSMERROR("Not implemented yet!");}

issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp

@@ -142 +142 @@
 }
 /*}}}*/
-/*FUNCTION DoubleElementResult::SpawnSingElementResult{{{1*/
-ElementResult* DoubleElementResult::SpawnSingElementResult(int index){
+/*FUNCTION DoubleElementResult::SpawnBeamElementResult{{{1*/
+ElementResult* DoubleElementResult::SpawnBeamElementResult(int* indices){
 
         /*output*/
@@ -154 +154 @@
         outresult->step=this->step;
 
+
         /*Assign output*/
         return outresult;
@@ -159 +160 @@
 }
 /*}}}*/
-/*FUNCTION DoubleElementResult::SpawnBeamElementResult{{{1*/
-ElementResult* DoubleElementResult::SpawnBeamElementResult(int* indices){
+/*FUNCTION DoubleElementResult::SpawnTriaElementResult{{{1*/
+ElementResult* DoubleElementResult::SpawnTriaElementResult(int* indices){
 
         /*output*/
@@ -171 +172 @@
         outresult->step=this->step;
 
-
-        /*Assign output*/
-        return outresult;
-
-}
-/*}}}*/
-/*FUNCTION DoubleElementResult::SpawnTriaElementResult{{{1*/
-ElementResult* DoubleElementResult::SpawnTriaElementResult(int* indices){
-
-        /*output*/
-        DoubleElementResult* outresult=new DoubleElementResult();
-
-        /*copy fields: */
-        outresult->enum_type=this->enum_type;
-        outresult->value=this->value;
-        outresult->time=this->time;
-        outresult->step=this->step;
-
         /*Assign output*/
         return outresult;

issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h

@@ -42 +42 @@
                 /*}}}*/
                 /*ElementResult virtual functions definitions: {{{1*/
-                ElementResult* SpawnSingElementResult(int  index);
                 ElementResult* SpawnBeamElementResult(int* indices);
                 ElementResult* SpawnTriaElementResult(int* indices);

issm/trunk/src/c/objects/ElementResults/ElementResult.h

@@ -18 +18 @@
                 virtual        ~ElementResult(){};
                 
-                virtual         ElementResult* SpawnSingElementResult(int  index)=0;
                 virtual         ElementResult* SpawnBeamElementResult(int* indices)=0;
                 virtual         ElementResult* SpawnTriaElementResult(int* indices)=0;

issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp

@@ -145 +145 @@
 }
 /*}}}*/
-/*FUNCTION PentaVertexElementResult::SpawnSingElementResult{{{1*/
-ElementResult* PentaVertexElementResult::SpawnSingElementResult(int index){
-
-        /*output*/
-        SingVertexElementResult* outresult=NULL;
-
-        /*Create new Sing result (copy of current result)*/
-        ISSMASSERT(index<6 && index>=0);
-        outresult=new SingVertexElementResult(this->enum_type,this->values[index],this->step,this->time);
-
-        /*Assign output*/
-        return outresult;
-
-}
-/*}}}*/
 /*FUNCTION PentaVertexElementResult::SpawnBeamElementResult{{{1*/
 ElementResult* PentaVertexElementResult::SpawnBeamElementResult(int* indices){

issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h

@@ -41 +41 @@
                 /*}}}*/
                 /*ElementResult virtual functions definitions: {{{1*/
-                ElementResult* SpawnSingElementResult(int  index);
                 ElementResult* SpawnBeamElementResult(int* indices);
                 ElementResult* SpawnTriaElementResult(int* indices);

issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp

@@ -145 +145 @@
 }
 /*}}}*/
-/*FUNCTION TriaVertexElementResult::SpawnSingElementResult{{{1*/
-ElementResult* TriaVertexElementResult::SpawnSingElementResult(int index){
-
-        /*output*/
-        SingVertexElementResult* outresult=NULL;
-
-        /*Create new Sing result (copy of current result)*/
-        ISSMASSERT(index<3 && index>=0);
-        outresult=new SingVertexElementResult(this->enum_type,this->values[index],this->step,this->time);
-
-        /*Assign output*/
-        return outresult;
-
-}
-/*}}}*/
 /*FUNCTION BeamVertexElementResult::SpawnBeamElementResult{{{1*/
 ElementResult* TriaVertexElementResult::SpawnBeamElementResult(int* indices){

issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h

@@ -40 +40 @@
                 /*}}}*/
                 /*ElementResult virtual functions definitions: {{{1*/
-                ElementResult* SpawnSingElementResult(int  index);
                 ElementResult* SpawnBeamElementResult(int* indices);
                 ElementResult* SpawnTriaElementResult(int* indices);

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -5288 +5288 @@
 }
 /*}}}*/
-/*FUNCTION Penta::SpawnSing {{{1*/
-void* Penta::SpawnSing(int index){
-
-        Sing* sing=NULL;
-        int zero=0;
-        Parameters *sing_parameters = NULL;
-        Inputs     *sing_inputs     = NULL;
-
-        sing_parameters=this->parameters;
-        sing_inputs=(Inputs*)this->inputs->SpawnSingInputs(index);
-
-        sing=new Sing();
-        sing->id=this->id;
-        sing->inputs=sing_inputs;
-        sing->parameters=sing_parameters;
-
-        /*now deal with nodes,matice and matpar: */
-        sing->node=this->nodes[index];
-        sing->matice=this->matice;
-        sing->matpar=this->matpar;
-        
-        return sing;
-}
-/*}}}*/
 /*FUNCTION Penta::SurfaceNormal {{{1*/
 void Penta::SurfaceNormal(double* surface_normal, double xyz_list[3][3]){

issm/trunk/src/c/objects/Elements/Penta.h

@@ -175 +175 @@
                 void      SetClone(int* minranks);
                 void*     SpawnBeam(int g0, int g1);
-                void*     SpawnSing(int g0);
                 Tria*     SpawnTria(int g0, int g1, int g2);
                 void      SurfaceNormal(double* surface_normal, double xyz_list[3][3]);

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -3004 +3004 @@
 
         /*Collapsed formulation: */
-        Sing*  sing=NULL;
         int    i;
+        int    connectivity;
+        const int numgrids=3;
+        const int NDOF2=2;
+        const int numdofs=numgrids*NDOF2;
+        int    doflist[numdofs];
+        int    numberofdofspernode;
+
+        double Ke_gg[numdofs][numdofs]={0.0};
 
         /*flags: */
@@ -3016 +3023 @@
         if(onwater)return;
 
+        GetDofList(&doflist[0],&numberofdofspernode);
+
         /*Spawn 3 sing elements: */
         for(i=0;i<3;i++){
-
-                /*Create Sing and call sing method*/
-                sing=(Sing*)SpawnSing(i);
-                sing->CreateKMatrix(Kgg);
-
-                /*clean up*/
-                delete sing;
-        }
+                connectivity=nodes[i]->GetConnectivity();
+                Ke_gg[2*i][2*i]=1/(double)connectivity;
+                Ke_gg[2*i+1][2*i+1]=1/(double)connectivity;
+        }
+
+        MatSetValues(Kgg,numdofs,doflist,numdofs,doflist,(const double*)Ke_gg,ADD_VALUES);
 
 }
@@ -4666 +4673 @@
 
         /*Collapsed formulation: */
-        Sing*  sing=NULL;
-        int    i;
+        int       i;
+        const int numgrids=3;
+        const int NDOF2=2;
+        const int numdofs=NDOF2*numgrids;
+        int       doflist[numdofs];
+        int       numberofdofspernode;
+        double    constant_part,ub,vb;
+        double    rho_ice,gravity,n,B;
+        double    pe_g[numdofs];
+        double    slope[2];
+        double    thickness;
+        double    slope2;
+        int       connectivity;
 
         /*flags: */
         bool onwater;
+        Input* slopex_input=NULL;
+        Input* slopey_input=NULL;
+        Input* thickness_input=NULL;
+        double gauss[numgrids][numgrids] = {{1,0,0},{0,1,0},{0,0,1}}; //TO BE DELETED
 
         /*recover some inputs: */
@@ -4678 +4700 @@
         if(onwater)return;
 
+        GetDofList(&doflist[0],&numberofdofspernode);
+        
+        /* Get parameters */
+        rho_ice=matpar->GetRhoIce();
+        gravity=matpar->GetG();
+        n=matice->GetN();
+        B=matice->GetB();
+
+        /* Get slopes and thickness */
+        slopex_input=inputs->GetInput(SurfaceSlopeXEnum);
+        slopey_input=inputs->GetInput(SurfaceSlopeYEnum);
+        thickness_input=inputs->GetInput(ThicknessEnum);
+
         /*Spawn 3 sing elements: */
         for(i=0;i<3;i++){
-
-                /*Create Sing and call sing method*/
-                sing=(Sing*)SpawnSing(i);
-                sing->CreatePVector(pg);
-
-                /*clean up*/
-                delete sing;
-        }
-
+                connectivity=nodes[i]->GetConnectivity();
+
+                thickness_input->GetParameterValue(&thickness,&gauss[i][0]);
+                slopex_input->GetParameterValue(&slope[0],&gauss[i][0]);
+                slopey_input->GetParameterValue(&slope[1],&gauss[i][0]);
+                slope2=pow(slope[0],2)+pow(slope[1],2);
+
+                //compute constant_part
+                constant_part=-2*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2));
+
+                //compute ub
+                ub=-1.58*pow((double)10.0,(double)-10.0)*rho_ice*gravity*thickness*slope[0];
+                vb=-1.58*pow((double)10.0,(double)-10.0)*rho_ice*gravity*thickness*slope[1];
+
+                pe_g[2*i]=(ub-2.0*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2.0))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[0])/(double)connectivity;
+                pe_g[2*i+1]=(vb-2.0*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2.0))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[1])/(double)connectivity;
+
+        }
+
+        VecSetValues(pg,numdofs,doflist,(const double*)pe_g,ADD_VALUES);
 }
 /*}}}*/
@@ -6018 +6064 @@
 }
 /*}}}*/
-/*FUNCTION Tria::SpawnSing {{{1*/
-void* Tria::SpawnSing(int index){
-
-        Sing* sing=NULL;
-        int zero=0;
-        Parameters *sing_parameters = NULL;
-        Inputs     *sing_inputs     = NULL;
-
-        sing_parameters=this->parameters;
-        sing_inputs=(Inputs*)this->inputs->SpawnSingInputs(index);
-
-        sing=new Sing();
-        sing->id=this->id;
-        sing->inputs=sing_inputs;
-        sing->parameters=sing_parameters;
-
-        /*now deal with node,matice and matpar: */
-        sing->node=this->nodes[index];
-        sing->matice=this->matice;
-        sing->matpar=this->matpar;
-        
-        return sing;
-}
-/*}}}*/
 /*FUNCTION Tria::SurfaceNormal{{{1*/
 

issm/trunk/src/c/objects/Elements/Tria.h

@@ -157 +157 @@
                 void      SetClone(int* minranks);
                 void*     SpawnBeam(int g0, int g1);
-                void*     SpawnSing(int g0);
                 void      SurfaceNormal(double* surface_normal, double xyz_list[3][3]);
                 /*}}}*/

issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp

@@ -132 +132 @@
 }
 /*}}}*/
-/*FUNCTION BeamVertexInput::SpawnSingInput{{{1*/
-Input* BeamVertexInput::SpawnSingInput(int index){
-
-        /*output*/
-        SingVertexInput* outinput=NULL;
-
-        /*Create new Sing input (copy of current input)*/
-        ISSMASSERT(index<2 && index>=0);
-        outinput=new SingVertexInput(this->enum_type,this->values[index]);
-
-        /*Assign output*/
-        return outinput;
-
-}
-/*}}}*/
 /*FUNCTION BeamVertexInput::SpawnBeamInput{{{1*/
 Input* BeamVertexInput::SpawnBeamInput(int* indices){

issm/trunk/src/c/objects/Inputs/BeamVertexInput.h

@@ -38 +38 @@
                 /*BeamVertexInput management: {{{1*/
                 int   EnumType();
-                Input* SpawnSingInput(int  index);
                 Input* SpawnBeamInput(int* indices);
                 Input* SpawnTriaInput(int* indices);

issm/trunk/src/c/objects/Inputs/BoolInput.cpp

@@ -131 +131 @@
 }
 /*}}}*/
-/*FUNCTION BoolInput::SpawnSingInput{{{1*/
-Input* BoolInput::SpawnSingInput(int index){
-
-        /*output*/
-        BoolInput* outinput=new BoolInput();
-
-        /*only copy current value*/
-        outinput->enum_type=this->enum_type;
-        outinput->value=this->value;
-
-        /*Assign output*/
-        return outinput;
-
-}
-/*}}}*/
 /*FUNCTION BoolInput::SpawnBeamInput{{{1*/
 Input* BoolInput::SpawnBeamInput(int* indices){

issm/trunk/src/c/objects/Inputs/BoolInput.h

@@ -38 +38 @@
                 /*BoolInput management: {{{1*/
                 int   EnumType();
-                Input* SpawnSingInput(int  index);
                 Input* SpawnBeamInput(int* indices);
                 Input* SpawnTriaInput(int* indices);

issm/trunk/src/c/objects/Inputs/DoubleInput.cpp

@@ -131 +131 @@
 }
 /*}}}*/
-/*FUNCTION DoubleInput::SpawnSingInput{{{1*/
-Input* DoubleInput::SpawnSingInput(int index){
-
-        /*output*/
-        DoubleInput* outinput=new DoubleInput();
-
-        /*only copy current value*/
-        outinput->enum_type=this->enum_type;
-        outinput->value=this->value;
-
-        /*Assign output*/
-        return outinput;
-
-}
-/*}}}*/
 /*FUNCTION DoubleInput::SpawnBeamInput{{{1*/
 Input* DoubleInput::SpawnBeamInput(int* indices){

issm/trunk/src/c/objects/Inputs/DoubleInput.h

@@ -37 +37 @@
                 /*DoubleInput management: {{{1*/
                 int   EnumType();
-                Input* SpawnSingInput(int  index);
                 Input* SpawnBeamInput(int* indices);
                 Input* SpawnTriaInput(int* indices);

issm/trunk/src/c/objects/Inputs/Input.h

@@ -42 +42 @@
                 virtual void ChangeEnum(int newenumtype)=0;
                 
-                virtual Input* SpawnSingInput(int  index)=0;
                 virtual Input* SpawnBeamInput(int* indices)=0;
                 virtual Input* SpawnTriaInput(int* indices)=0;

issm/trunk/src/c/objects/Inputs/IntInput.cpp

@@ -131 +131 @@
 }
 /*}}}*/
-/*FUNCTION IntInput::SpawnSingInput{{{1*/
-Input* IntInput::SpawnSingInput(int index){
-
-        /*output*/
-        IntInput* outinput=new IntInput();
-
-        /*only copy current value*/
-        outinput->enum_type=this->enum_type;
-        outinput->value=this->value;
-
-        /*Assign output*/
-        return outinput;
-}
-/*}}}*/
 /*FUNCTION IntInput::SpawnBeamInput{{{1*/
 Input* IntInput::SpawnBeamInput(int* indices){

issm/trunk/src/c/objects/Inputs/IntInput.h

@@ -38 +38 @@
                 /*IntInput management: {{{1*/
                 int   EnumType();
-                Input* SpawnSingInput(int  index);
                 Input* SpawnBeamInput(int* indices);
                 Input* SpawnTriaInput(int* indices);

issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp

@@ -142 +142 @@
 }
 /*}}}*/
-/*FUNCTION PentaVertexInput::SpawnSingInput{{{1*/
-Input* PentaVertexInput::SpawnSingInput(int index){
-
-        /*output*/
-        SingVertexInput* outinput=NULL;
-
-        /*Create new Sing input (copy of current input)*/
-        ISSMASSERT(index<6 && index>=0);
-        outinput=new SingVertexInput(this->enum_type,this->values[index]);
-
-        /*Assign output*/
-        return outinput;
-
-}
-/*}}}*/
 /*FUNCTION PentaVertexInput::SpawnBeamInput{{{1*/
 Input* PentaVertexInput::SpawnBeamInput(int* indices){
@@ -611 +596 @@
         }
 
-        /*Create new Sing input (copy of current input)*/
+        /*Create new Penta vertex input (copy of current input)*/
         outinput=new PentaVertexInput(this->enum_type,&AdotBvalues[0]);
 

issm/trunk/src/c/objects/Inputs/PentaVertexInput.h

@@ -38 +38 @@
                 /*PentaVertexInput management: {{{1*/
                 int   EnumType();
-                Input* SpawnSingInput(int  index);
                 Input* SpawnBeamInput(int* indices);
                 Input* SpawnTriaInput(int* indices);

issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp

@@ -139 +139 @@
 
         return this->enum_type;
-
-}
-/*}}}*/
-/*FUNCTION TriaVertexInput::SpawnSingInput{{{1*/
-Input* TriaVertexInput::SpawnSingInput(int index){
-
-        /*output*/
-        SingVertexInput* outinput=NULL;
-
-        /*Create new Sing input (copy of current input)*/
-        ISSMASSERT(index<3 && index>=0);
-        outinput=new SingVertexInput(this->enum_type,this->values[index]);
-
-        /*Assign output*/
-        return outinput;
 
 }

issm/trunk/src/c/objects/Inputs/TriaVertexInput.h

@@ -38 +38 @@
                 /*TriaVertexInput management: {{{1*/
                 int   EnumType();
-                Input* SpawnSingInput(int  index);
                 Input* SpawnBeamInput(int* indices);
                 Input* SpawnTriaInput(int* indices);

issm/trunk/src/c/objects/objects.h

@@ -41 +41 @@
 #include "./Elements/TriaHook.h"
 #include "./Elements/TriaRef.h"
-#include "./Elements/Sing.h"
 
 /*Inputs: */
@@ -50 +49 @@
 #include "./Inputs/BeamVertexInput.h"
 #include "./Inputs/PentaVertexInput.h"
-#include "./Inputs/SingVertexInput.h"
 #include "./Inputs/TriaVertexInput.h"
 
@@ -58 +56 @@
 #include "./ElementResults/TriaVertexElementResult.h"
 #include "./ElementResults/PentaVertexElementResult.h"
-#include "./ElementResults/SingVertexElementResult.h"
 #include "./ElementResults/BeamVertexElementResult.h"
 

issm/trunk/src/m/enum/AbsoluteEnum.m

@@ -9 +9 @@
 %      macro=AbsoluteEnum()
 
-macro=229;
+macro=226;

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

@@ -9 +9 @@
 %      macro=AccumulationRateEnum()
 
-macro=121;
+macro=119;

issm/trunk/src/m/enum/AdjointEnum.m

@@ -9 +9 @@
 %      macro=AdjointEnum()
 
-macro=244;
+macro=241;

issm/trunk/src/m/enum/AdjointpEnum.m

@@ -9 +9 @@
 %      macro=AdjointpEnum()
 
-macro=125;
+macro=123;

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

@@ -9 +9 @@
 %      macro=AdjointxEnum()
 
-macro=122;
+macro=120;

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

@@ -9 +9 @@
 %      macro=AdjointyEnum()
 
-macro=123;
+macro=121;

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

@@ -9 +9 @@
 %      macro=AdjointzEnum()
 
-macro=124;
+macro=122;

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

@@ -9 +9 @@
 %      macro=AirEnum()
 
-macro=119;
+macro=117;

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

@@ -9 +9 @@
 %      macro=ArtDiffEnum()
 
-macro=126;
+macro=124;

issm/trunk/src/m/enum/BeamVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=BeamVertexElementResultEnum()
 
-macro=214;
+macro=211;

issm/trunk/src/m/enum/BeamVertexInputEnum.m

@@ -9 +9 @@
 %      macro=BeamVertexInputEnum()
 
-macro=91;
+macro=90;

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

@@ -9 +9 @@
 %      macro=BedEnum()
 
-macro=127;
+macro=125;

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

@@ -9 +9 @@
 %      macro=BedSlopeXEnum()
 
-macro=128;
+macro=126;

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

@@ -9 +9 @@
 %      macro=BedSlopeYEnum()
 
-macro=129;
+macro=127;

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

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=239;
+macro=236;

issm/trunk/src/m/enum/BoolExternalResultEnum.m

@@ -9 +9 @@
 %      macro=BoolExternalResultEnum()
 
-macro=215;
+macro=212;

issm/trunk/src/m/enum/BoolInputEnum.m

@@ -9 +9 @@
 %      macro=BoolInputEnum()
 
-macro=92;
+macro=91;

issm/trunk/src/m/enum/BoolParamEnum.m

@@ -9 +9 @@
 %      macro=BoolParamEnum()
 
-macro=99;
+macro=97;

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

@@ -9 +9 @@
 %      macro=BoundaryEnum()
 
-macro=130;
+macro=128;

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

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=240;
+macro=237;

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

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=241;
+macro=238;

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

@@ -9 +9 @@
 %      macro=CmMaxDmpSlopeEnum()
 
-macro=131;
+macro=129;

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

@@ -9 +9 @@
 %      macro=CmMaxDmpValueEnum()
 
-macro=132;
+macro=130;

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

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=242;
+macro=239;

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

@@ -9 +9 @@
 %      macro=CmMinDmpSlopeEnum()
 
-macro=133;
+macro=131;

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

@@ -9 +9 @@
 %      macro=CmMinDmpValueEnum()
 
-macro=134;
+macro=132;

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

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=243;
+macro=240;

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

@@ -9 +9 @@
 %      macro=CmNoiseDmpEnum()
 
-macro=135;
+macro=133;

issm/trunk/src/m/enum/ColinearEnum.m

@@ -9 +9 @@
 %      macro=ColinearEnum()
 
-macro=237;
+macro=234;

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

@@ -9 +9 @@
 %      macro=CollapseEnum()
 
-macro=136;
+macro=134;

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

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=247;
+macro=244;

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

@@ -9 +9 @@
 %      macro=ConstantEnum()
 
-macro=137;
+macro=135;

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

@@ -9 +9 @@
 %      macro=ControlParameterEnum()
 
-macro=248;
+macro=245;

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

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=249;
+macro=246;

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

@@ -9 +9 @@
 %      macro=ControlTypeEnum()
 
-macro=138;
+macro=136;

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

@@ -9 +9 @@
 %      macro=ConvergedEnum()
 
-macro=139;
+macro=137;

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

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=250;
+macro=247;

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

@@ -9 +9 @@
 %      macro=DhDtEnum()
 
-macro=140;
+macro=138;

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

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=251;
+macro=248;

issm/trunk/src/m/enum/DoubleElementResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleElementResultEnum()
 
-macro=210;
+macro=208;

issm/trunk/src/m/enum/DoubleExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleExternalResultEnum()
 
-macro=216;
+macro=213;

issm/trunk/src/m/enum/DoubleInputEnum.m

@@ -9 +9 @@
 %      macro=DoubleInputEnum()
 
-macro=93;
+macro=92;

issm/trunk/src/m/enum/DoubleMatArrayParamEnum.m

@@ -9 +9 @@
 %      macro=DoubleMatArrayParamEnum()
 
-macro=101;
+macro=99;

issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleMatExternalResultEnum()
 
-macro=218;
+macro=215;

issm/trunk/src/m/enum/DoubleMatParamEnum.m

@@ -9 +9 @@
 %      macro=DoubleMatParamEnum()
 
-macro=100;
+macro=98;

issm/trunk/src/m/enum/DoubleParamEnum.m

@@ -9 +9 @@
 %      macro=DoubleParamEnum()
 
-macro=102;
+macro=100;

issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleVecExternalResultEnum()
 
-macro=217;
+macro=214;

issm/trunk/src/m/enum/DoubleVecParamEnum.m

@@ -9 +9 @@
 %      macro=DoubleVecParamEnum()
 
-macro=103;
+macro=101;

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

@@ -9 +9 @@
 %      macro=DragCoefficientEnum()
 
-macro=141;
+macro=139;

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

@@ -9 +9 @@
 %      macro=DragPEnum()
 
-macro=142;
+macro=140;

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

@@ -9 +9 @@
 %      macro=DragQEnum()
 
-macro=143;
+macro=141;

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

@@ -9 +9 @@
 %      macro=DragTypeEnum()
 
-macro=144;
+macro=142;

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

@@ -9 +9 @@
 %      macro=DtEnum()
 
-macro=145;
+macro=143;

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

@@ -9 +9 @@
 %      macro=ElementOnBedEnum()
 
-macro=146;
+macro=144;

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

@@ -9 +9 @@
 %      macro=ElementOnIceShelfEnum()
 
-macro=147;
+macro=145;

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

@@ -9 +9 @@
 %      macro=ElementOnSurfaceEnum()
 
-macro=148;
+macro=146;

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

@@ -9 +9 @@
 %      macro=ElementOnWaterEnum()
 
-macro=149;
+macro=147;

issm/trunk/src/m/enum/ElementResultEnum.m

@@ -9 +9 @@
 %      macro=ElementResultEnum()
 
-macro=110;
+macro=108;

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

@@ -84 +84 @@
         case NodePropertiesEnum(), string='NodeProperties'; return
         case PentaEnum(), string='Penta'; return
-        case SingEnum(), string='Sing'; return
         case TriaEnum(), string='Tria'; return
         case NodeEnum(), string='Node'; return
@@ -107 +106 @@
         case IntInputEnum(), string='IntInput'; return
         case PentaVertexInputEnum(), string='PentaVertexInput'; return
-        case SingVertexInputEnum(), string='SingVertexInput'; return
         case TriaVertexInputEnum(), string='TriaVertexInput'; return
         case ParamEnum(), string='Param'; return
@@ -224 +222 @@
         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

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

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=252;
+macro=249;

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

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=253;
+macro=250;

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

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=254;
+macro=251;

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

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=255;
+macro=252;

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

@@ -9 +9 @@
 %      macro=EpsVelEnum()
 
-macro=150;
+macro=148;

issm/trunk/src/m/enum/ExternalResultEnum.m

@@ -9 +9 @@
 %      macro=ExternalResultEnum()
 
-macro=111;
+macro=109;

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

@@ -9 +9 @@
 %      macro=ExtrudeParamEnum()
 
-macro=256;
+macro=253;

issm/trunk/src/m/enum/FileParamEnum.m

@@ -9 +9 @@
 %      macro=FileParamEnum()
 
-macro=105;
+macro=103;

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

@@ -9 +9 @@
 %      macro=FillEnum()
 
-macro=151;
+macro=149;

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

@@ -9 +9 @@
 %      macro=FitEnum()
 
-macro=152;
+macro=150;

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

@@ -9 +9 @@
 %      macro=FractionIncrementEnum()
 
-macro=153;
+macro=151;

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

@@ -9 +9 @@
 %      macro=FrictionEnum()
 
-macro=154;
+macro=152;

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

@@ -9 +9 @@
 %      macro=GeographyEnum()
 
-macro=114;
+macro=112;

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

@@ -9 +9 @@
 %      macro=GeothermalFluxEnum()
 
-macro=155;
+macro=153;

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

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=245;
+macro=242;

issm/trunk/src/m/enum/GravityEnum.m

@@ -9 +9 @@
 %      macro=GravityEnum()
 
-macro=232;
+macro=229;

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

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=257;
+macro=254;

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

@@ -9 +9 @@
 %      macro=IceEnum()
 
-macro=118;
+macro=116;

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

@@ -9 +9 @@
 %      macro=IceSheetEnum()
 
-macro=115;
+macro=113;

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

@@ -9 +9 @@
 %      macro=IceShelfEnum()
 
-macro=116;
+macro=114;

issm/trunk/src/m/enum/IcefrontEnum.m

@@ -9 +9 @@
 %      macro=IcefrontEnum()
 
-macro=78;
+macro=77;

issm/trunk/src/m/enum/InputEnum.m

@@ -9 +9 @@
 %      macro=InputEnum()
 
-macro=90;
+macro=89;

issm/trunk/src/m/enum/IntExternalResultEnum.m

@@ -9 +9 @@
 %      macro=IntExternalResultEnum()
 
-macro=219;
+macro=216;

issm/trunk/src/m/enum/IntInputEnum.m

@@ -9 +9 @@
 %      macro=IntInputEnum()
 
-macro=94;
+macro=93;

issm/trunk/src/m/enum/IntParamEnum.m

@@ -9 +9 @@
 %      macro=IntParamEnum()
 
-macro=104;
+macro=102;

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

@@ -9 +9 @@
 %      macro=InternalEnum()
 
-macro=156;
+macro=154;

issm/trunk/src/m/enum/IntersectEnum.m

@@ -9 +9 @@
 %      macro=IntersectEnum()
 
-macro=236;
+macro=233;

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

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=258;
+macro=255;

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

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=259;
+macro=256;

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

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=260;
+macro=257;

issm/trunk/src/m/enum/JEnum.m

@@ -9 +9 @@
 %      macro=JEnum()
 
-macro=222;
+macro=219;

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

@@ -9 +9 @@
 %      macro=KflagEnum()
 
-macro=157;
+macro=155;

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

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=261;
+macro=258;

issm/trunk/src/m/enum/LoadEnum.m

@@ -9 +9 @@
 %      macro=LoadEnum()
 
-macro=77;
+macro=76;

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

@@ -9 +9 @@
 %      macro=LowmemEnum()
 
-macro=262;
+macro=259;

issm/trunk/src/m/enum/MaterialEnum.m

@@ -9 +9 @@
 %      macro=MaterialEnum()
 
-macro=87;
+macro=86;

issm/trunk/src/m/enum/MaticeEnum.m

@@ -9 +9 @@
 %      macro=MaticeEnum()
 
-macro=88;
+macro=87;

issm/trunk/src/m/enum/MatparEnum.m

@@ -9 +9 @@
 %      macro=MatparEnum()
 
-macro=89;
+macro=88;

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

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=263;
+macro=260;

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

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=264;
+macro=261;

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

@@ -9 +9 @@
 %      macro=MaxPenetrationEnum()
 
-macro=158;
+macro=156;

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

@@ -9 +9 @@
 %      macro=MeanVelEnum()
 
-macro=159;
+macro=157;

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

@@ -9 +9 @@
 %      macro=MelangeEnum()
 
-macro=120;
+macro=118;

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

@@ -9 +9 @@
 %      macro=MeltingOffsetEnum()
 
-macro=160;
+macro=158;

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

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=265;
+macro=262;

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

@@ -9 +9 @@
 %      macro=MeltingRateEnum()
 
-macro=161;
+macro=159;

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

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=266;
+macro=263;

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

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=267;
+macro=264;

issm/trunk/src/m/enum/MiniEnum.m

@@ -9 +9 @@
 %      macro=MiniEnum()
 
-macro=209;
+macro=207;

issm/trunk/src/m/enum/MixedLayerCapacityEnum.m

@@ -9 +9 @@
 %      macro=MixedLayerCapacityEnum()
 
-macro=234;
+macro=231;

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

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=268;
+macro=265;

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

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=269;
+macro=266;

issm/trunk/src/m/enum/NodeEnum.m

@@ -9 +9 @@
 %      macro=NodeEnum()
 
-macro=75;
+macro=74;

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

@@ -9 +9 @@
 %      macro=NodeOnBedEnum()
 
-macro=162;
+macro=160;

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

@@ -9 +9 @@
 %      macro=NodeOnIceSheetEnum()
 
-macro=163;
+macro=161;

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

@@ -9 +9 @@
 %      macro=NodeOnIceShelfEnum()
 
-macro=164;
+macro=162;

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

@@ -9 +9 @@
 %      macro=NodeOnSurfaceEnum()
 
-macro=165;
+macro=163;

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

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=270;
+macro=267;

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

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=271;
+macro=268;

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

@@ -9 +9 @@
 %      macro=NumberNodeToElementConnectivityEnum()
 
-macro=166;
+macro=164;

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

@@ -9 +9 @@
 %      macro=NumberOfDofsPerNodeEnum()
 
-macro=272;
+macro=269;

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

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=273;
+macro=270;

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

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=274;
+macro=271;

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

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=275;
+macro=272;

issm/trunk/src/m/enum/NumericalfluxEnum.m

@@ -9 +9 @@
 %      macro=NumericalfluxEnum()
 
-macro=79;
+macro=78;

issm/trunk/src/m/enum/OldGradientEnum.m

@@ -9 +9 @@
 %      macro=OldGradientEnum()
 
-macro=246;
+macro=243;

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

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=276;
+macro=273;

issm/trunk/src/m/enum/OutputFilePointerEnum.m

@@ -9 +9 @@
 %      macro=OutputFilePointerEnum()
 
-macro=277;
+macro=274;

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

@@ -9 +9 @@
 %      macro=P0Enum()
 
-macro=206;
+macro=204;

issm/trunk/src/m/enum/P1DGEnum.m

@@ -9 +9 @@
 %      macro=P1DGEnum()
 
-macro=208;
+macro=206;

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

@@ -9 +9 @@
 %      macro=P1Enum()
 
-macro=207;
+macro=205;

issm/trunk/src/m/enum/ParamEnum.m

@@ -9 +9 @@
 %      macro=ParamEnum()
 
-macro=98;
+macro=96;

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

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=278;
+macro=275;

issm/trunk/src/m/enum/PatchEnum.m

@@ -9 +9 @@
 %      macro=PatchEnum()
 
-macro=223;
+macro=220;

issm/trunk/src/m/enum/PatchNodesEnum.m

@@ -9 +9 @@
 %      macro=PatchNodesEnum()
 
-macro=225;
+macro=222;

issm/trunk/src/m/enum/PatchVerticesEnum.m

@@ -9 +9 @@
 %      macro=PatchVerticesEnum()
 
-macro=224;
+macro=221;

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

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=279;
+macro=276;

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

@@ -9 +9 @@
 %      macro=PenaltyOffsetEnum()
 
-macro=167;
+macro=165;

issm/trunk/src/m/enum/PengridEnum.m

@@ -9 +9 @@
 %      macro=PengridEnum()
 
-macro=80;
+macro=79;

issm/trunk/src/m/enum/PenpairEnum.m

@@ -9 +9 @@
 %      macro=PenpairEnum()
 
-macro=81;
+macro=80;

issm/trunk/src/m/enum/PentaVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=PentaVertexElementResultEnum()
 
-macro=212;
+macro=210;

issm/trunk/src/m/enum/PentaVertexInputEnum.m

@@ -9 +9 @@
 %      macro=PentaVertexInputEnum()
 
-macro=95;
+macro=94;

issm/trunk/src/m/enum/PetscMatParamEnum.m

@@ -9 +9 @@
 %      macro=PetscMatParamEnum()
 
-macro=106;
+macro=104;

issm/trunk/src/m/enum/PetscVecExternalResultEnum.m

@@ -9 +9 @@
 %      macro=PetscVecExternalResultEnum()
 
-macro=220;
+macro=217;

issm/trunk/src/m/enum/PetscVecParamEnum.m

@@ -9 +9 @@
 %      macro=PetscVecParamEnum()
 
-macro=107;
+macro=105;

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

@@ -9 +9 @@
 %      macro=PflagEnum()
 
-macro=168;
+macro=166;

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

@@ -9 +9 @@
 %      macro=PressureEnum()
 
-macro=169;
+macro=167;

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

@@ -9 +9 @@
 %      macro=PressureOldEnum()
 
-macro=170;
+macro=168;

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

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=280;
+macro=277;

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

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=281;
+macro=278;

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

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=282;
+macro=279;

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

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=283;
+macro=280;

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

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=284;
+macro=281;

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

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=285;
+macro=282;

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

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=286;
+macro=283;

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

@@ -9 +9 @@
 %      macro=QmuPressureEnum()
 
-macro=171;
+macro=169;

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

@@ -9 +9 @@
 %      macro=QmuVxEnum()
 
-macro=194;
+macro=192;

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

@@ -9 +9 @@
 %      macro=QmuVyEnum()
 
-macro=199;
+macro=197;

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

@@ -9 +9 @@
 %      macro=QmuVzEnum()
 
-macro=204;
+macro=202;

issm/trunk/src/m/enum/QuadIceFrontEnum.m

@@ -9 +9 @@
 %      macro=QuadIceFrontEnum()
 
-macro=82;
+macro=81;

issm/trunk/src/m/enum/QuadRiftFrontEnum.m

@@ -9 +9 @@
 %      macro=QuadRiftFrontEnum()
 
-macro=83;
+macro=82;

issm/trunk/src/m/enum/RelativeEnum.m

@@ -9 +9 @@
 %      macro=RelativeEnum()
 
-macro=227;
+macro=224;

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

@@ -9 +9 @@
 %      macro=ResetPenaltiesEnum()
 
-macro=172;
+macro=170;

issm/trunk/src/m/enum/ResidualEnum.m

@@ -9 +9 @@
 %      macro=ResidualEnum()
 
-macro=228;
+macro=225;

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

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=287;
+macro=284;

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

@@ -9 +9 @@
 %      macro=RgbEnum()
 
-macro=112;
+macro=110;

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

@@ -9 +9 @@
 %      macro=RheologyBEnum()
 
-macro=173;
+macro=171;

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

@@ -9 +9 @@
 %      macro=RheologyNEnum()
 
-macro=174;
+macro=172;

issm/trunk/src/m/enum/RhoIceEnum.m

@@ -9 +9 @@
 %      macro=RhoIceEnum()
 
-macro=230;
+macro=227;

issm/trunk/src/m/enum/RhoWaterEnum.m

@@ -9 +9 @@
 %      macro=RhoWaterEnum()
 
-macro=231;
+macro=228;

issm/trunk/src/m/enum/RiftfrontEnum.m

@@ -9 +9 @@
 %      macro=RiftfrontEnum()
 
-macro=84;
+macro=83;

issm/trunk/src/m/enum/SegmentIcefrontEnum.m

@@ -9 +9 @@
 %      macro=SegmentIcefrontEnum()
 
-macro=85;
+macro=84;

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

@@ -9 +9 @@
 %      macro=SegmentOnIceShelfEnum()
 
-macro=175;
+macro=173;

issm/trunk/src/m/enum/SegmentRiftfrontEnum.m

@@ -9 +9 @@
 %      macro=SegmentRiftfrontEnum()
 
-macro=86;
+macro=85;

issm/trunk/src/m/enum/SeparateEnum.m

@@ -9 +9 @@
 %      macro=SeparateEnum()
 
-macro=238;
+macro=235;

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

@@ -9 +9 @@
 %      macro=SolverStringEnum()
 
-macro=288;
+macro=285;

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

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=289;
+macro=286;

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

@@ -9 +9 @@
 %      macro=SpcEnum()
 
-macro=113;
+macro=111;

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

@@ -9 +9 @@
 %      macro=StabilizeConstraintsEnum()
 
-macro=176;
+macro=174;

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

@@ -9 +9 @@
 %      macro=StokesReconditioningEnum()
 
-macro=177;
+macro=175;

issm/trunk/src/m/enum/StringArrayParamEnum.m

@@ -9 +9 @@
 %      macro=StringArrayParamEnum()
 
-macro=108;
+macro=106;

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

@@ -82 +82 @@
 elseif (strcmpi(name,'NodeProperties')), enum=NodePropertiesEnum(); return
 elseif (strcmpi(name,'Penta')), enum=PentaEnum(); return
-elseif (strcmpi(name,'Sing')), enum=SingEnum(); return
 elseif (strcmpi(name,'Tria')), enum=TriaEnum(); return
 elseif (strcmpi(name,'Node')), enum=NodeEnum(); return
@@ -105 +104 @@
 elseif (strcmpi(name,'IntInput')), enum=IntInputEnum(); return
 elseif (strcmpi(name,'PentaVertexInput')), enum=PentaVertexInputEnum(); return
-elseif (strcmpi(name,'SingVertexInput')), enum=SingVertexInputEnum(); return
 elseif (strcmpi(name,'TriaVertexInput')), enum=TriaVertexInputEnum(); return
 elseif (strcmpi(name,'Param')), enum=ParamEnum(); return
@@ -222 +220 @@
 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

issm/trunk/src/m/enum/StringExternalResultEnum.m

@@ -9 +9 @@
 %      macro=StringExternalResultEnum()
 
-macro=221;
+macro=218;

issm/trunk/src/m/enum/StringParamEnum.m

@@ -9 +9 @@
 %      macro=StringParamEnum()
 
-macro=109;
+macro=107;

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

@@ -9 +9 @@
 %      macro=SurfaceAreaEnum()
 
-macro=178;
+macro=176;

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

@@ -9 +9 @@
 %      macro=SurfaceEnum()
 
-macro=179;
+macro=177;

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

@@ -9 +9 @@
 %      macro=SurfaceSlopeXEnum()
 
-macro=180;
+macro=178;

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

@@ -9 +9 @@
 %      macro=SurfaceSlopeYEnum()
 
-macro=181;
+macro=179;

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

@@ -9 +9 @@
 %      macro=TemperatureAverageEnum()
 
-macro=184;
+macro=182;

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

@@ -9 +9 @@
 %      macro=TemperatureEnum()
 
-macro=182;
+macro=180;

issm/trunk/src/m/enum/TemperatureOldEnum.m

@@ -9 +9 @@
 %      macro=TemperatureOldEnum()
 
-macro=183;
+macro=181;

issm/trunk/src/m/enum/ThermalConductivityEnum.m

@@ -9 +9 @@
 %      macro=ThermalConductivityEnum()
 
-macro=233;
+macro=230;

issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m

@@ -9 +9 @@
 %      macro=ThermalExchangeVelocityEnum()
 
-macro=235;
+macro=232;

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

@@ -9 +9 @@
 %      macro=ThicknessEnum()
 
-macro=185;
+macro=183;

issm/trunk/src/m/enum/TimeEnum.m

@@ -9 +9 @@
 %      macro=TimeEnum()
 
-macro=226;
+macro=223;

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

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=290;
+macro=287;

issm/trunk/src/m/enum/TriaEnum.m

@@ -9 +9 @@
 %      macro=TriaEnum()
 
-macro=74;
+macro=73;

issm/trunk/src/m/enum/TriaVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=TriaVertexElementResultEnum()
 
-macro=211;
+macro=209;

issm/trunk/src/m/enum/TriaVertexInputEnum.m

@@ -9 +9 @@
 %      macro=TriaVertexInputEnum()
 
-macro=97;
+macro=95;

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

@@ -9 +9 @@
 %      macro=TypeEnum()
 
-macro=186;
+macro=184;

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

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=291;
+macro=288;

issm/trunk/src/m/enum/VelEnum.m

@@ -9 +9 @@
 %      macro=VelEnum()
 
-macro=187;
+macro=185;

issm/trunk/src/m/enum/VelObsEnum.m

@@ -9 +9 @@
 %      macro=VelObsEnum()
 
-macro=188;
+macro=186;

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

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=292;
+macro=289;

issm/trunk/src/m/enum/VertexEnum.m

@@ -9 +9 @@
 %      macro=VertexEnum()
 
-macro=76;
+macro=75;

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

@@ -9 +9 @@
 %      macro=ViscosityOvershootEnum()
 
-macro=189;
+macro=187;

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

@@ -9 +9 @@
 %      macro=VxAverageEnum()
 
-macro=190;
+macro=188;

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

@@ -9 +9 @@
 %      macro=VxEnum()
 
-macro=191;
+macro=189;

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

@@ -9 +9 @@
 %      macro=VxObsEnum()
 
-macro=192;
+macro=190;

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

@@ -9 +9 @@
 %      macro=VxOldEnum()
 
-macro=193;
+macro=191;

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

@@ -9 +9 @@
 %      macro=VyAverageEnum()
 
-macro=195;
+macro=193;

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

@@ -9 +9 @@
 %      macro=VyEnum()
 
-macro=196;
+macro=194;

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

@@ -9 +9 @@
 %      macro=VyObsEnum()
 
-macro=197;
+macro=195;

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

@@ -9 +9 @@
 %      macro=VyOldEnum()
 
-macro=198;
+macro=196;

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

@@ -9 +9 @@
 %      macro=VzAverageEnum()
 
-macro=200;
+macro=198;

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

@@ -9 +9 @@
 %      macro=VzEnum()
 
-macro=201;
+macro=199;

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

@@ -9 +9 @@
 %      macro=VzObsEnum()
 
-macro=202;
+macro=200;

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

@@ -9 +9 @@
 %      macro=VzOldEnum()
 
-macro=203;
+macro=201;

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

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=293;
+macro=290;

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

@@ -9 +9 @@
 %      macro=WaterEnum()
 
-macro=117;
+macro=115;

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

@@ -9 +9 @@
 %      macro=WeightsEnum()
 
-macro=205;
+macro=203;

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

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=294;
+macro=291;