Changeset 23020

Timestamp:

07/27/18 14:15:23 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving sommers to SHAKTI, and adding new hydro model for Henning (based on PISM non conserving scheme)

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/analyses/EnumToAnalysis.cpp (modified) (1 diff)
• c/analyses/HydrologyPismAnalysis.cpp (added)
• c/analyses/HydrologyPismAnalysis.h (added)
• c/analyses/HydrologyShaktiAnalysis.cpp (moved) (moved from issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp ) (18 diffs)
• c/analyses/HydrologyShaktiAnalysis.h (moved) (moved from issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.h ) (1 diff)
• c/analyses/analyses.h (modified) (1 diff)
• c/classes/FemModel.cpp (modified) (1 diff)
• c/classes/Loads/Friction.cpp (modified) (4 diffs)
• c/classes/Loads/Friction.h (modified) (1 diff)
• c/classes/Loads/Moulin.cpp (modified) (2 diffs)
• c/classes/Loads/Moulin.h (modified) (1 diff)
• c/classes/Loads/Neumannflux.cpp (modified) (3 diffs)
• c/classes/Loads/Neumannflux.h (modified) (1 diff)
• c/classes/Materials/Matpar.cpp (modified) (2 diffs)
• c/cores/hydrology_core.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (4 diffs)
• c/shared/Enum/EnumToStringx.cpp (modified) (4 diffs)
• c/shared/Enum/StringToEnumx.cpp (modified) (17 diffs)
• c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)
• dox/issm.dox (modified) (2 diffs)
• m/classes/frictionpism.m (added)
• m/classes/frictionshakti.m (moved) (moved from issm/trunk-jpl/src/m/classes/frictionsommers.m ) (2 diffs)
• m/classes/frictionshakti.py (moved) (moved from issm/trunk-jpl/src/m/classes/frictionsommers.py ) (1 diff)
• m/classes/hydrologypism.m (modified) (1 diff)
• m/consistency/ismodelselfconsistent.js (modified) (1 diff)
• m/consistency/ismodelselfconsistent.m (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -419 +419 @@
 issm_sources += ./analyses/HydrologyShreveAnalysis.cpp
 endif
-if HYDROLOGYSOMMERS
-issm_sources += ./analyses/HydrologySommersAnalysis.cpp
+if HYDROLOGYSHAKTI
+issm_sources += ./analyses/HydrologyShaktiAnalysis.cpp
+endif
+if HYDROLOGYPISM
+issm_sources += ./analyses/HydrologyPismAnalysis.cpp
 endif
 if HYDROLOGYDCINEFFICIENT

issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp

@@ -77 +77 @@
                 case HydrologyShreveAnalysisEnum : return new HydrologyShreveAnalysis();
                 #endif
-                #ifdef _HAVE_HYDROLOGYSOMMERS_
-                case HydrologySommersAnalysisEnum : return new HydrologySommersAnalysis();
+                #ifdef _HAVE_HYDROLOGYSHAKTI_
+                case HydrologyShaktiAnalysisEnum : return new HydrologyShaktiAnalysis();
+                #endif
+                #ifdef _HAVE_HYDROLOGYPISM_
+                case HydrologyPismAnalysisEnum : return new HydrologyPismAnalysis();
                 #endif
                 #ifdef _HAVE_L2PROJECTIONBASE_

issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp

@@ -1 @@
-#include "./HydrologySommersAnalysis.h"
+#include "./HydrologyShaktiAnalysis.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/classes.h"
@@ -12 +12 @@
 
 /*Model processing*/
-void HydrologySommersAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
+void HydrologyShaktiAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
 
         /*retrieve some parameters: */
@@ -18 +18 @@
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
 
-        if(hydrology_model!=HydrologysommersEnum) return;
-
-        IoModelToConstraintsx(constraints,iomodel,"md.hydrology.spchead",HydrologySommersAnalysisEnum,P1Enum);
-
-}/*}}}*/
-void HydrologySommersAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
+        if(hydrology_model!=HydrologyshaktiEnum) return;
+
+        IoModelToConstraintsx(constraints,iomodel,"md.hydrology.spchead",HydrologyShaktiAnalysisEnum,P1Enum);
+
+}/*}}}*/
+void HydrologyShaktiAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
 
         /*Fetch parameters: */
@@ -29 +29 @@
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
 
-        /*Now, do we really want Sommers?*/
-        if(hydrology_model!=HydrologysommersEnum) return;
+        /*Now, do we really want Shakti?*/
+        if(hydrology_model!=HydrologyshaktiEnum) return;
 
         /*Create discrete loads for Moulins*/
