Changeset 5579

Timestamp:

08/25/10 16:16:07 (15 years ago)

Author:

seroussi

Message:

merged DiagnostiStokes and DiagnosticHoriz

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/EnumDefinitions/EnumToString.cpp (modified) (1 diff)
• c/EnumDefinitions/StringToEnum.cpp (modified) (1 diff)
• c/Makefile.am (modified) (2 diffs)
• c/modules/ModelProcessorx/CreateDataSets.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (4 diffs)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/DiagnosticStokes (deleted)
• c/modules/ModelProcessorx/DistributeNumDofs.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/ModelProcessorx.h (modified) (1 diff)
• c/objects/Elements/Penta.cpp (modified) (12 diffs)
• c/objects/Elements/Tria.cpp (modified) (1 diff)
• c/objects/Loads/Icefront.cpp (modified) (1 diff)
• c/objects/Loads/Pengrid.cpp (modified) (3 diffs)
• c/objects/Loads/Penpair.cpp (modified) (2 diffs)
• c/solutions/SolutionConfiguration.cpp (modified) (2 diffs)
• c/solutions/adjointdiagnostic_core.cpp (modified) (2 diffs)
• c/solutions/diagnostic_core.cpp (modified) (1 diff)
• c/solutions/objectivefunctionC.cpp (modified) (1 diff)
• m/enum/AbsoluteEnum.m (modified) (1 diff)
• m/enum/AccumulationRateEnum.m (modified) (1 diff)
• m/enum/AdjointBalancedthicknessAnalysisEnum.m (modified) (1 diff)
• m/enum/AdjointEnum.m (modified) (1 diff)
• m/enum/AdjointHorizAnalysisEnum.m (modified) (1 diff)
• m/enum/AdjointSolutionEnum.m (modified) (1 diff)
• m/enum/AdjointStokesAnalysisEnum.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/ApproximationEnum.m (modified) (1 diff)
• m/enum/ArtDiffEnum.m (modified) (1 diff)
• m/enum/BalancedthicknessAnalysisEnum.m (modified) (1 diff)
• m/enum/BalancedthicknessSolutionEnum.m (modified) (1 diff)
• m/enum/BalancedvelocitiesAnalysisEnum.m (modified) (1 diff)
• m/enum/BalancedvelocitiesSolutionEnum.m (modified) (1 diff)
• m/enum/BedEnum.m (modified) (1 diff)
• m/enum/BedSlopeAnalysisEnum.m (modified) (1 diff)
• m/enum/BedSlopeSolutionEnum.m (modified) (1 diff)
• m/enum/BedSlopeXAnalysisEnum.m (modified) (1 diff)
• m/enum/BedSlopeXEnum.m (modified) (1 diff)
• m/enum/BedSlopeYAnalysisEnum.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/CmResponseEnum.m (modified) (1 diff)
• m/enum/CmResponsesEnum.m (modified) (1 diff)
• m/enum/ColinearEnum.m (modified) (1 diff)
• m/enum/ConnectivityEnum.m (modified) (1 diff)
• m/enum/ConstantEnum.m (modified) (1 diff)
• m/enum/ControlAnalysisEnum.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/DiagnosticStokesAnalysisEnum.m (deleted)
• m/enum/DimEnum.m (modified) (1 diff)
• m/enum/DofIndexingEnum.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/ElementEnum.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/ElementPropertiesEnum.m (modified) (1 diff)
• m/enum/ElementResultEnum.m (modified) (1 diff)
• m/enum/EnumToString.m (modified) (1 diff)
• 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/ExtToIuEnum.m (modified) (1 diff)
• m/enum/ExternalResultEnum.m (modified) (1 diff)
• m/enum/FileParamEnum.m (modified) (1 diff)
• m/enum/FillEnum.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/GradientAnalysisEnum.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/HookEnum.m (modified) (1 diff)
• m/enum/HorizAnalysisEnum.m (modified) (1 diff)
• m/enum/HutterAnalysisEnum.m (modified) (1 diff)
• m/enum/HutterApproximationEnum.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/IndexEnum.m (modified) (1 diff)
• m/enum/IndexedEnum.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/InverseAnalysisEnum.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/IuToExtEnum.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/MacAyealApproximationEnum.m (modified) (1 diff)
• m/enum/MacAyealIceFrontEnum.m (modified) (1 diff)
• m/enum/MacAyealPattynApproximationEnum.m (modified) (1 diff)
• m/enum/MassFluxEnum.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/MaxAbsVxEnum.m (modified) (1 diff)
• m/enum/MaxAbsVyEnum.m (modified) (1 diff)
• m/enum/MaxAbsVzEnum.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/MaxVelEnum.m (modified) (1 diff)
• m/enum/MaxVxEnum.m (modified) (1 diff)
• m/enum/MaxVyEnum.m (modified) (1 diff)
• m/enum/MaxVzEnum.m (modified) (1 diff)
• m/enum/MeanVelEnum.m (modified) (1 diff)
• m/enum/MelangeEnum.m (modified) (1 diff)
• m/enum/MeltingAnalysisEnum.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/MinVelEnum.m (modified) (1 diff)
• m/enum/MinVxEnum.m (modified) (1 diff)
• m/enum/MinVyEnum.m (modified) (1 diff)
• m/enum/MinVzEnum.m (modified) (1 diff)
• m/enum/MiniEnum.m (modified) (1 diff)
• m/enum/MisfitEnum.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/NodalEnum.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/NodePropertiesEnum.m (modified) (1 diff)
• m/enum/NoneAnalysisEnum.m (modified) (1 diff)
• m/enum/NoneApproximationEnum.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/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/ObjectEnum.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/OutputFrequencyEnum.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/ParametersAnalysisEnum.m (modified) (1 diff)
• m/enum/ParametersSolutionEnum.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/PattynApproximationEnum.m (modified) (1 diff)
• m/enum/PattynIceFrontEnum.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/PentaEnum.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/PrognosticAnalysisEnum.m (modified) (1 diff)
• m/enum/PrognosticSolutionEnum.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/QmuNumberOfResponsesEnum.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/QuadRiftFrontEnum.m (modified) (1 diff)
• m/enum/RegularEnum.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/RheologyBEnum.m (modified) (1 diff)
• m/enum/RheologyBbarEnum.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/ScaledEnum.m (modified) (1 diff)
• m/enum/SegmentEnum.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/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/SteadyAnalysisEnum.m (modified) (1 diff)
• m/enum/SteadystateAnalysisEnum.m (modified) (1 diff)
• m/enum/SteadystateSolutionEnum.m (modified) (1 diff)
• m/enum/StokesAnalysisEnum.m (modified) (1 diff)
• m/enum/StokesApproximationEnum.m (modified) (1 diff)
• m/enum/StokesIceFrontEnum.m (modified) (1 diff)
• m/enum/StokesReconditioningEnum.m (modified) (1 diff)
• m/enum/StringArrayParamEnum.m (modified) (1 diff)
• m/enum/StringExternalResultEnum.m (modified) (1 diff)
• m/enum/StringParamEnum.m (modified) (1 diff)
• m/enum/StringToEnum.m (modified) (1 diff)
• m/enum/SurfaceAbsVelMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceAreaEnum.m (modified) (1 diff)
• m/enum/SurfaceAverageVelMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceEnum.m (modified) (1 diff)
• m/enum/SurfaceLogVelMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceLogVxVyMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceRelVelMisfitEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeAnalysisEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeSolutionEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeXAnalysisEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeXEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeYAnalysisEnum.m (modified) (1 diff)
• m/enum/SurfaceSlopeYEnum.m (modified) (1 diff)
• m/enum/TemperatureEnum.m (modified) (1 diff)
• m/enum/TemperatureOldEnum.m (modified) (1 diff)
• m/enum/ThermalAnalysisEnum.m (modified) (1 diff)
• m/enum/ThermalConductivityEnum.m (modified) (1 diff)
• m/enum/ThermalExchangeVelocityEnum.m (modified) (1 diff)
• m/enum/ThermalSolutionEnum.m (modified) (1 diff)
• m/enum/ThicknessAbsMisfitEnum.m (modified) (1 diff)
• m/enum/ThicknessEnum.m (modified) (1 diff)
• m/enum/ThicknessObsEnum.m (modified) (1 diff)
• m/enum/TimeEnum.m (modified) (1 diff)
• m/enum/TolXEnum.m (modified) (1 diff)
• m/enum/Transient2DAnalysisEnum.m (modified) (1 diff)
• m/enum/Transient2DSolutionEnum.m (modified) (1 diff)
• m/enum/Transient3DAnalysisEnum.m (modified) (1 diff)
• m/enum/Transient3DSolutionEnum.m (modified) (1 diff)
• m/enum/TransientAnalysisEnum.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/VertAnalysisEnum.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)
• m/solutions/SolutionConfiguration.m (modified) (2 diffs)
• m/solutions/adjointdiagnostic_core.m (modified) (2 diffs)
• m/solutions/diagnostic_core.m (modified) (1 diff)
• m/solutions/objectivefunctionC.m (modified) (1 diff)

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

