Changeset 4475

Timestamp:

Jul 8, 2010, 3:21:02 PM (16 years ago)

Author:

Mathieu Morlighem

Message:

Fixed problem of dofs for CM (Stokes = 4 dofs, Horiz = 2

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumAsString.cpp (modified) (2 diffs)
• c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• c/EnumDefinitions/StringAsEnum.cpp (modified) (2 diffs)
• c/objects/Elements/Penta.cpp (modified) (2 diffs)
• c/objects/Elements/Penta.h (modified) (1 diff)
• c/objects/Elements/Tria.cpp (modified) (4 diffs)
• c/objects/Elements/Tria.h (modified) (1 diff)
• c/solutions/adjoint_core.cpp (modified) (1 diff)
• m/classes/public/process_solve_options.m (modified) (1 diff)
• m/classes/public/queue/ClusterScript.m (modified) (1 diff)
• m/enum/AbsoluteEnum.m (modified) (1 diff)
• m/enum/AccumulationRateEnum.m (modified) (1 diff)
• m/enum/AdjointAnalysisEnum.m (deleted)
• m/enum/AdjointEnum.m (modified) (1 diff)
• m/enum/AdjointHorizAnalysisEnum.m (added)
• m/enum/AdjointStokesAnalysisEnum.m (added)
• m/enum/AdjointpEnum.m (added)
• 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/Balancedthickness2AnalysisEnum.m (modified) (1 diff)
• m/enum/Balancedthickness2SolutionEnum.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/BeamEnum.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/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/CollapseEnum.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/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/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/EnumAsString.m (modified) (2 diffs)
• m/enum/EpsAbsEnum.m (modified) (1 diff)
• m/enum/EpsCmEnum.m (modified) (1 diff)
• m/enum/EpsRelEnum.m (modified) (1 diff)
• m/enum/EpsResEnum.m (modified) (1 diff)
• m/enum/EpsVelEnum.m (modified) (1 diff)
• m/enum/ExternalResultEnum.m (modified) (1 diff)
• m/enum/ExtrudeParamEnum.m (modified) (1 diff)
• m/enum/FillEnum.m (modified) (1 diff)
• m/enum/FitEnum.m (modified) (1 diff)
• m/enum/FormulationEnum.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/HeatCapacityEnum.m (modified) (1 diff)
• m/enum/HookEnum.m (modified) (1 diff)
• m/enum/HutterFormulationEnum.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/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/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/MacAyealFormulationEnum.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/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/Mesh2gridAnalysisEnum.m (modified) (1 diff)
• m/enum/MinMechanicalConstraintsEnum.m (modified) (1 diff)
• m/enum/MinThermalConstraintsEnum.m (modified) (1 diff)
• m/enum/NStepsEnum.m (modified) (1 diff)
• m/enum/NdtEnum.m (modified) (1 diff)
• m/enum/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/NoneFormulationEnum.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/ObjectEnum.m (modified) (1 diff)
• m/enum/OldGradientEnum.m (modified) (1 diff)
• m/enum/OptScalEnum.m (modified) (1 diff)
• m/enum/OutputFileNameEnum.m (modified) (1 diff)
• m/enum/P0Enum.m (modified) (1 diff)
• m/enum/P1Enum.m (modified) (1 diff)
• m/enum/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/PattynFormulationEnum.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/PressureStokesEnum.m (modified) (1 diff)
• m/enum/Prognostic2AnalysisEnum.m (modified) (1 diff)
• m/enum/Prognostic2SolutionEnum.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/QmuMassFluxNumSegmentsEnum.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/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/SingEnum.m (modified) (1 diff)
• m/enum/SingVertexElementResultEnum.m (modified) (1 diff)
• m/enum/SingVertexInputEnum.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/StokesFormulationEnum.m (modified) (1 diff)
• m/enum/StokesReconditioningEnum.m (modified) (1 diff)
• m/enum/StringArrayParamEnum.m (modified) (1 diff)
• m/enum/StringAsEnum.m (modified) (2 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/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/TemperatureAverageEnum.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/ThermalSolutionEnum.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/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/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/solvers/solver_linear.m (modified) (1 diff)

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

@@ -41 +41 @@
                 case VertAnalysisEnum : return "VertAnalysis";
                 case AdjointSolutionEnum : return "AdjointSolution";
-                case AdjointAnalysisEnum : return "AdjointAnalysis";
+                case AdjointHorizAnalysisEnum : return "AdjointHorizAnalysis";
+                case AdjointStokesAnalysisEnum : return "AdjointStokesAnalysis";
                 case ControlAnalysisEnum : return "ControlAnalysis";
                 case GradientAnalysisEnum : return "GradientAnalysis";
@@ -142 +143 @@
                 case AdjointyEnum : return "Adjointy";
                 case AdjointzEnum : return "Adjointz";
+                case AdjointpEnum : return "Adjointp";
                 case ArtDiffEnum : return "ArtDiff";
                 case BedEnum : return "Bed";

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

@@ -41 +41 @@
         //control
         AdjointSolutionEnum,
-        AdjointAnalysisEnum,
+        AdjointHorizAnalysisEnum,
+        AdjointStokesAnalysisEnum,
         ControlAnalysisEnum,
         GradientAnalysisEnum,
@@ -170 +171 @@
         AdjointyEnum,
         AdjointzEnum,
+        AdjointpEnum,
         ArtDiffEnum,
         BedEnum,

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

@@ -39 +39 @@
         else if (strcmp(name,"VertAnalysis")==0) return VertAnalysisEnum;
         else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum;
-        else if (strcmp(name,"AdjointAnalysis")==0) return AdjointAnalysisEnum;
+        else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
+        else if (strcmp(name,"AdjointStokesAnalysis")==0) return AdjointStokesAnalysisEnum;
         else if (strcmp(name,"ControlAnalysis")==0) return ControlAnalysisEnum;
         else if (strcmp(name,"GradientAnalysis")==0) return GradientAnalysisEnum;
@@ -140 +141 @@
         else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
         else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
+        else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
         else if (strcmp(name,"ArtDiff")==0) return ArtDiffEnum;
         else if (strcmp(name,"Bed")==0) return BedEnum;

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

@@ -370 +370 @@
         else if (analysis_type==DiagnosticStokesAnalysisEnum){
                 InputUpdateFromSolutionDiagnosticStokes( solution);
+        }
+        else if (analysis_type==AdjointHorizAnalysisEnum){
+                InputUpdateFromSolutionAdjointHoriz( solution);
         }
         else if (analysis_type==BedSlopeXAnalysisEnum){
@@ -2438 +2441 @@
         /*Add surfaceslopey as inputs to the tria element: */
         this->inputs->AddInput(new PentaVertexInput(SurfaceSlopeYEnum,values));
+}
+/*}}}*/
+/*FUNCTION Penta::InputUpdateFromSolutionAdjointHoriz {{{1*/
+void  Penta::InputUpdateFromSolutionAdjointHoriz(double* solution){
+
+        int i;
+
+        const int    numvertices=6;
+        const int    numdofpervertex=2;
+        const int    numdof=numdofpervertex*numvertices;
+
+        int          doflist[numdof];
+        double       values[numdof];
+        double       lambdax[numvertices];
+        double       lambday[numvertices];
+
+        int          dummy;
+
+        /*Get dof list: */
+        GetDofList(&doflist[0],&dummy);
+
+        /*Use the dof list to index into the solution vector: */
+        for(i=0;i<numdof;i++){
+                values[i]=solution[doflist[i]];
+        }
+
+        /*Ok, we have vx and vy in values, fill in vx and vy arrays: */
+        for(i=0;i<numvertices;i++){
+                lambdax[i]=values[i*numdofpervertex+0];
+                lambday[i]=values[i*numdofpervertex+1];
+        }
+
+        /*Add vx and vy as inputs to the tria element: */
+        this->inputs->AddInput(new PentaVertexInput(AdjointxEnum,lambdax));
+        this->inputs->AddInput(new PentaVertexInput(AdjointyEnum,lambday));
+
 }
 /*}}}*/

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

@@ -168 +168 @@
                 Penta*  GetUpperElement(void);
                 void      InputExtrude(int enum_type);
+                void    InputUpdateFromSolutionAdjointHoriz( double* solutiong);
+                void    InputUpdateFromSolutionAdjointStokes( double* solutiong);
                 void    InputUpdateFromSolutionBalancedthickness( double* solutiong);
                 void    InputUpdateFromSolutionBalancedthickness2( double* solutiong);

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

@@ -365 +365 @@
                 InputUpdateFromSolutionDiagnosticHoriz( solution);
         }
-        else if (analysis_type==AdjointAnalysisEnum){
-                InputUpdateFromSolutionAdjoint( solution);
+        else if (analysis_type==AdjointHorizAnalysisEnum){
+                InputUpdateFromSolutionAdjointHoriz( solution);
         }
         else if (analysis_type==BedSlopeXAnalysisEnum){
@@ -1016 +1016 @@
         if (analysis_type==DiagnosticHorizAnalysisEnum)
                 GetSolutionFromInputsDiagnosticHoriz(solution);
-        else if (analysis_type==AdjointAnalysisEnum)
-         GetSolutionFromInputsAdjoint(solution);
+        else if (analysis_type==AdjointHorizAnalysisEnum)
+         GetSolutionFromInputsAdjointHoriz(solution);
         else
          ISSMERROR("analysis: %s not supported yet",EnumAsString(analysis_type));
@@ -5264 +5264 @@
 }
 /*}}}*/
-/*FUNCTION Tria::GetSolutionFromInputsAdjoint(Vec solution){{{1*/
-void  Tria::GetSolutionFromInputsAdjoint(Vec solution){
+/*FUNCTION Tria::GetSolutionFromInputsAdjointHoriz(Vec solution){{{1*/
+void  Tria::GetSolutionFromInputsAdjointHoriz(Vec solution){
 
         int i;
@@ -5473 +5473 @@
 }
 /*}}}*/
-/*FUNCTION Tria::InputUpdateFromSolutionAdjoint {{{1*/
-void  Tria::InputUpdateFromSolutionAdjoint(double* solution){
+/*FUNCTION Tria::InputUpdateFromSolutionAdjointHoriz {{{1*/
+void  Tria::InputUpdateFromSolutionAdjointHoriz(double* solution){
 
         int i;

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

@@ -152 +152 @@
                 void    GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_seg,int enumtype);
                 void      GetSolutionFromInputsDiagnosticHoriz(Vec solution);
-                void      GetSolutionFromInputsAdjoint(Vec solution);
+                void      GetSolutionFromInputsAdjointHoriz(Vec solution);
                 void      GradjDragStokes(Vec gradient);
-                void      InputUpdateFromSolutionAdjoint( double* solution);
+                void      InputUpdateFromSolutionAdjointHoriz( double* solution);
                 void      InputUpdateFromSolutionDiagnosticHoriz( double* solution);
                 void      InputUpdateFromSolutionDiagnosticHutter( double* solution);

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

@@ -70 +70 @@
 
         /*Update inputs using adjoint solution, and same type of setup as diagnostic solution: */
-        if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum,AdjointAnalysisEnum);
-        else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointAnalysisEnum);
+        if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum,AdjointStokesAnalysisEnum);
+        else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum);
         
         InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,adjoint_g);

