Changeset 28115

Timestamp:

02/29/24 15:22:20 (13 months ago)

Author:

poinelli

Message:

NEW: Add IntrusionMelt module to include melt under grounding zones, edits after Robel, Wilson, Seroussi TC (2022)

Location:

issm/trunk-jpl

Files:

• src/c/analyses/FreeSurfaceBaseAnalysis.cpp (modified) (5 diffs)
• src/c/analyses/MasstransportAnalysis.cpp (modified) (11 diffs)
• src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (modified) (2 diffs)
• src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h (modified) (2 diffs)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• src/c/shared/Enum/Enum.vim (modified) (2 diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• src/c/shared/Enum/Enumjl.vim (modified) (2 diffs)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (9 diffs)
• src/m/classes/groundingline.m (modified) (5 diffs)
• test/Archives/Archive456.arch (added)
• test/Archives/Archive520.arch (added)
• test/NightlyRun/test456.m (added)
• test/NightlyRun/test520.m (added)

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

@@ -354 +354 @@
         /*Intermediaries*/
         int         domaintype,dim,stabilization;
-        IssmDouble  Jdet,dt;
-        IssmDouble  gmb,fmb,mb,bed,vx,vy,vz,tau;
+        IssmDouble  Jdet,dt,intrusiondist;
+        IssmDouble  gmb,fmb,mb,bed,vx,vy,vz,tau,gldistance;
         Element*    basalelement = NULL;
         IssmDouble *xyz_list  = NULL;
@@ -361 +361 @@
         /*Get basal element*/
         element->FindParam(&domaintype,DomainTypeEnum);
+        
         switch(domaintype){
                 case Domain2DhorizontalEnum:
@@ -394 +395 @@
         basalelement->FindParam(&dt,TimesteppingTimeStepEnum);
         basalelement->FindParam(&melt_style,GroundinglineMeltInterpolationEnum);
+        basalelement->FindParam(&intrusiondist,GroundinglineIntrusionDistanceEnum);
+
         Input* groundedice_input   = basalelement->GetInput(MaskOceanLevelsetEnum);              _assert_(groundedice_input);
         Input* gmb_input           = basalelement->GetInput(BasalforcingsGroundediceMeltingRateEnum);  _assert_(gmb_input);
@@ -424 +427 @@
                 gauss = basalelement->NewGauss(point1,fraction1,fraction2,3);
         }
+        if(melt_style==IntrusionMeltEnum){
+                basalelement->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                gauss = basalelement->NewGauss(point1,fraction1,fraction2,3);
+        }
         else{
                 gauss = basalelement->NewGauss(3);   
@@ -459 +466 @@
                         else mb=gmb;
                 }
+                else if(melt_style==IntrusionMeltEnum){
+                        Input* gldistance_input = basalelement->GetInput(DistanceToGroundinglineEnum);              _assert_(gldistance_input); 
+                gldistance_input->GetInputValue(&gldistance,gauss);
+                        if (intrusiondist==0)
+                                if(gllevelset>0.) mb=gmb;
+                                else mb=fmb;
+                else if(gldistance>intrusiondist) 
+                                mb=gmb;
+                        else if(gldistance<=intrusiondist && gldistance>0) 
+                                mb=fmb*(1-gldistance/intrusiondist); 
+                        else
+                                mb=fmb;
+        }
                 else  _error_("melt interpolation "<<EnumToStringx(melt_style)<<" not implemented yet");
 

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

@@ -156 +156 @@
         iomodel->FetchDataToInput(inputs,elements,"md.initialization.vx",VxEnum);
         iomodel->FetchDataToInput(inputs,elements,"md.initialization.vy",VyEnum);
+        
         if(isgroundingline)     iomodel->FetchDataToInput(inputs,elements,"md.geometry.bed",BedEnum);
         /*Initialize ThicknessResidual input*/
@@ -272 +273 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.masstransport.min_thickness",MasstransportMinThicknessEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.masstransport.penalty_factor",MasstransportPenaltyFactorEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.groundingline.intrusion_distance",GroundinglineIntrusionDistanceEnum));
 
         iomodel->FindConstant(&requestedoutputs,&numoutputs,"md.masstransport.requested_outputs");
@@ -622 +624 @@
         bool        mainlyfloating;
         IssmDouble  fraction1,fraction2;
-        IssmDouble  Jdet,dt;
-        IssmDouble  ms,mb,gmb,fmb,thickness,fmb_pert;
+        IssmDouble  Jdet,dt,intrusiondist;
+        IssmDouble  ms,mb,gmb,fmb,thickness,fmb_pert,gldistance;
         IssmDouble  vx,vy,vel,dvxdx,dvydy,xi,h,tau;
         IssmDouble  dvx[2],dvy[2];
@@ -652 +654 @@
         element->FindParam(&dt,TimesteppingTimeStepEnum);
         element->FindParam(&stabilization,MasstransportStabilizationEnum);
+        element->FindParam(&intrusiondist,GroundinglineIntrusionDistanceEnum);
+
         Input* gmb_input        = element->GetInput(BasalforcingsGroundediceMeltingRateEnum);  _assert_(gmb_input);
         Input* fmb_input        = element->GetInput(BasalforcingsFloatingiceMeltingRateEnum);  _assert_(fmb_input);
@@ -660 +664 @@
         Input* vxaverage_input  = element->GetInput(VxAverageEnum);                                                                             _assert_(vxaverage_input);
         Input* vyaverage_input  = element->GetInput(VyAverageEnum);                                                                             _assert_(vyaverage_input);
-
+        //Input* gldistance_input = element->GetInput(DistanceToGroundinglineEnum);              _assert_(gldistance_input); 
         h=element->CharacteristicLength();
 
@@ -667 +671 @@
         if(melt_style==SubelementMelt2Enum){
                 element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
-           gauss = element->NewGauss(point1,fraction1,fraction2,3);
+            gauss = element->NewGauss(point1,fraction1,fraction2,3);
+        }
+        else if(melt_style==IntrusionMeltEnum){
+            element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+       gauss = element->NewGauss(point1,fraction1,fraction2,3);
         }
         else{
@@ -704 +712 @@
                         else mb=gmb;
                 }
+        else if(melt_style==IntrusionMeltEnum){
+                        Input* gldistance_input = element->GetInput(DistanceToGroundinglineEnum);              _assert_(gldistance_input); 
+                gldistance_input->GetInputValue(&gldistance,gauss);
+                        if (intrusiondist==0)
+                                if(gllevelset>0.) mb=gmb;
+                                else mb=fmb;
+                else if(gldistance>intrusiondist) 
+                                mb=gmb;
+                        else if(gldistance<=intrusiondist && gldistance>0) 
+                                mb=fmb*(1-gldistance/intrusiondist); 
+                        else
+                                mb=fmb;
+        }
                 else  _error_("melt interpolation "<<EnumToStringx(melt_style)<<" not implemented yet");
 
@@ -750 +771 @@
         bool mainlyfloating;
         IssmDouble  fraction1,fraction2,gllevelset;
-        IssmDouble  Jdet,dt;
-        IssmDouble  ms,mb,gmb,fmb,thickness,phi=1.;
+        IssmDouble  Jdet,dt,intrusiondist;
+        IssmDouble  ms,mb,gmb,fmb,thickness,phi=1.,gldistance;
         IssmDouble* xyz_list = NULL;
 
@@ -765 +786 @@
         element->FindParam(&dt,TimesteppingTimeStepEnum);
         element->FindParam(&melt_style,GroundinglineMeltInterpolationEnum);
+        element->FindParam(&intrusiondist,GroundinglineIntrusionDistanceEnum);
+
         Input* gmb_input        = element->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(gmb_input);
         Input* fmb_input        = element->GetInput(BasalforcingsFloatingiceMeltingRateEnum); _assert_(fmb_input);
@@ -778 +801 @@
       gauss = element->NewGauss(point1,fraction1,fraction2,3);
    }