@@ -34 +34 @@
         DiagnosticVertAnalysisEnum,
         DiagnosticHutterAnalysisEnum,
-        DiagnosticStokesAnalysisEnum,
         HorizAnalysisEnum,
         HutterAnalysisEnum,

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

@@ -35 +35 @@
                 case DiagnosticVertAnalysisEnum : return "DiagnosticVertAnalysis";
                 case DiagnosticHutterAnalysisEnum : return "DiagnosticHutterAnalysis";
-                case DiagnosticStokesAnalysisEnum : return "DiagnosticStokesAnalysis";
                 case HorizAnalysisEnum : return "HorizAnalysis";
                 case HutterAnalysisEnum : return "HutterAnalysis";

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

@@ -33 +33 @@
         else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum;
         else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum;
-        else if (strcmp(name,"DiagnosticStokesAnalysis")==0) return DiagnosticStokesAnalysisEnum;
         else if (strcmp(name,"HorizAnalysis")==0) return HorizAnalysisEnum;
         else if (strcmp(name,"HutterAnalysis")==0) return HutterAnalysisEnum;

issm/trunk/src/c/Makefile.am

@@ -361 +361 @@
                                         ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \
                                         ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\
-                                        ./modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp\
-                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp \
-                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
-                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
                                         ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\
                                         ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp \
@@ -914 +910 @@
                                         ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \
                                         ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\
-                                        ./modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp\
-                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp \
-                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
-                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
                                         ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\
                                         ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp \

issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp

@@ -41 +41 @@
                         CreateLoadsDiagnosticVert(ploads,iomodel,iomodel_handle);
                         UpdateElementsDiagnosticVert(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
-                        break;
-        
-                case DiagnosticStokesAnalysisEnum:
-                        CreateNodesDiagnosticStokes(pnodes, iomodel,iomodel_handle);
-                        CreateConstraintsDiagnosticStokes(pconstraints,iomodel,iomodel_handle);
-                        CreateLoadsDiagnosticStokes(ploads,iomodel,iomodel_handle);
-                        UpdateElementsDiagnosticStokes(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
                         break;
         

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

@@ -29 +29 @@
         
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
-        if (!iomodel->ismacayealpattyn)goto cleanup_and_return;
+        if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return;
         
         /*Spcs: fetch data: */
@@ -36 +36 @@
         IoModelFetchData(&iomodel->gridonmacayeal,NULL,NULL,iomodel_handle,"gridonmacayeal");
         if(iomodel->dim==3)IoModelFetchData(&iomodel->gridonpattyn,NULL,NULL,iomodel_handle,"gridonpattyn");
+        if(iomodel->dim==3)IoModelFetchData(&iomodel->gridonstokes,NULL,NULL,iomodel_handle,"gridonstokes");
         IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
+        IoModelFetchData(&iomodel->surface,NULL,NULL,iomodel_handle,"surface");
+        IoModelFetchData(&iomodel->z,NULL,NULL,iomodel_handle,"z");
 
         /*Initialize counter: */
@@ -91 +94 @@
                                         count++;
                                 }
+                                if ((int)iomodel->spcvelocity[6*i+2] && ((int)iomodel->vertices_type[i]==StokesApproximationEnum ||  ((int)iomodel->vertices_type[i]==NoneApproximationEnum))){
+                                        constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,*(iomodel->spcvelocity+6*i+5)/iomodel->yts,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy
+                                        count++;
+                                }
+                                if ((int)iomodel->vertices_type[i]==NoneApproximationEnum){
+                                        constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,iomodel->g*iomodel->rho_ice*(iomodel->surface[i]-iomodel->z[i])/iomodel->stokesreconditioning,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy
+                                        count++;
+                                }
                         }
                 }
@@ -100 +111 @@
         xfree((void**)&iomodel->gridonmacayeal);
         xfree((void**)&iomodel->gridonpattyn);
+        xfree((void**)&iomodel->gridonstokes);
         xfree((void**)&iomodel->vertices_type);
-
-        /*penalty loads: */
-        IoModelFetchData(&iomodel->penalties,&iomodel->numpenalties,NULL,iomodel_handle,"penalties");
-        
-        /*Initilize counter*/
-        count=0;
-
-        /*Free data: */
-        xfree((void**)&iomodel->penalties);
+        xfree((void**)&iomodel->surface);
+        xfree((void**)&iomodel->z);
 
         cleanup_and_return:

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -17 +17 @@
         Icefront*   icefront = NULL;
         Riftfront*  riftfront= NULL;
+        Pengrid*    pengrid  = NULL;
 
         /*Intermediary*/