issm/trunk/src/m/classes/public/process_solve_options.m

@@ -29 +29 @@
         error(['process_solve_options error message: analysis_type ' EnumAsString(analysis_type) ' not supported yet!']);
 end
-if ~ismember(sub_analysis_type,[SteadyAnalysisEnum,NoneAnalysisEnum,HorizAnalysisEnum,AdjointAnalysisEnum,GradientAnalysisEnum,InverseAnalysisEnum,VertAnalysisEnum]),
+if ~ismember(sub_analysis_type,[SteadyAnalysisEnum,NoneAnalysisEnum,HorizAnalysisEnum,GradientAnalysisEnum,InverseAnalysisEnum,VertAnalysisEnum]),
         error(['process_solve_options error message: sub_analysis_type ' sub_analysis_type ' not supported yet!']);
 end

issm/trunk/src/m/classes/public/queue/ClusterScript.m

@@ -41 +41 @@
                 fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',np,codepath,EnumAsString(analysis_type),executionpath,name,name,name,name,name);
         else
+                %fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --gen-suppressions=all --suppressions=%s %s/issm.exe %s %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',[ISSM_DIR '/externalpackages/valgrind/install/lib/libmpidebug.so'],np,[ISSM_DIR '/externalpackages/valgrind/install/bin/valgrind'],[ISSM_DIR '/externalpackages/valgrind/issm.supp'], codepath,EnumAsString(analysis_type),executionpath,name,name,name,name,name);
                 fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',[ISSM_DIR '/externalpackages/valgrind/install/lib/libmpidebug.so'],np,[ISSM_DIR '/externalpackages/valgrind/install/bin/valgrind'],[ISSM_DIR '/externalpackages/valgrind/issm.supp'], codepath,EnumAsString(analysis_type),executionpath,name,name,name,name,name);
         end

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