+   else if(melt_style==IntrusionMeltEnum){
+            element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+       gauss = element->NewGauss(point1,fraction1,fraction2,3);
+        }
    else{
       gauss = element->NewGauss(3);
@@ -798 +825 @@
          else mb=(1-phi)*fmb+phi*gmb; // phi is the fraction of grounded ice so (1-phi) is floating
       }
-      else if(melt_style==SubelementMelt2Enum){
+        else if(melt_style==SubelementMelt2Enum){
          if(gllevelset>0.) mb=gmb;
          else mb=fmb;
       }
-      else if(melt_style==NoMeltOnPartiallyFloatingEnum){
+        else if(melt_style==NoMeltOnPartiallyFloatingEnum){
          if (phi<0.00000001) mb=fmb;
          else mb=gmb;
       }
-      else if(melt_style==FullMeltOnPartiallyFloatingEnum){
+        else if(melt_style==FullMeltOnPartiallyFloatingEnum){
          if (phi<0.99999999) mb=fmb;
          else mb=gmb;
-      }
-      else  _error_("melt interpolation "<<EnumToStringx(melt_style)<<" not implemented yet");
+        }
+                else if(melt_style==IntrusionMeltEnum){
+                        Input* gldistance_input = element->GetInput(DistanceToGroundinglineEnum);              _assert_(gldistance_input); 
+                gldistance_input->GetInputValue(&gldistance,gauss);
+                        if (intrusiondist==0)
+                                if(gllevelset>0.) mb=gmb;
+                                else mb=fmb;
+                else if(gldistance>intrusiondist) 
+                                mb=gmb;
+                        else if(gldistance<=intrusiondist && gldistance>0) 
+                                mb=fmb*(1-gldistance/intrusiondist); 
+                        else
+                                mb=fmb;
+        }
+        else  _error_("melt interpolation "<<EnumToStringx(melt_style)<<" not implemented yet");
 
                 for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb))*basis[i];

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 #include "./../../classes/Inputs/DatasetInput.h"
+#include "../InputDuplicatex/InputDuplicatex.h"
+
 
 void FloatingiceMeltingRatex(FemModel* femmodel){/*{{{*/
 
         /*Intermediaties*/
-        int  basalforcing_model;
+        int basalforcing_model;
+        int melt_style;
+
+        /*First, get melt_interpolation model from parameters*/
+    femmodel->parameters->FindParam(&melt_style,GroundinglineMeltInterpolationEnum);
+
+        switch(melt_style){
+        case IntrusionMeltEnum:
+                        if(VerboseSolution())_printf0_("          call Intrusion melting module\n");
+            DistanceToGroundingline(femmodel);
+            break;
+                default:
+            /*Nothing to be done*/
+            break;
+        }
 
         /*First, get BMB model from parameters*/
@@ -288 +304 @@
         xDelete<IssmDouble>(perturbation);
 }/*}}}*/