@@ -38 +38 @@
                         /*keep only this partition's nodes:*/
                         if(iomodel->my_vertices[i]){
-                                loads->AddObject(new Moulin(iomodel->loadcounter+i+1,i,iomodel,HydrologySommersAnalysisEnum));
+                                loads->AddObject(new Moulin(iomodel->loadcounter+i+1,i,iomodel,HydrologyShaktiAnalysisEnum));
                         }
                 }
                 else if(reCast<int>(iomodel->Data("md.mesh.vertexonbase")[i])){
                         if(iomodel->my_vertices[i]){
-                                loads->AddObject(new Moulin(iomodel->loadcounter+i+1,i,iomodel,HydrologySommersAnalysisEnum));
+                                loads->AddObject(new Moulin(iomodel->loadcounter+i+1,i,iomodel,HydrologyShaktiAnalysisEnum));
                         }       
                 }
@@ -58 +58 @@
         for(int i=0;i<M;i++){
                 if(iomodel->my_elements[segments[i*3+2]-1]){
-                        loads->AddObject(new Neumannflux(iomodel->loadcounter+i+1,i,iomodel,segments,HydrologySommersAnalysisEnum));
+                        loads->AddObject(new Neumannflux(iomodel->loadcounter+i+1,i,iomodel,segments,HydrologyShaktiAnalysisEnum));
                 }
         }
@@ -65 +65 @@
 
 }/*}}}*/
-void HydrologySommersAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
+void HydrologyShaktiAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
 
         /*Fetch parameters: */
@@ -71 +71 @@
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
 
-        /*Now, do we really want Sommers?*/
-        if(hydrology_model!=HydrologysommersEnum) return;
+        /*Now, do we really want Shakti?*/
+        if(hydrology_model!=HydrologyshaktiEnum) return;
 
         if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,"md.mesh.vertexonbase","md.mesh.vertexonsurface");
-        ::CreateNodes(nodes,iomodel,HydrologySommersAnalysisEnum,P1Enum);
+        ::CreateNodes(nodes,iomodel,HydrologyShaktiAnalysisEnum,P1Enum);
         iomodel->DeleteData(2,"md.mesh.vertexonbase","md.mesh.vertexonsurface");
 }/*}}}*/
-int  HydrologySommersAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/
+int  HydrologyShaktiAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/
         return 1;
 }/*}}}*/
-void HydrologySommersAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
+void HydrologyShaktiAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
 
         /*Fetch data needed: */
@@ -87 +87 @@
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
 
-        /*Now, do we really want Sommers?*/
-        if(hydrology_model!=HydrologysommersEnum) return;
+        /*Now, do we really want Shakti?*/
+        if(hydrology_model!=HydrologyshaktiEnum) return;
 
         /*Update elements: */
@@ -136 +136 @@
         }
 }/*}}}*/
-void HydrologySommersAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
+void HydrologyShaktiAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
 
         /*retrieve some parameters: */
@@ -144 +144 @@
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
 
-        /*Now, do we really want Sommers?*/
-        if(hydrology_model!=HydrologysommersEnum) return;
+        /*Now, do we really want Shakti?*/
+        if(hydrology_model!=HydrologyshaktiEnum) return;
 
         parameters->AddObject(new IntParam(HydrologyModelEnum,hydrology_model));
@@ -160 +160 @@
 
 /*Finite Element Analysis*/
-void           HydrologySommersAnalysis::Core(FemModel* femmodel){/*{{{*/
+void           HydrologyShaktiAnalysis::Core(FemModel* femmodel){/*{{{*/
         _error_("not implemented");
 }/*}}}*/
-ElementVector* HydrologySommersAnalysis::CreateDVector(Element* element){/*{{{*/
+ElementVector* HydrologyShaktiAnalysis::CreateDVector(Element* element){/*{{{*/
         /*Default, return NULL*/
         return NULL;
 }/*}}}*/
-ElementMatrix* HydrologySommersAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/
+ElementMatrix* HydrologyShaktiAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/
 _error_("Not implemented");
 }/*}}}*/
-ElementMatrix* HydrologySommersAnalysis::CreateKMatrix(Element* element){/*{{{*/
+ElementMatrix* HydrologyShaktiAnalysis::CreateKMatrix(Element* element){/*{{{*/
 
         /*Intermediaries */
@@ -219 +219 @@
         return Ke;
 }/*}}}*/
-ElementVector* HydrologySommersAnalysis::CreatePVector(Element* element){/*{{{*/
+ElementVector* HydrologyShaktiAnalysis::CreatePVector(Element* element){/*{{{*/
 
         /*Skip if water or ice shelf element*/
@@ -341 +341 @@
         return pe;
 }/*}}}*/
-void           HydrologySommersAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
+void           HydrologyShaktiAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
         element->GetSolutionFromInputsOneDof(solution,HydrologyHeadEnum);
 }/*}}}*/
-void           HydrologySommersAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
+void           HydrologyShaktiAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
         _error_("Not implemented yet");
 }/*}}}*/
-void           HydrologySommersAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
+void           HydrologyShaktiAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
 
         /*Intermediary*/
@@ -425 +425 @@
    xDelete<IssmDouble>(head_old);
 }/*}}}*/
-void           HydrologySommersAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
+void           HydrologyShaktiAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
         /*Default, do nothing*/
         return;
@@ -431 +431 @@
 
 /*Additional methods*/