@@ -9 +9 @@
 %      macro=AbsoluteEnum()
 
-macro=228;
+macro=230;

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

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

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

@@ -9 +9 @@
 %      macro=AdjointEnum()
 
-macro=234;
+macro=236;

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

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/Balancedthickness2AnalysisEnum.m

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

issm/trunk/src/m/enum/Balancedthickness2SolutionEnum.m

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/BeamEnum.m

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

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

@@ -9 +9 @@
 %      macro=BeamVertexElementResultEnum()
 
-macro=213;
+macro=215;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=229;
+macro=231;

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

@@ -9 +9 @@
 %      macro=BoolExternalResultEnum()
 
-macro=214;
+macro=216;

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=230;
+macro=232;

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

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=231;
+macro=233;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=232;
+macro=234;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=233;
+macro=235;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=237;
+macro=239;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=ControlParameterEnum()
 
-macro=238;
+macro=240;

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

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=239;
+macro=241;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=240;
+macro=242;

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

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

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

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=241;
+macro=243;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=DoubleExternalResultEnum()
 
-macro=215;
+macro=217;

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

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

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

@@ -9 +9 @@
 %      macro=DoubleMatExternalResultEnum()
 
-macro=217;
+macro=219;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=DoubleVecExternalResultEnum()
 
-macro=216;
+macro=218;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -36 +36 @@
         case VertAnalysisEnum(), string='VertAnalysis'; return
         case AdjointSolutionEnum(), string='AdjointSolution'; return