+
+void DistanceToGroundingline(FemModel* femmodel){/*{{{*/
+
+        int         numvertices;
+        IssmDouble* distances=NULL;
+
+        InputDuplicatex(femmodel,MaskOceanLevelsetEnum,DistanceToGroundinglineEnum);
+                femmodel->DistanceToFieldValue(MaskOceanLevelsetEnum,0.,DistanceToGroundinglineEnum);
+}
+/*}}}*/

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h

@@ -11 +11 @@
 /* local prototypes: */
 void FloatingiceMeltingRatex(FemModel* femmodel);
+
 void LinearFloatingiceMeltingRatex(FemModel* femmodel);
 void SpatialLinearFloatingiceMeltingRatex(FemModel* femmodel);
@@ -17 +18 @@
 void BeckmannGoosseFloatingiceMeltingRatex(FemModel* femmodel);
 void LinearFloatingiceMeltingRatearmax(FemModel* femmodel);
+void DistanceToGroundingline(FemModel* femmodel);
 
 #endif  /* _FloatingiceMeltingRatex_H*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -76 +76 @@
                 parameters->AddObject(iomodel->CopyConstantObject("md.groundingline.friction_interpolation",GroundinglineFrictionInterpolationEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.groundingline.melt_interpolation",GroundinglineMeltInterpolationEnum));
+                parameters->AddObject(iomodel->CopyConstantObject("md.groundingline.intrusion_distance",GroundinglineIntrusionDistanceEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.isstressbalance",TransientIsstressbalanceEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.ismasstransport",TransientIsmasstransportEnum));

issm/trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -868 +868 @@
 syn keyword cConstant FrontalForcingsSubglacialDischargeEnum
 syn keyword cConstant GeometryHydrostaticRatioEnum
+syn keyword cConstant GroundinglineIntrusionDistanceEnum
 syn keyword cConstant NGiaEnum
 syn keyword cConstant NGiaRateEnum
@@ -925 +926 @@
 syn keyword cConstant InversionVxObsEnum
 syn keyword cConstant InversionVyObsEnum
+syn keyword cConstant IntrusionMeltEnum
 syn keyword cConstant LevelsetfunctionSlopeXEnum
 syn keyword cConstant LevelsetfunctionSlopeYEnum

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

@@ -240 +240 @@
         GrdModelEnum,
         GroundinglineFrictionInterpolationEnum,
+        GroundinglineIntrusionDistanceEnum,
         GroundinglineMeltInterpolationEnum,
         GroundinglineMigrationEnum,
@@ -1739 +1740 @@
         SubelementFriction1Enum,
         SubelementFriction2Enum,
+        IntrusionMeltEnum,
         SubelementMelt1Enum,
         SubelementMelt2Enum,

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

@@ -870 +870 @@
                 case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge";
                 case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
+                case GroundinglineIntrusionDistanceEnum : return "GroundinglineIntrusionDistance";
                 case NGiaEnum : return "NGia";
                 case NGiaRateEnum : return "NGiaRate";
@@ -927 +928 @@
                 case InversionVxObsEnum : return "InversionVxObs";
                 case InversionVyObsEnum : return "InversionVyObs";
+                case IntrusionMeltEnum : return "IntrusionMelt";
                 case LevelsetfunctionSlopeXEnum : return "LevelsetfunctionSlopeX";
                 case LevelsetfunctionSlopeYEnum : return "LevelsetfunctionSlopeY";

issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim

@@ -861 +861 @@
 syn keyword juliaConstC FrontalForcingsSubglacialDischargeEnum
 syn keyword juliaConstC GeometryHydrostaticRatioEnum
+syn keyword juliaConstC GroundinglineIntrusionDistanceEnum
 syn keyword juliaConstC NGiaEnum
 syn keyword juliaConstC NGiaRateEnum
@@ -918 +919 @@
 syn keyword juliaConstC InversionVxObsEnum
 syn keyword juliaConstC InversionVyObsEnum
+syn keyword juliaConstC IntrusionMeltEnum
 syn keyword juliaConstC LevelsetfunctionSlopeXEnum
 syn keyword juliaConstC LevelsetfunctionSlopeYEnum

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

@@ -891 +891 @@
               else if (strcmp(name,"FrontalForcingsSubglacialDischarge")==0) return FrontalForcingsSubglacialDischargeEnum;
               else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
+              else if (strcmp(name,"GroundinglineIntrusionDistance")==0) return GroundinglineIntrusionDistanceEnum;
               else if (strcmp(name,"NGia")==0) return NGiaEnum;
               else if (strcmp(name,"NGiaRate")==0) return NGiaRateEnum;
@@ -948 +949 @@
               else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
               else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
+              else if (strcmp(name,"IntrusionMelt")==0) return IntrusionMeltEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
@@ -996 +998 @@
               else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
               else if (strcmp(name,"Sample")==0) return SampleEnum;
-              else if (strcmp(name,"SampleOld")==0) return SampleOldEnum;
-              else if (strcmp(name,"SampleNoise")==0) return SampleNoiseEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"SamplingBeta")==0) return SamplingBetaEnum;
+              if (strcmp(name,"SampleOld")==0) return SampleOldEnum;
+              else if (strcmp(name,"SampleNoise")==0) return SampleNoiseEnum;
+              else if (strcmp(name,"SamplingBeta")==0) return SamplingBetaEnum;
               else if (strcmp(name,"SamplingKappa")==0) return SamplingKappaEnum;
               else if (strcmp(name,"SamplingPhi")==0) return SamplingPhiEnum;