-IssmDouble HydrologySommersAnalysis::GetConductivity(Element* element){/*{{{*/
+IssmDouble HydrologyShaktiAnalysis::GetConductivity(Element* element){/*{{{*/
 
         /*Intermediaries */
@@ -452 +452 @@
         return conductivity;
 }/*}}}*/
-void HydrologySommersAnalysis::UpdateGapHeight(FemModel* femmodel){/*{{{*/
+void HydrologyShaktiAnalysis::UpdateGapHeight(FemModel* femmodel){/*{{{*/
 
 
@@ -461 +461 @@
 
 }/*}}}*/
-void HydrologySommersAnalysis::UpdateGapHeight(Element* element){/*{{{*/
+void HydrologyShaktiAnalysis::UpdateGapHeight(Element* element){/*{{{*/
 
         /*Skip if water or ice shelf element*/

issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.h

@@ -1 @@
-/*! \file HydrologySommersAnalysis.h 
+/*! \file HydrologyShaktiAnalysis.h 
  *  \brief: header file for generic external result object
  */
 
-#ifndef _HydrologySommersAnalysis_
-#define _HydrologySommersAnalysis_
+#ifndef _HydrologyShaktiAnalysis_
+#define _HydrologyShaktiAnalysis_
 
 /*Headers*/
 #include "./Analysis.h"
 
-class HydrologySommersAnalysis: public Analysis{
+class HydrologyShaktiAnalysis: public Analysis{
 
         public:

issm/trunk-jpl/src/c/analyses/analyses.h

@@ -30 +30 @@
 #include "./HydrologyDCInefficientAnalysis.h"
 #include "./HydrologyShreveAnalysis.h"
-#include "./HydrologySommersAnalysis.h"
+#include "./HydrologyShaktiAnalysis.h"
+#include "./HydrologyPismAnalysis.h"
 #include "./LevelsetAnalysis.h"
 #include "./MasstransportAnalysis.h"

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -771 +771 @@
                         if(ishydrology){
                                 analyses_temp[numanalyses++]=HydrologyShreveAnalysisEnum;
-                                analyses_temp[numanalyses++]=HydrologySommersAnalysisEnum;
+                                analyses_temp[numanalyses++]=HydrologyShaktiAnalysisEnum;
                                 analyses_temp[numanalyses++]=HydrologyDCInefficientAnalysisEnum;
                                 analyses_temp[numanalyses++]=HydrologyDCEfficientAnalysisEnum;

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

@@ -229 +229 @@
                         break;
                 case 8:
-                        GetAlpha2Sommers(palpha2,gauss);
+                        GetAlpha2Shakti(palpha2,gauss);
                         break;
                 case 9:
@@ -382 +382 @@
         *palpha2=alpha2;
 }/*}}}*/
-void Friction::GetAlpha2Sommers(IssmDouble* palpha2, Gauss* gauss){/*{{{*/
+void Friction::GetAlpha2Shakti(IssmDouble* palpha2, Gauss* gauss){/*{{{*/
 
         /* FrictionGetAlpha2 computes alpha2= drag^2 * Neff, with Neff=rho_ice*g*thickness+rho_ice*g*(head-base)*/
@@ -684 +684 @@
         /*Compute effective pressure first */
         IssmDouble  N,delta,W,Wmax,e0,Cc,P0;
-        //element->parameters->FindParam(&delta,TimeEnum);
-        //element->parameters->FindParam(&e0,TimeEnum);
-        //element->parameters->FindParam(&P0,TimeEnum);
-        //element->GetInputValue(&Cc,gauss,FrictionPressureAdjustedTemperatureEnum);
-        //element->GetInputValue(&W,gauss,FrictionPressureAdjustedTemperatureEnum);
+        element->parameters->FindParam(&delta,FrictionDeltaEnum);
+        element->parameters->FindParam(&e0,FrictionVoidRatioEnum);
+        //element->parameters->FindParam(&P0,XXEnum);
+        _error_("don't know what P0 is");
+        element->GetInputValue(&Cc,gauss,FrictionSedimentCompressibilityCoefficientEnum);
+        element->GetInputValue(&W,gauss,WatercolumnEnum);
+        Wmax = 0.; _error_("Don't know what to do with Wmax yet");
         N = delta*P0*pow(10.,(e0/Cc)*(1.-W/Wmax));
 
         /*Compute yield stress following a Mohr-Colomb criterion*/
         IssmDouble phi;
-        //element->GetInputValue(&phi,gauss,FrictionPressureAdjustedTemperatureEnum);
+        element->GetInputValue(&phi,gauss,FrictionTillFrictionAngleEnum);
         IssmDouble tau_c = N*tan(phi);
 
@@ -702 +704 @@
         /*now compute alpha^2*/
         IssmDouble u0,q;
-        //element->parameters->FindParam(&u0,TimeEnum);
-        //element->parameters->FindParam(&q,TimeEnum);
+        element->parameters->FindParam(&u0,FrictionThresholdSpeedEnum);
+        element->parameters->FindParam(&q,FrictionPseudoplasticityExponentEnum);
         IssmDouble alpha2 = tau_c/(pow(ub,1.-q)*pow(u0,q));
 

issm/trunk-jpl/src/c/classes/Loads/Friction.h

@@ -37 +37 @@
                 void  GetAlpha2Hydro(IssmDouble* palpha2,Gauss* gauss);
                 void  GetAlpha2Josh(IssmDouble* palpha2,Gauss* gauss);
-                void  GetAlpha2Sommers(IssmDouble* palpha2,Gauss* gauss);
+                void  GetAlpha2Shakti(IssmDouble* palpha2,Gauss* gauss);
                 void  GetAlpha2Temp(IssmDouble* palpha2,Gauss* gauss);
                 void  GetAlpha2Viscous(IssmDouble* palpha2,Gauss* gauss);

issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp

@@ -179 +179 @@
         switch(analysis_type){
                 
-        case HydrologySommersAnalysisEnum:
-                pe = this->CreatePVectorHydrologySommers();
+        case HydrologyShaktiAnalysisEnum:
+                pe = this->CreatePVectorHydrologyShakti();
                 break;
         case HydrologyDCInefficientAnalysisEnum:
@@ -337 +337 @@
 /*}}}*/
 
-ElementVector* Moulin::CreatePVectorHydrologySommers(void){/*{{{*/
+ElementVector* Moulin::CreatePVectorHydrologyShakti(void){/*{{{*/
 
         /*If this node is not the master node (belongs to another partition of the

issm/trunk-jpl/src/c/classes/Loads/Moulin.h

@@ -80 +80 @@
                 /*}}}*/
 
-                ElementVector* CreatePVectorHydrologySommers(void);
+                ElementVector* CreatePVectorHydrologyShakti(void);
                 ElementVector* CreatePVectorHydrologyDCInefficient(void);
                 ElementVector* CreatePVectorHydrologyDCEfficient(void);

issm/trunk-jpl/src/c/classes/Loads/Neumannflux.cpp

@@ -190 +190 @@
         /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */
         switch(analysis_type){
-                case HydrologySommersAnalysisEnum:
+                case HydrologyShaktiAnalysisEnum:
                         /*Nothing!*/
                         break;
@@ -213 +213 @@
 
         switch(analysis_type){
-                case HydrologySommersAnalysisEnum:
-                        pe=CreatePVectorHydrologySommers();
+                case HydrologyShaktiAnalysisEnum:
+                        pe=CreatePVectorHydrologyShakti();
                         break;
                 default:
@@ -346 +346 @@
 
 /*Neumannflux management*/
-ElementVector* Neumannflux::CreatePVectorHydrologySommers(void){/*{{{*/
+ElementVector* Neumannflux::CreatePVectorHydrologyShakti(void){/*{{{*/
 
         /* constants*/

issm/trunk-jpl/src/c/classes/Loads/Neumannflux.h

@@ -73 +73 @@
                 /*}}}*/
                 /*Neumannflux management:{{{*/
-                ElementVector* CreatePVectorHydrologySommers(void);
+                ElementVector* CreatePVectorHydrologyShakti(void);
                 /*}}}*/
 

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -149 +149 @@
                                 /*Nothing to add*/
                         }
-                        else if(hydrology_model==HydrologysommersEnum){
+                        else if(hydrology_model==HydrologyshaktiEnum){
                                 /*Nothing to add*/
                         }
@@ -250 +250 @@
                                                         /*Nothing to add*/
                                                 }
-                                                else if(hydrology_model==HydrologysommersEnum){
+                                                else if(hydrology_model==HydrologyshaktiEnum){
                                                         /*Nothing to add*/
                                                 }

issm/trunk-jpl/src/c/cores/hydrology_core.cpp

@@ -116 +116 @@
                 }
         }
-        else if (hydrology_model==HydrologysommersEnum){
-                femmodel->SetCurrentConfiguration(HydrologySommersAnalysisEnum);
+        else if (hydrology_model==HydrologyshaktiEnum){
+                femmodel->SetCurrentConfiguration(HydrologyShaktiAnalysisEnum);
                 InputDuplicatex(femmodel,HydrologyHeadEnum,HydrologyHeadOldEnum);
                 solutionsequence_shakti_nonlinear(femmodel);
                 if(VerboseSolution()) _printf0_("   updating gap height\n");
-                HydrologySommersAnalysis* analysis = new HydrologySommersAnalysis();
+                HydrologyShaktiAnalysis* analysis = new HydrologyShaktiAnalysis();
                 analysis->UpdateGapHeight(femmodel);
+                delete analysis;
+        }
+        else if (hydrology_model==HydrologypismEnum){
+                femmodel->SetCurrentConfiguration(HydrologyPismAnalysisEnum);
+                if(VerboseSolution()) _printf0_("   updating water column\n");
+                HydrologyPismAnalysis* analysis = new HydrologyPismAnalysis();
+                analysis->UpdateWaterColumn(femmodel);
                 delete analysis;
         }

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -127 +127 @@
         FrictionGammaEnum,
         FrictionLawEnum,
+        FrictionPseudoplasticityExponentEnum,
+        FrictionThresholdSpeedEnum,
+        FrictionDeltaEnum,
+        FrictionVoidRatioEnum,
         GiaCrossSectionShapeEnum,
         GroundinglineMigrationEnum,
@@ -459 +463 @@
         FrictionQEnum,
         FrictionWaterLayerEnum,
+        FrictionTillFrictionAngleEnum,
+        FrictionSedimentCompressibilityCoefficientEnum,
         GeometryHydrostaticRatioEnum,
         GiaLithosphereThicknessEnum,
@@ -483 +489 @@
         HydrologyWaterVxEnum,
         HydrologyWaterVyEnum,
+        HydrologyDrainageRateEnum,
         IceEnum,
         IceMaskNodeActivationEnum,
@@ -806 +813 @@
         HydrologyshreveEnum,
         HydrologySolutionEnum,
-        HydrologySommersAnalysisEnum,
-        HydrologysommersEnum,
+        HydrologyShaktiAnalysisEnum,
+        HydrologyPismAnalysisEnum,
+        HydrologyshaktiEnum,
+        HydrologypismEnum,
         IceMassEnum,
         IceMassScaledEnum,

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

@@ -135 +135 @@
                 case FrictionGammaEnum : return "FrictionGamma";
                 case FrictionLawEnum : return "FrictionLaw";
+                case FrictionPseudoplasticityExponentEnum : return "FrictionPseudoplasticityExponent";
+                case FrictionThresholdSpeedEnum : return "FrictionThresholdSpeed";
+                case FrictionDeltaEnum : return "FrictionDelta";
+                case FrictionVoidRatioEnum : return "FrictionVoidRatio";
                 case GiaCrossSectionShapeEnum : return "GiaCrossSectionShape";
                 case GroundinglineMigrationEnum : return "GroundinglineMigration";
@@ -465 +469 @@
                 case FrictionQEnum : return "FrictionQ";
                 case FrictionWaterLayerEnum : return "FrictionWaterLayer";
+                case FrictionTillFrictionAngleEnum : return "FrictionTillFrictionAngle";
+                case FrictionSedimentCompressibilityCoefficientEnum : return "FrictionSedimentCompressibilityCoefficient";
                 case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
                 case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness";
@@ -489 +495 @@
                 case HydrologyWaterVxEnum : return "HydrologyWaterVx";
                 case HydrologyWaterVyEnum : return "HydrologyWaterVy";
+                case HydrologyDrainageRateEnum : return "HydrologyDrainageRate";
                 case IceEnum : return "Ice";
                 case IceMaskNodeActivationEnum : return "IceMaskNodeActivation";
@@ -810 +817 @@
                 case HydrologyshreveEnum : return "Hydrologyshreve";
                 case HydrologySolutionEnum : return "HydrologySolution";
-                case HydrologySommersAnalysisEnum : return "HydrologySommersAnalysis";
-                case HydrologysommersEnum : return "Hydrologysommers";
+                case HydrologyShaktiAnalysisEnum : return "HydrologyShaktiAnalysis";
+                case HydrologyPismAnalysisEnum : return "HydrologyPismAnalysis";
+                case HydrologyshaktiEnum : return "Hydrologyshakti";
+                case HydrologypismEnum : return "Hydrologypism";
                 case IceMassEnum : return "IceMass";
                 case IceMassScaledEnum : return "IceMassScaled";

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

@@ -135 +135 @@
               else if (strcmp(name,"FrictionGamma")==0) return FrictionGammaEnum;
               else if (strcmp(name,"FrictionLaw")==0) return FrictionLawEnum;
-              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
-              else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum;
+              else if (strcmp(name,"FrictionPseudoplasticityExponent")==0) return FrictionPseudoplasticityExponentEnum;
+              else if (strcmp(name,"FrictionThresholdSpeed")==0) return FrictionThresholdSpeedEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"GroundinglineFrictionInterpolation")==0) return GroundinglineFrictionInterpolationEnum;
+              if (strcmp(name,"FrictionDelta")==0) return FrictionDeltaEnum;
+              else if (strcmp(name,"FrictionVoidRatio")==0) return FrictionVoidRatioEnum;
+              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
+              else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum;
+              else if (strcmp(name,"GroundinglineFrictionInterpolation")==0) return GroundinglineFrictionInterpolationEnum;
               else if (strcmp(name,"GroundinglineMeltInterpolation")==0) return GroundinglineMeltInterpolationEnum;
               else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
@@ -256 +260 @@
               else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
               else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
-              else if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
+         else stage=3;
+   }
+   if(stage==3){
+              if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
               else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum;
               else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum;
               else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum;
-         else stage=3;
-   }
-   if(stage==3){
-              if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
+              else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
               else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
               else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
@@ -379 +383 @@
               else if (strcmp(name,"TransientIscoupler")==0) return TransientIscouplerEnum;
               else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum;
-              else if (strcmp(name,"TransientIsesa")==0) return TransientIsesaEnum;
+         else stage=4;
+   }
+   if(stage==4){
+              if (strcmp(name,"TransientIsesa")==0) return TransientIsesaEnum;
               else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
               else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
               else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum;
-         else stage=4;
-   }
-   if(stage==4){
-              if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
+              else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
               else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum;
               else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
@@ -474 +478 @@
               else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
               else if (strcmp(name,"FrictionWaterLayer")==0) return FrictionWaterLayerEnum;
+              else if (strcmp(name,"FrictionTillFrictionAngle")==0) return FrictionTillFrictionAngleEnum;
+              else if (strcmp(name,"FrictionSedimentCompressibilityCoefficient")==0) return FrictionSedimentCompressibilityCoefficientEnum;
               else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
               else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
@@ -498 +504 @@
               else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
               else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
+              else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
               else if (strcmp(name,"Ice")==0) return IceEnum;
-              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
+         else stage=5;
+   }
+   if(stage==5){
+              if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
               else if (strcmp(name,"Input")==0) return InputEnum;
               else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
@@ -506 +516 @@
               else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
               else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
-         else stage=5;
-   }
-   if(stage==5){
-              if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
+              else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
@@ -622 +629 @@
               else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
               else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
-              else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
               else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
               else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
@@ -629 +639 @@
               else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
-         else stage=6;
-   }
-   if(stage==6){
-              if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
+              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
               else if (strcmp(name,"Surface")==0) return SurfaceEnum;
               else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
@@ -745 +752 @@
               else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
               else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
-              else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
+         else stage=7;
+   }
+   if(stage==7){
+              if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
               else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
               else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
@@ -752 +762 @@
               else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
               else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
-         else stage=7;
-   }
-   if(stage==7){
-              if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
+              else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
               else if (strcmp(name,"EplHead")==0) return EplHeadEnum;
               else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
@@ -828 +835 @@
               else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
               else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
-              else if (strcmp(name,"HydrologySommersAnalysis")==0) return HydrologySommersAnalysisEnum;
-              else if (strcmp(name,"Hydrologysommers")==0) return HydrologysommersEnum;
+              else if (strcmp(name,"HydrologyShaktiAnalysis")==0) return HydrologyShaktiAnalysisEnum;
+              else if (strcmp(name,"HydrologyPismAnalysis")==0) return HydrologyPismAnalysisEnum;
+              else if (strcmp(name,"Hydrologyshakti")==0) return HydrologyshaktiEnum;
+              else if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum;
               else if (strcmp(name,"IceMass")==0) return IceMassEnum;
               else if (strcmp(name,"IceMassScaled")==0) return IceMassScaledEnum;
@@ -866 +875 @@
               else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum;
               else if (strcmp(name,"LoveKi")==0) return LoveKiEnum;
-              else if (strcmp(name,"LoveKr")==0) return LoveKrEnum;
+         else stage=8;
+   }
+   if(stage==8){
+              if (strcmp(name,"LoveKr")==0) return LoveKrEnum;
               else if (strcmp(name,"LoveLi")==0) return LoveLiEnum;
               else if (strcmp(name,"LoveLr")==0) return LoveLrEnum;
@@ -875 +887 @@
               else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
               else if (strcmp(name,"Masscon")==0) return MassconEnum;
-         else stage=8;
-   }
-   if(stage==8){
-              if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
+              else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
               else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
               else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
@@ -989 +998 @@
               else if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
               else if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
-              else if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum;
+         else stage=9;
+   }
+   if(stage==9){
+              if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum;
               else if (strcmp(name,"Outputdefinition50")==0) return Outputdefinition50Enum;
               else if (strcmp(name,"Outputdefinition51")==0) return Outputdefinition51Enum;
@@ -998 +1010 @@
               else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
               else if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum;
-         else stage=9;
-   }
-   if(stage==9){
-              if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum;
+              else if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum;
               else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum;
               else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum;
@@ -1112 +1121 @@
               else if (strcmp(name,"SmbMAdd")==0) return SmbMAddEnum;
               else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
-              else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
+         else stage=10;
+   }
+   if(stage==10){
+              if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
               else if (strcmp(name,"SmbRlaps")==0) return SmbRlapsEnum;
               else if (strcmp(name,"SmbRlapslgm")==0) return SmbRlapslgmEnum;
@@ -1121 +1133 @@
               else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
               else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
-         else stage=10;
-   }
-   if(stage==10){
-              if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
+              else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
               else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
               else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;

issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp

@@ -203 +203 @@
                 case 1: return HydrologydcEnum;
                 case 2: return HydrologyshreveEnum;
-                case 3: return HydrologysommersEnum;
+                case 3: return HydrologyshaktiEnum;
                 default: _error_("Marshalled hydrology code \""<<enum_in<<"\" not supported yet"); 
         }

issm/trunk-jpl/src/dox/issm.dox

@@ -47 +47 @@
 </th>
 <tr>
-<th  bgcolor=#FFFFFF style="text-align:left;"> C++ </th><td  bgcolor=#FFFFFF style="text-align:right;">467</td><td  bgcolor=#FFFFFF style="text-align:right;">18020</td><td  bgcolor=#FFFFFF style="text-align:right;">18480</td><td  bgcolor=#FFFFFF style="text-align:right;">84161</td><td  bgcolor=#FFFFFF style="text-align:right;">120661</td>
+<th  bgcolor=#FFFFFF style="text-align:left;"> C++ </th><td  bgcolor=#FFFFFF style="text-align:right;">507</td><td  bgcolor=#FFFFFF style="text-align:right;">21317</td><td  bgcolor=#FFFFFF style="text-align:right;">21788</td><td  bgcolor=#FFFFFF style="text-align:right;">99398</td><td  bgcolor=#FFFFFF style="text-align:right;">142503</td>
 </tr>
 <tr>
-<th  bgcolor=#C6E2FF style="text-align:left;"> MATLAB </th><td  bgcolor=#C6E2FF style="text-align:right;">1606</td><td  bgcolor=#C6E2FF style="text-align:right;">8941</td><td  bgcolor=#C6E2FF style="text-align:right;">18403</td><td  bgcolor=#C6E2FF style="text-align:right;">42192</td><td  bgcolor=#C6E2FF style="text-align:right;">69536</td>
+<th  bgcolor=#C6E2FF style="text-align:left;"> MATLAB </th><td  bgcolor=#C6E2FF style="text-align:right;">875</td><td  bgcolor=#C6E2FF style="text-align:right;">9048</td><td  bgcolor=#C6E2FF style="text-align:right;">13309</td><td  bgcolor=#C6E2FF style="text-align:right;">57616</td><td  bgcolor=#C6E2FF style="text-align:right;">79973</td>
 </tr>
 <tr>
-<th  bgcolor=#FFFFFF style="text-align:left;"> C/C++  Header </th><td  bgcolor=#FFFFFF style="text-align:right;">420</td><td  bgcolor=#FFFFFF style="text-align:right;">3534</td><td  bgcolor=#FFFFFF style="text-align:right;">3662</td><td  bgcolor=#FFFFFF style="text-align:right;">15940</td><td  bgcolor=#FFFFFF style="text-align:right;">23136</td>
+<th  bgcolor=#FFFFFF style="text-align:left;"> Python </th><td  bgcolor=#FFFFFF style="text-align:right;">391</td><td  bgcolor=#FFFFFF style="text-align:right;">6083</td><td  bgcolor=#FFFFFF style="text-align:right;">6973</td><td  bgcolor=#FFFFFF style="text-align:right;">36762</td><td  bgcolor=#FFFFFF style="text-align:right;">49818</td>
 </tr>
 <tr>
-<th  bgcolor=#C6E2FF style="text-align:left;"> Python </th><td  bgcolor=#C6E2FF style="text-align:right;">162</td><td  bgcolor=#C6E2FF style="text-align:right;">2523</td><td  bgcolor=#C6E2FF style="text-align:right;">2751</td><td  bgcolor=#C6E2FF style="text-align:right;">10735</td><td  bgcolor=#C6E2FF style="text-align:right;">16009</td>
+<th  bgcolor=#C6E2FF style="text-align:left;"> C/C++  Header </th><td  bgcolor=#C6E2FF style="text-align:right;">432</td><td  bgcolor=#C6E2FF style="text-align:right;">3718</td><td  bgcolor=#C6E2FF style="text-align:right;">3851</td><td  bgcolor=#C6E2FF style="text-align:right;">17527</td><td  bgcolor=#C6E2FF style="text-align:right;">25096</td>
 </tr>
 <tr>
-<th  bgcolor=#FFFFFF style="text-align:left;"> m4 </th><td  bgcolor=#FFFFFF style="text-align:right;">8</td><td  bgcolor=#FFFFFF style="text-align:right;">1052</td><td  bgcolor=#FFFFFF style="text-align:right;">149</td><td  bgcolor=#FFFFFF style="text-align:right;">9877</td><td  bgcolor=#FFFFFF style="text-align:right;">11078</td>
+<th  bgcolor=#FFFFFF style="text-align:left;"> m4 </th><td  bgcolor=#FFFFFF style="text-align:right;">8</td><td  bgcolor=#FFFFFF style="text-align:right;">1487</td><td  bgcolor=#FFFFFF style="text-align:right;">153</td><td  bgcolor=#FFFFFF style="text-align:right;">10086</td><td  bgcolor=#FFFFFF style="text-align:right;">11726</td>
 </tr>
 <tr>
-<th  bgcolor=#C6E2FF style="text-align:left;"> Bourne  Shell </th><td  bgcolor=#C6E2FF style="text-align:right;">4</td><td  bgcolor=#C6E2FF style="text-align:right;">113</td><td  bgcolor=#C6E2FF style="text-align:right;">188</td><td  bgcolor=#C6E2FF style="text-align:right;">524</td><td  bgcolor=#C6E2FF style="text-align:right;">825</td>
+<th  bgcolor=#C6E2FF style="text-align:left;"> Javascript </th><td  bgcolor=#C6E2FF style="text-align:right;">104</td><td  bgcolor=#C6E2FF style="text-align:right;">1485</td><td  bgcolor=#C6E2FF style="text-align:right;">2228</td><td  bgcolor=#C6E2FF style="text-align:right;">9643</td><td  bgcolor=#C6E2FF style="text-align:right;">13356</td>
+</tr>
+<tr>
+<th  bgcolor=#FFFFFF style="text-align:left;"> Bourne  Shell </th><td  bgcolor=#FFFFFF style="text-align:right;">6</td><td  bgcolor=#FFFFFF style="text-align:right;">131</td><td  bgcolor=#FFFFFF style="text-align:right;">229</td><td  bgcolor=#FFFFFF style="text-align:right;">1032</td><td  bgcolor=#FFFFFF style="text-align:right;">1392</td>
+</tr>
+<tr>
+<th  bgcolor=#C6E2FF style="text-align:left;"> Fortran </th><td  bgcolor=#C6E2FF style="text-align:right;">90</td><td  bgcolor=#C6E2FF style="text-align:right;">5</td><td  bgcolor=#C6E2FF style="text-align:right;">331</td><td  bgcolor=#C6E2FF style="text-align:right;">358</td><td  bgcolor=#C6E2FF style="text-align:right;">1029</td><td  bgcolor=#C6E2FF style="text-align:right;">1723</td>
 </tr>
 <tr>
@@ -68 +74 @@
 </tr>
 <tr>
-<th  bgcolor=#C6E2FF style="text-align:left;"> SUM: </th><td  bgcolor=#C6E2FF style="text-align:right;">2674</td><td  bgcolor=#C6E2FF style="text-align:right;">34187</td><td  bgcolor=#C6E2FF style="text-align:right;">43935</td><td  bgcolor=#C6E2FF style="text-align:right;">163794</td><td  bgcolor=#C6E2FF style="text-align:right;">241916</td>
+<th  bgcolor=#C6E2FF style="text-align:left;"> SUM: </th><td  bgcolor=#C6E2FF style="text-align:right;">2335</td><td  bgcolor=#C6E2FF style="text-align:right;">43604</td><td  bgcolor=#C6E2FF style="text-align:right;">49191</td><td  bgcolor=#C6E2FF style="text-align:right;">233458</td><td  bgcolor=#C6E2FF style="text-align:right;">326253</td>
 </tr>
 </table>

issm/trunk-jpl/src/m/classes/frictionshakti.m

@@ -1 @@
-%FRICTIONSOMMERS class definition
+%FRICTIONSHAKTI class definition
 %
 %   Usage:
-%      friction=frictionsommers();
+%      friction=frictionshakti();
 
-classdef frictionsommers
+classdef frictionshakti
         properties (SetAccess=public) 
                 coefficient = NaN;
@@ -12 +12 @@
                         self.coefficient=project3d(md,'vector',self.coefficient,'type','node','layer',1);
                 end % }}}
-                function self = frictionsommers(varargin) % {{{
+                function self = frictionshakti(varargin) % {{{
                         switch nargin
                                 case 0
                                         self=setdefaultparameters(self);
                                 case 1
-                                        self=structtoobj(frictionsommers(),varargin{1});
+                                        self=structtoobj(frictionshakti(),varargin{1});
                                 otherwise
                                         error('constructor not supported');

issm/trunk-jpl/src/m/classes/frictionshakti.py

@@ -4 +4 @@
 from WriteData import WriteData
 
-class frictionsommers(object):
+class frictionshakti(object):
     """
-    FRICTIONSOMMERS class definition
+    FRICTIONSHAKTI class definition
 
     Usage:
-        friction=frictionsommers()
+        friction=frictionshakti()
     """
 

issm/trunk-jpl/src/m/classes/hydrologypism.m

@@ -46 +46 @@
 
                         WriteData(fid,prefix,'name','md.hydrology.model','data',4,'format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','drainage_rate','format','DoubleMat','mattype',1,'scale',1./(1000.*yts)); %from mm/yr to m/s
+                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','drainage_rate','format','DoubleMat','mattype',1,'scale',1./(1000.*yts)); %from mm/yr to m/s
                 end % }}}
         end

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.js

@@ -79 +79 @@
                 
         }else if(solutiontype ==='TransientSolution'){
-                analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologySommersAnalysis'];
+                analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologyShaktiAnalysis'];
                 
         }else if(solutiontype ==='SealevelriseSolution'){

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

@@ -71 +71 @@
                 analyses={'EsaAnalysis'};
         elseif strcmp(solutiontype,'TransientSolution')
-                analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologySommersAnalysis'};
+                analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologyShaktiAnalysis'};
         elseif strcmp(solutiontype,'SealevelriseSolution')
                 analyses={'SealevelriseAnalysis'};