-        case AdjointAnalysisEnum(), string='AdjointAnalysis'; return
+        case AdjointHorizAnalysisEnum(), string='AdjointHorizAnalysis'; return
+        case AdjointStokesAnalysisEnum(), string='AdjointStokesAnalysis'; return
         case ControlAnalysisEnum(), string='ControlAnalysis'; return
         case GradientAnalysisEnum(), string='GradientAnalysis'; return
@@ -137 +138 @@
         case AdjointyEnum(), string='Adjointy'; return
         case AdjointzEnum(), string='Adjointz'; return
+        case AdjointpEnum(), string='Adjointp'; return
         case ArtDiffEnum(), string='ArtDiff'; return
         case BedEnum(), string='Bed'; return

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

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=242;
+macro=244;

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

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=243;
+macro=245;

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

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=244;
+macro=246;

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

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=245;
+macro=247;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=ExtrudeParamEnum()
 
-macro=246;
+macro=248;

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

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

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

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

issm/trunk/src/m/enum/FormulationEnum.m

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=235;
+macro=237;

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

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=247;
+macro=249;

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

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

issm/trunk/src/m/enum/HutterFormulationEnum.m

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=IntExternalResultEnum()
 
-macro=218;
+macro=220;

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=248;
+macro=250;

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

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=249;
+macro=251;

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

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=250;
+macro=252;

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

@@ -9 +9 @@
 %      macro=JEnum()
 
-macro=221;
+macro=223;

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

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

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

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=251;
+macro=253;

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

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

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

@@ -9 +9 @@
 %      macro=LowmemEnum()
 
-macro=252;
+macro=254;

issm/trunk/src/m/enum/MacAyealFormulationEnum.m

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=253;
+macro=255;

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

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=254;
+macro=256;

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

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

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=255;
+macro=257;

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

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

issm/trunk/src/m/enum/Mesh2gridAnalysisEnum.m

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

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

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=256;
+macro=258;

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

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=257;
+macro=259;

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

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=258;
+macro=260;

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

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=259;
+macro=261;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/NoneFormulationEnum.m

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

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

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=260;
+macro=262;

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

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=261;
+macro=263;

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

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

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

@@ -9 +9 @@
 %      macro=NumberOfDofsPerNodeEnum()
 
-macro=262;
+macro=264;

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

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=263;
+macro=265;

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

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=264;
+macro=266;

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

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=265;
+macro=267;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=OldGradientEnum()
 