@@ -1119 +1121 @@
               else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
               else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
-              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
-              else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
+              if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
+              else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
+              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
               else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
               else if (strcmp(name,"SmbEC")==0) return SmbECEnum;
@@ -1242 +1244 @@
               else if (strcmp(name,"SubglacialdischargeValuesMovingaverage")==0) return SubglacialdischargeValuesMovingaverageEnum;
               else if (strcmp(name,"SurfaceAbsMisfit")==0) return SurfaceAbsMisfitEnum;
-              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
-              else if (strcmp(name,"Area")==0) return AreaEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"SealevelArea")==0) return SealevelAreaEnum;
+              if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
+              else if (strcmp(name,"Area")==0) return AreaEnum;
+              else if (strcmp(name,"SealevelArea")==0) return SealevelAreaEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
               else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
@@ -1365 +1367 @@
               else if (strcmp(name,"Outputdefinition53")==0) return Outputdefinition53Enum;
               else if (strcmp(name,"Outputdefinition54")==0) return Outputdefinition54Enum;
-              else if (strcmp(name,"Outputdefinition55")==0) return Outputdefinition55Enum;
-              else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum;
+              if (strcmp(name,"Outputdefinition55")==0) return Outputdefinition55Enum;
+              else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
+              else if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum;
               else if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum;
               else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum;
@@ -1488 +1490 @@
               else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
               else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