@@ -32 +33 @@
 
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
-        if (!iomodel->ismacayealpattyn)goto cleanup_and_return;
+        if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return;
         
         /*Create pressure loads as boundary conditions. Pay attention to the partitioning if we are running in parallel (the grids
@@ -86 +87 @@
         xfree((void**)&iomodel->bed);
 
+        /*create penalties for grids on the base of icesheet. We must have wb=ub*db/dx+vb*db/dy */
+        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
+        IoModelFetchData(&iomodel->gridonicesheet,NULL,NULL,iomodel_handle,"gridonicesheet");
+        IoModelFetchData(&iomodel->gridonstokes,NULL,NULL,iomodel_handle,"gridonstokes");
+        IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements");
+        CreateSingleNodeToElementConnectivity(iomodel);
+        
+        for (i=0;i<iomodel->numberofvertices;i++){
+                
+                if(iomodel->my_vertices[i]==1 && iomodel->singlenodetoelementconnectivity[i]!=0){
+
+                        if ((iomodel->gridonbed[i]) && (iomodel->gridonicesheet[i]) && (iomodel->gridonstokes[i])){
+                                
+                                loads->AddObject(new Pengrid(iomodel->loadcounter+count+1,i,iomodel,DiagnosticHorizAnalysisEnum));
+                                count++;
+                        }
+                } //if((iomodel->my_vertices[i]==1))
+        }
+
+        xfree((void**)&iomodel->gridonbed);
+        xfree((void**)&iomodel->gridonstokes);
+        xfree((void**)&iomodel->gridonicesheet);
+        xfree((void**)&iomodel->elements);
+        xfree((void**)&iomodel->singlenodetoelementconnectivity);
+
         /*Create Penpair for penalties: */
         IoModelFetchData(&iomodel->penalties,&iomodel->numpenalties,NULL,iomodel_handle,"penalties");

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

@@ -29 +29 @@
         
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
-        if (!iomodel->ismacayealpattyn)goto cleanup_and_return;
+        if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return;
 
         /*Continuous Galerkin partition of nodes: */
@@ -39 +39 @@
         IoModelFetchData(&iomodel->gridonhutter,NULL,NULL,iomodel_handle,"gridonhutter");
         IoModelFetchData(&iomodel->gridonmacayeal,NULL,NULL,iomodel_handle,"gridonmacayeal");
+        IoModelFetchData(&iomodel->gridonstokes,NULL,NULL,iomodel_handle,"gridonstokes");
         IoModelFetchData(&iomodel->gridonicesheet,NULL,NULL,iomodel_handle,"gridonicesheet");
         IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
@@ -57 +58 @@
         xfree((void**)&iomodel->gridonhutter);
         xfree((void**)&iomodel->gridonmacayeal);
+        xfree((void**)&iomodel->gridonstokes);
         xfree((void**)&iomodel->gridonicesheet);
         xfree((void**)&iomodel->gridoniceshelf);

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -21 +21 @@
 
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
-        if (!iomodel->ismacayealpattyn)goto cleanup_and_return;
+        if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return;
 
         /*Fetch data needed: */
@@ -42 +42 @@
                 IoModelFetchData(&iomodel->elementonsurface,NULL,NULL,iomodel_handle,"elementonsurface");
                 IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,"vz");
+                IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
+                IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
         }
         if(iomodel->control_analysis){
@@ -78 +80 @@
         xfree((void**)&iomodel->elementonsurface);
         xfree((void**)&iomodel->elementonwater);
+        xfree((void**)&iomodel->accumulation_rate);
+        xfree((void**)&iomodel->melting_rate);
         xfree((void**)&iomodel->vx);
         xfree((void**)&iomodel->vy);

issm/trunk/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp

@@ -30 +30 @@
                         numdofs=4;
                 }