-macro=236;
+macro=238;

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

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=266;
+macro=268;

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

@@ -9 +9 @@
 %      macro=OutputFileNameEnum()
 
-macro=267;
+macro=269;

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=268;
+macro=270;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=PatchEnum()
 
-macro=222;
+macro=224;

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

@@ -9 +9 @@
 %      macro=PatchNodesEnum()
 
-macro=224;
+macro=226;

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

@@ -9 +9 @@
 %      macro=PatchVerticesEnum()
 
-macro=223;
+macro=225;

issm/trunk/src/m/enum/PattynFormulationEnum.m

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

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

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=269;
+macro=271;

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

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

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

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

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

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

issm/trunk/src/m/enum/PentaEnum.m

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

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

@@ -9 +9 @@
 %      macro=PentaVertexElementResultEnum()
 
-macro=211;
+macro=213;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=PetscVecExternalResultEnum()
 
-macro=219;
+macro=221;

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

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/Prognostic2AnalysisEnum.m

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

issm/trunk/src/m/enum/Prognostic2SolutionEnum.m

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=270;
+macro=272;

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

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=271;
+macro=273;

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

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=272;
+macro=274;

issm/trunk/src/m/enum/QmuMassFluxNumSegmentsEnum.m

@@ -9 +9 @@
 %      macro=QmuMassFluxNumSegmentsEnum()
 
-macro=273;
+macro=275;

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

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=274;
+macro=276;

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

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=275;
+macro=277;

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

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=276;
+macro=278;

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

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=277;
+macro=279;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=RelativeEnum()
 
-macro=226;
+macro=228;

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

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

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

@@ -9 +9 @@
 %      macro=ResidualEnum()
 
-macro=227;
+macro=229;

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

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=278;
+macro=280;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/SingEnum.m

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

issm/trunk/src/m/enum/SingVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=SingVertexElementResultEnum()
 
-macro=212;
+macro=214;

issm/trunk/src/m/enum/SingVertexInputEnum.m

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

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

@@ -9 +9 @@
 %      macro=SolverStringEnum()
 
-macro=279;
+macro=281;

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

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=280;
+macro=282;

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

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

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

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

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

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

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

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

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

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

issm/trunk/src/m/enum/StokesFormulationEnum.m

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

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

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

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

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

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

@@ -34 +34 @@
 elseif (strcmpi(name,'VertAnalysis')), enum=VertAnalysisEnum(); return
 elseif (strcmpi(name,'AdjointSolution')), enum=AdjointSolutionEnum(); return
-elseif (strcmpi(name,'AdjointAnalysis')), enum=AdjointAnalysisEnum(); return
+elseif (strcmpi(name,'AdjointHorizAnalysis')), enum=AdjointHorizAnalysisEnum(); return
+elseif (strcmpi(name,'AdjointStokesAnalysis')), enum=AdjointStokesAnalysisEnum(); return
 elseif (strcmpi(name,'ControlAnalysis')), enum=ControlAnalysisEnum(); return
 elseif (strcmpi(name,'GradientAnalysis')), enum=GradientAnalysisEnum(); return
@@ -135 +136 @@
 elseif (strcmpi(name,'Adjointy')), enum=AdjointyEnum(); return
 elseif (strcmpi(name,'Adjointz')), enum=AdjointzEnum(); return
+elseif (strcmpi(name,'Adjointp')), enum=AdjointpEnum(); return
 elseif (strcmpi(name,'ArtDiff')), enum=ArtDiffEnum(); return
 elseif (strcmpi(name,'Bed')), enum=BedEnum(); return

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

@@ -9 +9 @@
 %      macro=StringExternalResultEnum()
 
-macro=220;
+macro=222;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=TimeEnum()
 
-macro=225;
+macro=227;

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

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=281;
+macro=283;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=282;
+macro=284;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=283;
+macro=285;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=284;
+macro=286;

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

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

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

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

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

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=285;
+macro=287;

issm/trunk/src/m/solvers/solver_linear.m

@@ -24 +24 @@
         %Merge back to g set
         u_g= Mergesolutionfromftog( u_f, femmodel.Gmn, femmodel.ys, femmodel.nodesets ); 
+        u_g2=u_g;
+        save u_g2 u_g2;
 
         %Update inputs using new solution