-              else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
-              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
          else stage=13;
    }
    if(stage==13){
-              if (strcmp(name,"DataSet")==0) return DataSetEnum;
+              if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
+              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
+              else if (strcmp(name,"DataSet")==0) return DataSetEnum;
               else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum;
               else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
@@ -1611 +1613 @@
               else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
               else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
-              else if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
-              else if (strcmp(name,"LinearFloatingMeltRatearma")==0) return LinearFloatingMeltRatearmaEnum;
          else stage=14;
    }
    if(stage==14){
-              if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
+              if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
+              else if (strcmp(name,"LinearFloatingMeltRatearma")==0) return LinearFloatingMeltRatearmaEnum;
+              else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
               else if (strcmp(name,"Loads")==0) return LoadsEnum;
               else if (strcmp(name,"LoveAnalysis")==0) return LoveAnalysisEnum;
@@ -1734 +1736 @@
               else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum;
               else if (strcmp(name,"SMBgradientscomponents")==0) return SMBgradientscomponentsEnum;
-              else if (strcmp(name,"SMBgradientsela")==0) return SMBgradientselaEnum;
-              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
          else stage=15;
    }
    if(stage==15){
-              if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
+              if (strcmp(name,"SMBgradientsela")==0) return SMBgradientselaEnum;
+              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
+              else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
               else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
               else if (strcmp(name,"SMBpddSicopolis")==0) return SMBpddSicopolisEnum;

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

@@ -9 +9 @@
                 friction_interpolation = '';
                 melt_interpolation     = '';
+                intrusion_distance     = 0;
                 requested_outputs      = {};
         end
@@ -26 +27 @@
                         self.friction_interpolation= 'SubelementFriction1';
                         self.melt_interpolation    = 'NoMeltOnPartiallyFloating';
+                        self.intrusion_distance    = 0;
                         %default output
-         self.requested_outputs     = {'default'};
+                self.requested_outputs     = {'default'};
 
                 end % }}}
@@ -34 +36 @@
                         md = checkfield(md,'fieldname','groundingline.migration','values',{'None' 'SubelementMigration' 'AggressiveMigration' 'SoftMigration' 'Contact' 'GroundingOnly'});
                         md = checkfield(md,'fieldname','groundingline.friction_interpolation','values',{'NoFrictionOnPartiallyFloating' 'SubelementFriction1' 'SubelementFriction2'});
-                        md = checkfield(md,'fieldname','groundingline.melt_interpolation','values',{'NoMeltOnPartiallyFloating' 'SubelementMelt1' 'SubelementMelt2' 'FullMeltOnPartiallyFloating'});
+                        md = checkfield(md,'fieldname','groundingline.melt_interpolation','values',{'NoMeltOnPartiallyFloating' 'SubelementMelt1' 'SubelementMelt2' 'IntrusionMelt' 'FullMeltOnPartiallyFloating'});
+                        md = checkfield(md,'fieldname','groundingline.intrusion_distance','>=',0); 
                         md = checkfield(md,'fieldname','groundingline.requested_outputs','stringrow',1);
 
@@ -61 +64 @@
                         fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''SubelementMigration'',''AggressiveMigration'',''Contact'' or ''None''');
                         fielddisplay(self,'friction_interpolation','type of friction interpolation for partially floating elements: ''NoFrictionOnPartiallyFloating'',''SubelementFriction1'', or ''SubelementFriction2''');
-                        fielddisplay(self,'melt_interpolation','type of melt interpolation for partially floating elements: ''NoMeltOnPartiallyFloating'',''SubelementMelt1'',''SubelementMelt2'', or ''FullMeltOnPartiallyFloating''');
+                        fielddisplay(self,'melt_interpolation','type of melt interpolation for partially floating elements: ''NoMeltOnPartiallyFloating'',''SubelementMelt1'',''SubelementMelt2'',''IntrusionMelt'' or ''FullMeltOnPartiallyFloating''');
+                        fielddisplay(self,'intrusion_distance','distance of seawater intrusion from grounding line [m]');
                         fielddisplay(self,'requested_outputs','additional outputs requested');
 
@@ -69 +73 @@
                         WriteData(fid,prefix,'data',self.friction_interpolation,'name','md.groundingline.friction_interpolation','format','String');
                         WriteData(fid,prefix,'data',self.melt_interpolation,'name','md.groundingline.melt_interpolation','format','String');
+                        WriteData(fid,prefix,'object',self,'fieldname','intrusion_distance','format','Double');
                         
                         %process requested outputs