+                else if (vertices_type[0]==NoneApproximationEnum){
+                        numdofs=4;
+                }
                 else if (vertices_type[0]==MacAyealPattynApproximationEnum){
                         numdofs=4;
@@ -42 +45 @@
         else if (analysis_type==DiagnosticVertAnalysisEnum){
                 numdofs=1;
-        }
-        else if (analysis_type==DiagnosticStokesAnalysisEnum){
-                numdofs=4;
         }
         else if (analysis_type==DiagnosticHutterAnalysisEnum){

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -41 +41 @@
 void  CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsDiagnosticHutter(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
-
-/*diagnostic stokes*/
-void    CreateNodesDiagnosticStokes(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsDiagnosticStokes(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
-void  CreateLoadsDiagnosticStokes(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
-void    UpdateElementsDiagnosticStokes(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
 
 /*bed slope*/

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

@@ -359 +359 @@
         /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */
         if (analysis_type==DiagnosticHorizAnalysisEnum){
-                InputUpdateFromSolutionDiagnosticHoriz( solution);
+                int approximation;
+                inputs->GetParameterValue(&approximation,ApproximationEnum);
+                if(approximation==StokesApproximationEnum || approximation==NoneApproximationEnum){
+                        InputUpdateFromSolutionDiagnosticStokes( solution);
+                }
+                else{
+                        InputUpdateFromSolutionDiagnosticHoriz( solution);
+                }
         }
         else if (analysis_type==DiagnosticHutterAnalysisEnum){
@@ -366 +373 @@
         else if (analysis_type==DiagnosticVertAnalysisEnum){
                 InputUpdateFromSolutionDiagnosticVert( solution);
-        }
-        else if (analysis_type==DiagnosticStokesAnalysisEnum){
-                InputUpdateFromSolutionDiagnosticStokes( solution);
         }
         else if (analysis_type==AdjointHorizAnalysisEnum){
@@ -514 +518 @@
         /*flags: */
         bool onbed;
+        int  approximation;
         Input* pressure_input=NULL;
         Input* vx_input=NULL;
@@ -524 +529 @@
         /*retrive parameters: */
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
 
         /*Check analysis_types*/
-        if (analysis_type!=DiagnosticStokesAnalysisEnum) ISSMERROR("Not supported yet!");
+        if (analysis_type!=DiagnosticHorizAnalysisEnum) ISSMERROR("Not supported yet!");
+        if (approximation!=StokesApproximationEnum) ISSMERROR("Not supported yet!");
 
         /*recover some inputs: */
@@ -780 +787 @@
                         return;
                 }
+                else if(approximation==NoneApproximationEnum){
+                        return;
+                }
                 else if(approximation==MacAyealPattynApproximationEnum){
                         CreateKMatrixDiagnosticMacAyeal( Kgg);
@@ -805 +815 @@
                 CreateKMatrixDiagnosticVert( Kgg);
         }
-        else if (analysis_type==DiagnosticStokesAnalysisEnum){
-                CreateKMatrixDiagnosticStokes( Kgg);
-        }
         else if (analysis_type==AdjointStokesAnalysisEnum){
                 /*Same as diagnostic*/
@@ -858 +865 @@
                         return;
                 }
+                else if(approximation==NoneApproximationEnum){
+                        return;
+                }
                 else if(approximation==StokesApproximationEnum){
                         CreatePVectorDiagnosticStokes( pg);
@@ -884 +894 @@
                 CreatePVectorDiagnosticVert( pg);
         }
-        else if (analysis_type==DiagnosticStokesAnalysisEnum){
-                CreatePVectorDiagnosticStokes( pg);
-        }
         else if (analysis_type==AdjointStokesAnalysisEnum){
                 CreatePVectorAdjointStokes( pg);
@@ -981 +988 @@
         /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */
         if (analysis_type==DiagnosticHorizAnalysisEnum){
-                GetSolutionFromInputsDiagnosticHoriz(solution);
+                int approximation;
+                inputs->GetParameterValue(&approximation,ApproximationEnum);
+                if(approximation==StokesApproximationEnum || approximation==NoneApproximationEnum){
+                        GetSolutionFromInputsDiagnosticStokes(solution);
+                }
+                else{
+                        GetSolutionFromInputsDiagnosticHoriz(solution);
+                }
         }
         else if(analysis_type==DiagnosticHutterAnalysisEnum){
@@ -988 +1002 @@
         else if(analysis_type==DiagnosticVertAnalysisEnum){
                 GetSolutionFromInputsDiagnosticVert(solution);
-        }
-        else if(analysis_type==DiagnosticStokesAnalysisEnum){
-                GetSolutionFromInputsDiagnosticStokes(solution);
         }
         else if(analysis_type==ThermalAnalysisEnum){
@@ -1297 +1308 @@
                 input=this->inputs->GetInput(enum_type);
         }
-        if (!input) ISSMERROR("Input %s not found in tria->inputs",EnumToString(enum_type));
+        if (!input) ISSMERROR("Input %s not found in penta->inputs",EnumToString(enum_type));
 
         /*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result 
@@ -2157 +2168 @@
         switch(analysis_type){
 
-                case DiagnosticHorizAnalysisEnum: case DiagnosticVertAnalysisEnum: case DiagnosticStokesAnalysisEnum:
+                case DiagnosticHorizAnalysisEnum: case DiagnosticVertAnalysisEnum: 
 
                         /*default vx,vy and vz: either observation or 0 */

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

@@ -2938 +2938 @@
         switch(analysis_type){
 
-                case DiagnosticHorizAnalysisEnum: case DiagnosticVertAnalysisEnum: case DiagnosticStokesAnalysisEnum:
+                case DiagnosticHorizAnalysisEnum: case DiagnosticVertAnalysisEnum:
 
                         /*default vx,vy and vz: either observation or 0 */

issm/trunk/src/c/objects/Loads/Icefront.cpp

@@ -306 +306 @@
                 }
                 else ISSMERROR("Icefront type %s not supported yet",EnumToString(type));
-        }
-        else if (analysis_type==DiagnosticStokesAnalysisEnum){
-                CreatePVectorDiagnosticStokes( pg);
         }
         else if (analysis_type==AdjointHorizAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){

issm/trunk/src/c/objects/Loads/Pengrid.cpp

@@ -285 +285 @@
         this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
 
-        if (analysis_type==DiagnosticStokesAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){
+        if (analysis_type==DiagnosticHorizAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){
                 PenaltyCreateKMatrixDiagnosticStokes( Kgg,kmax);
         }
@@ -314 +314 @@
                 PenaltyCreatePVectorMelting( pg,kmax);
         }
-        else if (analysis_type==DiagnosticStokesAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){
+        else if (analysis_type==DiagnosticHorizAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){
 
                 /*No loads applied, do nothing: */
@@ -459 +459 @@
         this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
 
-        if (analysis_type==DiagnosticStokesAnalysisEnum){
+        if (analysis_type==DiagnosticHorizAnalysisEnum){
                 /*No penalty to check*/
                 return;

issm/trunk/src/c/objects/Loads/Penpair.cpp

@@ -237 +237 @@
                 }
         }
-        else if (analysis_type==DiagnosticStokesAnalysisEnum){
-                PenaltyCreateKMatrixDiagnosticStokes(Kgg,kmax);
-        }
         else{
                 ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumToString(analysis_type));
@@ -354 +351 @@
         Ke[5][5]=kmax*pow((double)10.0,penalty_offset);
         
-        Ke[2][2]=kmax*pow((double)10.0,penalty_offset);
-        Ke[2][6]=-kmax*pow((double)10.0,penalty_offset);
-        Ke[6][2]=-kmax*pow((double)10.0,penalty_offset);
-        Ke[6][6]=kmax*pow((double)10.0,penalty_offset);
-
-        Ke[3][3]=kmax*pow((double)10.0,penalty_offset);
-        Ke[3][7]=-kmax*pow((double)10.0,penalty_offset);
-        Ke[7][3]=-kmax*pow((double)10.0,penalty_offset);
-        Ke[7][7]=kmax*pow((double)10.0,penalty_offset);
+//      Ke[2][2]=kmax*pow((double)10.0,penalty_offset);
+//      Ke[2][6]=-kmax*pow((double)10.0,penalty_offset);
+//      Ke[6][2]=-kmax*pow((double)10.0,penalty_offset);
+//      Ke[6][6]=kmax*pow((double)10.0,penalty_offset);
+
+//      Ke[3][3]=kmax*pow((double)10.0,penalty_offset);
+//      Ke[3][7]=-kmax*pow((double)10.0,penalty_offset);
+//      Ke[7][3]=-kmax*pow((double)10.0,penalty_offset);
+//      Ke[7][7]=kmax*pow((double)10.0,penalty_offset);
 
         /*Add Ke to global matrix Kgg: */

issm/trunk/src/c/solutions/SolutionConfiguration.cpp

@@ -33 +33 @@
         
                 case DiagnosticSolutionEnum:
-                        numanalyses=6;
+                        numanalyses=5;
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=DiagnosticHorizAnalysisEnum;
                         analyses[1]=DiagnosticVertAnalysisEnum;
-                        analyses[2]=DiagnosticStokesAnalysisEnum;
-                        analyses[3]=DiagnosticHutterAnalysisEnum;
-                        analyses[4]=SurfaceSlopeAnalysisEnum;
-                        analyses[5]=BedSlopeAnalysisEnum;
+                        analyses[2]=DiagnosticHutterAnalysisEnum;
+                        analyses[3]=SurfaceSlopeAnalysisEnum;
+                        analyses[4]=BedSlopeAnalysisEnum;
                         break;
 
                 case SteadystateSolutionEnum:
-                        numanalyses=8;
+                        numanalyses=7;
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=DiagnosticHorizAnalysisEnum;
                         analyses[1]=DiagnosticVertAnalysisEnum;
-                        analyses[2]=DiagnosticStokesAnalysisEnum;
-                        analyses[3]=DiagnosticHutterAnalysisEnum;
-                        analyses[4]=SurfaceSlopeAnalysisEnum;
-                        analyses[5]=BedSlopeAnalysisEnum;
-                        analyses[6]=ThermalAnalysisEnum;
-                        analyses[7]=MeltingAnalysisEnum;
+                        analyses[2]=DiagnosticHutterAnalysisEnum;
+                        analyses[3]=SurfaceSlopeAnalysisEnum;
+                        analyses[4]=BedSlopeAnalysisEnum;
+                        analyses[5]=ThermalAnalysisEnum;
+                        analyses[6]=MeltingAnalysisEnum;
                         break;
 
@@ -94 +92 @@
 
                 case Transient2DSolutionEnum:
-                        numanalyses=7;
+                        numanalyses=6;
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=DiagnosticHorizAnalysisEnum;
                         analyses[1]=DiagnosticVertAnalysisEnum;
-                        analyses[2]=DiagnosticStokesAnalysisEnum;
-                        analyses[3]=DiagnosticHutterAnalysisEnum;
-                        analyses[4]=SurfaceSlopeAnalysisEnum;
-                        analyses[5]=BedSlopeAnalysisEnum;
-                        analyses[6]=PrognosticAnalysisEnum;
+                        analyses[2]=DiagnosticHutterAnalysisEnum;
+                        analyses[3]=SurfaceSlopeAnalysisEnum;
+                        analyses[4]=BedSlopeAnalysisEnum;
+                        analyses[5]=PrognosticAnalysisEnum;
                         break;
                 
                 case Transient3DSolutionEnum:
-                        numanalyses=9;
+                        numanalyses=8;
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=DiagnosticHorizAnalysisEnum;
                         analyses[1]=DiagnosticVertAnalysisEnum;
-                        analyses[2]=DiagnosticStokesAnalysisEnum;
-                        analyses[3]=DiagnosticHutterAnalysisEnum;
-                        analyses[4]=SurfaceSlopeAnalysisEnum;
-                        analyses[5]=BedSlopeAnalysisEnum;
-                        analyses[6]=PrognosticAnalysisEnum;
-                        analyses[7]=ThermalAnalysisEnum;
-                        analyses[8]=MeltingAnalysisEnum;
+                        analyses[2]=DiagnosticHutterAnalysisEnum;
+                        analyses[3]=SurfaceSlopeAnalysisEnum;
+                        analyses[4]=BedSlopeAnalysisEnum;
+                        analyses[5]=PrognosticAnalysisEnum;
+                        analyses[6]=ThermalAnalysisEnum;
+                        analyses[7]=MeltingAnalysisEnum;
                         break;
 

issm/trunk/src/c/solutions/adjointdiagnostic_core.cpp

@@ -29 +29 @@
         /*Compute velocities*/
         _printf_("%s\n","      computing velocities");
-        if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum);
-        else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
+        femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
         solver_diagnostic_nonlinear(femmodel,conserve_loads); 
 
@@ -38 +37 @@
         /*Compute adjoint*/
         _printf_("%s\n","      computing adjoint");
-        if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum,AdjointStokesAnalysisEnum);
+        if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointStokesAnalysisEnum);
         else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum);
         solver_adjoint_linear(femmodel);

issm/trunk/src/c/solutions/diagnostic_core.cpp

@@ -81 +81 @@
 
                 if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");
-                femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum);
+                femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
                 solver_diagnostic_nonlinear(femmodel,conserve_loads);
         }

issm/trunk/src/c/solutions/objectivefunctionC.cpp

@@ -53 +53 @@
         /*set analysis type to compute velocity: */
         if (solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum){
-                if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum);
-                else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
+                femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
         }
         else if (solution_type==BalancedthicknessSolutionEnum){

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

@@ -9 +9 @@
 %      macro=AbsoluteEnum()
 
-macro=248;
+macro=247;

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

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

issm/trunk/src/m/enum/AdjointBalancedthicknessAnalysisEnum.m

@@ -9 +9 @@
 %      macro=AdjointBalancedthicknessAnalysisEnum()
 
-macro=27;
+macro=26;

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

@@ -9 +9 @@
 %      macro=AdjointEnum()
 
-macro=263;
+macro=262;

issm/trunk/src/m/enum/AdjointHorizAnalysisEnum.m

@@ -9 +9 @@
 %      macro=AdjointHorizAnalysisEnum()
 
-macro=25;
+macro=24;

issm/trunk/src/m/enum/AdjointSolutionEnum.m

@@ -9 +9 @@
 %      macro=AdjointSolutionEnum()
 
-macro=24;
+macro=23;

issm/trunk/src/m/enum/AdjointStokesAnalysisEnum.m

@@ -9 +9 @@
 %      macro=AdjointStokesAnalysisEnum()
 
-macro=26;
+macro=25;

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

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/ApproximationEnum.m

@@ -9 +9 @@
 %      macro=ApproximationEnum()
 
-macro=59;
+macro=58;

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

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

issm/trunk/src/m/enum/BalancedthicknessAnalysisEnum.m

@@ -9 +9 @@
 %      macro=BalancedthicknessAnalysisEnum()
 
-macro=48;
+macro=47;

issm/trunk/src/m/enum/BalancedthicknessSolutionEnum.m

@@ -9 +9 @@
 %      macro=BalancedthicknessSolutionEnum()
 
-macro=47;
+macro=46;

issm/trunk/src/m/enum/BalancedvelocitiesAnalysisEnum.m

@@ -9 +9 @@
 %      macro=BalancedvelocitiesAnalysisEnum()
 
-macro=50;
+macro=49;

issm/trunk/src/m/enum/BalancedvelocitiesSolutionEnum.m

@@ -9 +9 @@
 %      macro=BalancedvelocitiesSolutionEnum()
 
-macro=49;
+macro=48;

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

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

issm/trunk/src/m/enum/BedSlopeAnalysisEnum.m

@@ -9 +9 @@
 %      macro=BedSlopeAnalysisEnum()
 
-macro=40;
+macro=39;

issm/trunk/src/m/enum/BedSlopeSolutionEnum.m

@@ -9 +9 @@
 %      macro=BedSlopeSolutionEnum()
 
-macro=39;
+macro=38;

issm/trunk/src/m/enum/BedSlopeXAnalysisEnum.m

@@ -9 +9 @@
 %      macro=BedSlopeXAnalysisEnum()
 
-macro=43;
+macro=42;

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

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

issm/trunk/src/m/enum/BedSlopeYAnalysisEnum.m

@@ -9 +9 @@
 %      macro=BedSlopeYAnalysisEnum()
 
-macro=44;
+macro=43;

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

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

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

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=258;
+macro=257;

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

@@ -9 +9 @@
 %      macro=BoolExternalResultEnum()
 
-macro=222;
+macro=221;

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=98;
+macro=97;

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

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

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

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=259;
+macro=258;

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

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=260;
+macro=259;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=261;
+macro=260;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=262;
+macro=261;

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

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

issm/trunk/src/m/enum/CmResponseEnum.m

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

issm/trunk/src/m/enum/CmResponsesEnum.m

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

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

@@ -9 +9 @@
 %      macro=ColinearEnum()
 
-macro=256;
+macro=255;

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

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=266;
+macro=265;

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

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

issm/trunk/src/m/enum/ControlAnalysisEnum.m

@@ -9 +9 @@
 %      macro=ControlAnalysisEnum()
 
-macro=28;
+macro=27;

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

@@ -9 +9 @@
 %      macro=ControlParameterEnum()
 
-macro=267;
+macro=266;

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

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=268;
+macro=267;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=269;
+macro=268;

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

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

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

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=270;
+macro=269;

issm/trunk/src/m/enum/DofIndexingEnum.m

@@ -9 +9 @@
 %      macro=DofIndexingEnum()
 
-macro=70;
+macro=69;

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

@@ -9 +9 @@
 %      macro=DoubleElementResultEnum()
 
-macro=219;
+macro=218;

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

@@ -9 +9 @@
 %      macro=DoubleExternalResultEnum()
 
-macro=223;
+macro=222;

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=100;
+macro=99;

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

@@ -9 +9 @@
 %      macro=DoubleMatExternalResultEnum()
 
-macro=225;
+macro=224;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=DoubleVecExternalResultEnum()
 
-macro=224;
+macro=223;

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

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

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

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/ElementEnum.m

@@ -9 +9 @@
 %      macro=ElementEnum()
 
-macro=69;
+macro=68;

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/ElementPropertiesEnum.m

@@ -9 +9 @@
 %      macro=ElementPropertiesEnum()
 
-macro=71;
+macro=70;

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

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

issm/trunk/src/m/enum/EnumToString.m

@@ -30 +30 @@
 case DiagnosticVertAnalysisEnum(), string='DiagnosticVertAnalysis'; return
 case DiagnosticHutterAnalysisEnum(), string='DiagnosticHutterAnalysis'; return
-case DiagnosticStokesAnalysisEnum(), string='DiagnosticStokesAnalysis'; return
 case HorizAnalysisEnum(), string='HorizAnalysis'; return
 case HutterAnalysisEnum(), string='HutterAnalysis'; return

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

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=271;
+macro=270;

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

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=272;
+macro=271;

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

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=273;
+macro=272;

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

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=274;
+macro=273;

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

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

issm/trunk/src/m/enum/ExtToIuEnum.m

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/GradientAnalysisEnum.m

@@ -9 +9 @@
 %      macro=GradientAnalysisEnum()
 
-macro=29;
+macro=28;

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

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=264;
+macro=263;

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

@@ -9 +9 @@
 %      macro=GravityEnum()
 
-macro=251;
+macro=250;

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

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=275;
+macro=274;

issm/trunk/src/m/enum/HookEnum.m

@@ -9 +9 @@
 %      macro=HookEnum()
 
-macro=67;
+macro=66;

issm/trunk/src/m/enum/HorizAnalysisEnum.m

@@ -9 +9 @@
 %      macro=HorizAnalysisEnum()
 
-macro=20;
+macro=19;

issm/trunk/src/m/enum/HutterAnalysisEnum.m

@@ -9 +9 @@
 %      macro=HutterAnalysisEnum()
 
-macro=21;
+macro=20;

issm/trunk/src/m/enum/HutterApproximationEnum.m

@@ -9 +9 @@
 %      macro=HutterApproximationEnum()
 
-macro=60;
+macro=59;

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/IndexEnum.m

@@ -9 +9 @@
 %      macro=IndexEnum()
 
-macro=307;
+macro=306;

issm/trunk/src/m/enum/IndexedEnum.m

@@ -9 +9 @@
 %      macro=IndexedEnum()
 
-macro=305;
+macro=304;

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

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

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

@@ -9 +9 @@
 %      macro=IntExternalResultEnum()
 
-macro=226;
+macro=225;

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=103;
+macro=102;

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

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

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

@@ -9 +9 @@
 %      macro=IntersectEnum()
 
-macro=255;
+macro=254;

issm/trunk/src/m/enum/InverseAnalysisEnum.m

@@ -9 +9 @@
 %      macro=InverseAnalysisEnum()
 
-macro=30;
+macro=29;

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

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=276;
+macro=275;

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

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=277;
+macro=276;

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

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=278;
+macro=277;

issm/trunk/src/m/enum/IuToExtEnum.m

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

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

@@ -9 +9 @@
 %      macro=JEnum()
 
-macro=229;
+macro=228;

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

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

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

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=279;
+macro=278;

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=280;
+macro=279;

issm/trunk/src/m/enum/MacAyealApproximationEnum.m

@@ -9 +9 @@
 %      macro=MacAyealApproximationEnum()
 
-macro=61;
+macro=60;

issm/trunk/src/m/enum/MacAyealIceFrontEnum.m

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

issm/trunk/src/m/enum/MacAyealPattynApproximationEnum.m

@@ -9 +9 @@
 %      macro=MacAyealPattynApproximationEnum()
 
-macro=62;
+macro=61;

issm/trunk/src/m/enum/MassFluxEnum.m

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

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

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

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

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

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

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

issm/trunk/src/m/enum/MaxAbsVxEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVxEnum()
 
-macro=239;
+macro=238;

issm/trunk/src/m/enum/MaxAbsVyEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVyEnum()
 
-macro=242;
+macro=241;

issm/trunk/src/m/enum/MaxAbsVzEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVzEnum()
 
-macro=245;
+macro=244;

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

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=281;
+macro=280;

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

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=282;
+macro=281;

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

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

issm/trunk/src/m/enum/MaxVelEnum.m

@@ -9 +9 @@
 %      macro=MaxVelEnum()
 
-macro=236;
+macro=235;

issm/trunk/src/m/enum/MaxVxEnum.m

@@ -9 +9 @@
 %      macro=MaxVxEnum()
 
-macro=238;
+macro=237;

issm/trunk/src/m/enum/MaxVyEnum.m

@@ -9 +9 @@
 %      macro=MaxVyEnum()
 
-macro=241;
+macro=240;

issm/trunk/src/m/enum/MaxVzEnum.m

@@ -9 +9 @@
 %      macro=MaxVzEnum()
 
-macro=244;
+macro=243;

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

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

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

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

issm/trunk/src/m/enum/MeltingAnalysisEnum.m

@@ -9 +9 @@
 %      macro=MeltingAnalysisEnum()
 
-macro=53;
+macro=52;

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

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

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

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=283;
+macro=282;

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

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

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

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=284;
+macro=283;

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

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=285;
+macro=284;

issm/trunk/src/m/enum/MinVelEnum.m

@@ -9 +9 @@
 %      macro=MinVelEnum()
 
-macro=235;
+macro=234;

issm/trunk/src/m/enum/MinVxEnum.m

@@ -9 +9 @@
 %      macro=MinVxEnum()
 
-macro=237;
+macro=236;

issm/trunk/src/m/enum/MinVyEnum.m

@@ -9 +9 @@
 %      macro=MinVyEnum()
 
-macro=240;
+macro=239;

issm/trunk/src/m/enum/MinVzEnum.m

@@ -9 +9 @@
 %      macro=MinVzEnum()
 
-macro=243;
+macro=242;

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

@@ -9 +9 @@
 %      macro=MiniEnum()
 
-macro=218;
+macro=217;

issm/trunk/src/m/enum/MisfitEnum.m

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

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

@@ -9 +9 @@
 %      macro=MixedLayerCapacityEnum()
 
-macro=253;
+macro=252;

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

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=286;
+macro=285;

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

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=287;
+macro=286;

issm/trunk/src/m/enum/NodalEnum.m

@@ -9 +9 @@
 %      macro=NodalEnum()
 
-macro=309;
+macro=308;

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=170;
+macro=169;

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

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

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

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

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

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

issm/trunk/src/m/enum/NodePropertiesEnum.m

@@ -9 +9 @@
 %      macro=NodePropertiesEnum()
 
-macro=72;
+macro=71;

issm/trunk/src/m/enum/NoneAnalysisEnum.m

@@ -9 +9 @@
 %      macro=NoneAnalysisEnum()
 
-macro=58;
+macro=57;

issm/trunk/src/m/enum/NoneApproximationEnum.m

@@ -9 +9 @@
 %      macro=NoneApproximationEnum()
 
-macro=63;
+macro=62;

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

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=288;
+macro=287;

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

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=289;
+macro=288;

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

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

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

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=290;
+macro=289;

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

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=291;
+macro=290;

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

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=292;
+macro=291;

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

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

issm/trunk/src/m/enum/ObjectEnum.m

@@ -9 +9 @@
 %      macro=ObjectEnum()
 
-macro=66;
+macro=65;

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

@@ -9 +9 @@
 %      macro=OldGradientEnum()
 
-macro=265;
+macro=264;

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

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=293;
+macro=292;

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

@@ -9 +9 @@
 %      macro=OutputFilePointerEnum()
 
-macro=294;
+macro=293;

issm/trunk/src/m/enum/OutputFrequencyEnum.m

@@ -9 +9 @@
 %      macro=OutputFrequencyEnum()
 
-macro=234;
+macro=233;

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

@@ -9 +9 @@
 %      macro=P0Enum()
 
-macro=215;
+macro=214;

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

@@ -9 +9 @@
 %      macro=P1DGEnum()
 
-macro=217;
+macro=216;

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

@@ -9 +9 @@
 %      macro=P1Enum()
 
-macro=216;
+macro=215;

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

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

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

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=295;
+macro=294;

issm/trunk/src/m/enum/ParametersAnalysisEnum.m

@@ -9 +9 @@
 %      macro=ParametersAnalysisEnum()
 
-macro=55;
+macro=54;

issm/trunk/src/m/enum/ParametersSolutionEnum.m

@@ -9 +9 @@
 %      macro=ParametersSolutionEnum()
 
-macro=54;
+macro=53;

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

@@ -9 +9 @@
 %      macro=PatchEnum()
 
-macro=230;
+macro=229;

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

@@ -9 +9 @@
 %      macro=PatchNodesEnum()
 
-macro=232;
+macro=231;

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

@@ -9 +9 @@
 %      macro=PatchVerticesEnum()
 
-macro=231;
+macro=230;

issm/trunk/src/m/enum/PattynApproximationEnum.m

@@ -9 +9 @@
 %      macro=PattynApproximationEnum()
 
-macro=64;
+macro=63;

issm/trunk/src/m/enum/PattynIceFrontEnum.m

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

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

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=296;
+macro=295;

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

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

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/PentaEnum.m

@@ -9 +9 @@
 %      macro=PentaEnum()
 
-macro=73;
+macro=72;

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

@@ -9 +9 @@
 %      macro=PentaVertexElementResultEnum()
 
-macro=221;
+macro=220;

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=105;
+macro=104;

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

@@ -9 +9 @@
 %      macro=PetscVecExternalResultEnum()
 
-macro=227;
+macro=226;

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/PrognosticAnalysisEnum.m

@@ -9 +9 @@
 %      macro=PrognosticAnalysisEnum()
 
-macro=52;
+macro=51;

issm/trunk/src/m/enum/PrognosticSolutionEnum.m

@@ -9 +9 @@
 %      macro=PrognosticSolutionEnum()
 
-macro=51;
+macro=50;

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

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=297;
+macro=296;

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

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=298;
+macro=297;

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

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=299;
+macro=298;

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

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=300;
+macro=299;

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

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=301;
+macro=300;

issm/trunk/src/m/enum/QmuNumberOfResponsesEnum.m

@@ -9 +9 @@
 %      macro=QmuNumberOfResponsesEnum()
 
-macro=304;
+macro=303;

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

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=302;
+macro=301;

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

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=303;
+macro=302;

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

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

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

@@ -9 +9 @@
 %      macro=QmuVxEnum()
 
-macro=203;
+macro=202;

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

@@ -9 +9 @@
 %      macro=QmuVyEnum()
 
-macro=208;
+macro=207;

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

@@ -9 +9 @@
 %      macro=QmuVzEnum()
 
-macro=213;
+macro=212;

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

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

issm/trunk/src/m/enum/RegularEnum.m

@@ -9 +9 @@
 %      macro=RegularEnum()
 
-macro=306;
+macro=305;

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

@@ -9 +9 @@
 %      macro=RelativeEnum()
 
-macro=246;
+macro=245;

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

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

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

@@ -9 +9 @@
 %      macro=ResidualEnum()
 
-macro=247;
+macro=246;

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

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=310;
+macro=309;

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

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

issm/trunk/src/m/enum/RheologyBbarEnum.m

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

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

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

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

@@ -9 +9 @@
 %      macro=RhoIceEnum()
 
-macro=249;
+macro=248;

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

@@ -9 +9 @@
 %      macro=RhoWaterEnum()
 
-macro=250;
+macro=249;

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

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

issm/trunk/src/m/enum/ScaledEnum.m

@@ -9 +9 @@
 %      macro=ScaledEnum()
 
-macro=308;
+macro=307;

issm/trunk/src/m/enum/SegmentEnum.m

@@ -9 +9 @@
 %      macro=SegmentEnum()
 
-macro=68;
+macro=67;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=SeparateEnum()
 
-macro=257;
+macro=256;

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

@@ -9 +9 @@
 %      macro=SolverStringEnum()
 
-macro=311;
+macro=310;

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

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=312;
+macro=311;

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

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

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

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

issm/trunk/src/m/enum/SteadyAnalysisEnum.m

@@ -9 +9 @@
 %      macro=SteadyAnalysisEnum()
 
-macro=37;
+macro=36;

issm/trunk/src/m/enum/SteadystateAnalysisEnum.m

@@ -9 +9 @@
 %      macro=SteadystateAnalysisEnum()
 
-macro=57;
+macro=56;

issm/trunk/src/m/enum/SteadystateSolutionEnum.m

@@ -9 +9 @@
 %      macro=SteadystateSolutionEnum()
 
-macro=56;
+macro=55;

issm/trunk/src/m/enum/StokesAnalysisEnum.m

@@ -9 +9 @@
 %      macro=StokesAnalysisEnum()
 
-macro=22;
+macro=21;

issm/trunk/src/m/enum/StokesApproximationEnum.m

@@ -9 +9 @@
 %      macro=StokesApproximationEnum()
 
-macro=65;
+macro=64;

issm/trunk/src/m/enum/StokesIceFrontEnum.m

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=StringExternalResultEnum()
 
-macro=228;
+macro=227;

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

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

issm/trunk/src/m/enum/StringToEnum.m

@@ -28 +28 @@
                         elseif (strcmpi(name,'DiagnosticVertAnalysis')), enum=DiagnosticVertAnalysisEnum(); return
                         elseif (strcmpi(name,'DiagnosticHutterAnalysis')), enum=DiagnosticHutterAnalysisEnum(); return
-                        elseif (strcmpi(name,'DiagnosticStokesAnalysis')), enum=DiagnosticStokesAnalysisEnum(); return
                         elseif (strcmpi(name,'HorizAnalysis')), enum=HorizAnalysisEnum(); return
                         elseif (strcmpi(name,'HutterAnalysis')), enum=HutterAnalysisEnum(); return

issm/trunk/src/m/enum/SurfaceAbsVelMisfitEnum.m

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

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

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

issm/trunk/src/m/enum/SurfaceAverageVelMisfitEnum.m

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

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

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

issm/trunk/src/m/enum/SurfaceLogVelMisfitEnum.m

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

issm/trunk/src/m/enum/SurfaceLogVxVyMisfitEnum.m

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

issm/trunk/src/m/enum/SurfaceRelVelMisfitEnum.m

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

issm/trunk/src/m/enum/SurfaceSlopeAnalysisEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeAnalysisEnum()
 
-macro=42;
+macro=41;

issm/trunk/src/m/enum/SurfaceSlopeSolutionEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeSolutionEnum()
 
-macro=41;
+macro=40;

issm/trunk/src/m/enum/SurfaceSlopeXAnalysisEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeXAnalysisEnum()
 
-macro=45;
+macro=44;

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

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

issm/trunk/src/m/enum/SurfaceSlopeYAnalysisEnum.m

@@ -9 +9 @@
 %      macro=SurfaceSlopeYAnalysisEnum()
 
-macro=46;
+macro=45;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=TemperatureOldEnum()
 
-macro=192;
+macro=191;

issm/trunk/src/m/enum/ThermalAnalysisEnum.m

@@ -9 +9 @@
 %      macro=ThermalAnalysisEnum()
 
-macro=32;
+macro=31;

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

@@ -9 +9 @@
 %      macro=ThermalConductivityEnum()
 
-macro=252;
+macro=251;

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

@@ -9 +9 @@
 %      macro=ThermalExchangeVelocityEnum()
 
-macro=254;
+macro=253;

issm/trunk/src/m/enum/ThermalSolutionEnum.m

@@ -9 +9 @@
 %      macro=ThermalSolutionEnum()
 
-macro=31;
+macro=30;

issm/trunk/src/m/enum/ThicknessAbsMisfitEnum.m

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

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

@@ -9 +9 @@
 %      macro=ThicknessEnum()
 
-macro=193;
+macro=192;

issm/trunk/src/m/enum/ThicknessObsEnum.m

@@ -9 +9 @@
 %      macro=ThicknessObsEnum()
 
-macro=194;
+macro=193;

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

@@ -9 +9 @@
 %      macro=TimeEnum()
 
-macro=233;
+macro=232;

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

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=313;
+macro=312;

issm/trunk/src/m/enum/Transient2DAnalysisEnum.m

@@ -9 +9 @@
 %      macro=Transient2DAnalysisEnum()
 
-macro=34;
+macro=33;

issm/trunk/src/m/enum/Transient2DSolutionEnum.m

@@ -9 +9 @@
 %      macro=Transient2DSolutionEnum()
 
-macro=33;
+macro=32;

issm/trunk/src/m/enum/Transient3DAnalysisEnum.m

@@ -9 +9 @@
 %      macro=Transient3DAnalysisEnum()
 
-macro=36;
+macro=35;

issm/trunk/src/m/enum/Transient3DSolutionEnum.m

@@ -9 +9 @@
 %      macro=Transient3DSolutionEnum()
 
-macro=35;
+macro=34;

issm/trunk/src/m/enum/TransientAnalysisEnum.m

@@ -9 +9 @@
 %      macro=TransientAnalysisEnum()
 
-macro=38;
+macro=37;

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=220;
+macro=219;

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

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

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

@@ -9 +9 @@
 %      macro=TypeEnum()
 
-macro=195;
+macro=194;

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

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=314;
+macro=313;

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

@@ -9 +9 @@
 %      macro=VelEnum()
 
-macro=196;
+macro=195;

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

@@ -9 +9 @@
 %      macro=VelObsEnum()
 
-macro=197;
+macro=196;

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

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=315;
+macro=314;

issm/trunk/src/m/enum/VertAnalysisEnum.m

@@ -9 +9 @@
 %      macro=VertAnalysisEnum()
 
-macro=23;
+macro=22;

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=198;
+macro=197;

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

@@ -9 +9 @@
 %      macro=VxAverageEnum()
 
-macro=199;
+macro=198;

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

@@ -9 +9 @@
 %      macro=VxEnum()
 
-macro=200;
+macro=199;

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

@@ -9 +9 @@
 %      macro=VxObsEnum()
 
-macro=201;
+macro=200;

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

@@ -9 +9 @@
 %      macro=VxOldEnum()
 
-macro=202;
+macro=201;

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

@@ -9 +9 @@
 %      macro=VyAverageEnum()
 
-macro=204;
+macro=203;

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

@@ -9 +9 @@
 %      macro=VyEnum()
 
-macro=205;
+macro=204;

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

@@ -9 +9 @@
 %      macro=VyObsEnum()
 
-macro=206;
+macro=205;

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

@@ -9 +9 @@
 %      macro=VyOldEnum()
 
-macro=207;
+macro=206;

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

@@ -9 +9 @@
 %      macro=VzAverageEnum()
 
-macro=209;
+macro=208;

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

@@ -9 +9 @@
 %      macro=VzEnum()
 
-macro=210;
+macro=209;

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

@@ -9 +9 @@
 %      macro=VzObsEnum()
 
-macro=211;
+macro=210;

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

@@ -9 +9 @@
 %      macro=VzOldEnum()
 
-macro=212;
+macro=211;

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

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=316;
+macro=315;

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

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

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

@@ -9 +9 @@
 %      macro=WeightsEnum()
 
-macro=214;
+macro=213;

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

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=317;
+macro=316;

issm/trunk/src/m/solutions/SolutionConfiguration.m

@@ -11 +11 @@
 
         case DiagnosticSolutionEnum,
-                numanalyses=6;
-                %analyses=[DiagnosticHorizAnalysisEnum];
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum];
+                numanalyses=5;
+                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum];
 
         case SteadystateSolutionEnum,
-                numanalyses=8; 
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
+                numanalyses=7; 
+                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
 
         case ThermalSolutionEnum,
@@ -44 +43 @@
 
         case Transient2DSolutionEnum,
-                numanalyses=7; 
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum];
+                numanalyses=6; 
+                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum];
 
         case Transient3DSolutionEnum,
-                numanalyses=9; 
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
+                numanalyses=8; 
+                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
 
         otherwise

issm/trunk/src/m/solutions/adjointdiagnostic_core.m

@@ -15 +15 @@
         %set analysis type to compute velocity:
         displaystring('\n%s',['      computing velocities']);
-        if(isstokes), femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum);
-        else femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum); end
+        femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
         femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads);
 
@@ -24 +23 @@
         %compute adjoint
         displaystring('\n%s',['      computing adjoint']);
-        if(isstokes), femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum,AdjointStokesAnalysisEnum);
+        if(isstokes), femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum,AdjointStokesAnalysisEnum);
         else femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum); end
         femmodel=solver_adjoint_linear(femmodel);

issm/trunk/src/m/solutions/diagnostic_core.m

@@ -65 +65 @@
 
                 displaystring(verbose,'\n%s',['computing stokes velocities and pressure...']);
-                femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum);
+                femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
                 femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads); 
         end

issm/trunk/src/m/solutions/objectivefunctionC.m

@@ -13 +13 @@
 %set current configuration
 if (solution_type==DiagnosticSolutionEnum | solution_type==SteadystateSolutionEnum)
-        if isstokes, femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum);
-        else femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum); end
+        femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
 elseif (solution_type==BalancedthicknessSolutionEnum)
         femmodel=SetCurrentConfiguration(femmodel,BalancedthicknessAnalysisEnum);