Changeset 24259

Timestamp:

10/18/19 10:53:54 (6 years ago)

Author:

Eric.Larour

Message:

CHG: introducing hydro_rate (similar to steric_rate) for hydrological fingerprints.

Location:

issm/trunk-jpl/src

Files:

• c/analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• c/cores/sealevelrise_core.cpp (modified) (5 diffs)
• c/shared/Enum/Enum.vim (modified) (12 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (6 diffs)
• c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)
• m/classes/slr.m (modified) (6 diffs)

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

@@ -53 +53 @@
         iomodel->FetchDataToInput(elements,"md.slr.Ugia",SealevelUGiaRateEnum);
         iomodel->FetchDataToInput(elements,"md.slr.steric_rate",SealevelriseStericRateEnum);
+        iomodel->FetchDataToInput(elements,"md.slr.hydro_rate",SealevelriseHydroRateEnum);
 
         /*Initialize cumdeltalthickness and sealevel rise rate input*/

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

@@ -225 +225 @@
         Vector<IssmDouble> *SL  = NULL; 
         Vector<IssmDouble> *steric_rate_g  = NULL; 
+        Vector<IssmDouble> *hydro_rate_g  = NULL; 
         Vector<IssmDouble> *U_esa_rate= NULL;
         Vector<IssmDouble> *N_esa_rate= NULL;
@@ -255 +256 @@
         GetVectorFromInputsx(&SL,femmodel,SealevelEnum,VertexSIdEnum);
         GetVectorFromInputsx(&steric_rate_g,femmodel,SealevelriseStericRateEnum,VertexSIdEnum);
+        GetVectorFromInputsx(&hydro_rate_g,femmodel,SealevelriseHydroRateEnum,VertexSIdEnum);
         if(geodetic){
                 GetVectorFromInputsx(&U_esa_rate,femmodel,SealevelUEsaRateEnum,VertexSIdEnum);
@@ -262 +264 @@
         }
 
-        /*compute: sea level change = initial sea level + (N_gia_rate+N_esa_rate)  * dt + steric_rate * dt*/
+        /*compute: sea level change = initial sea level + (N_gia_rate+N_esa_rate)  * dt + steric_rate + hydro_rate* dt*/
         if(geodetic){
                 SL->AXPY(N_gia_rate,dt);
@@ -268 +270 @@
         }
         SL->AXPY(steric_rate_g,dt);
+        SL->AXPY(hydro_rate_g,dt);
 
         /*compute new bedrock position: */
@@ -283 +286 @@
         delete SL;
         delete steric_rate_g;
+        delete hydro_rate_g;
         if(geodetic){
                 delete U_esa_rate;

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

@@ -663 +663 @@
 syn keyword cConstant SealevelriseSpcthicknessEnum
 syn keyword cConstant SealevelriseStericRateEnum
+syn keyword cConstant SealevelriseHydroRateEnum
 syn keyword cConstant SedimentHeadEnum
 syn keyword cConstant SedimentHeadOldEnum
@@ -1303 +1304 @@
 syn keyword cType Cfsurfacesquare
 syn keyword cType Channel
-syn keyword cType classes
 syn keyword cType Constraint
 syn keyword cType Constraints
@@ -1310 +1310 @@
 syn keyword cType ControlInput
 syn keyword cType Covertree
+syn keyword cType DataSetParam
 syn keyword cType DatasetInput
-syn keyword cType DataSetParam
 syn keyword cType Definition
 syn keyword cType DependentObject
@@ -1324 +1324 @@
 syn keyword cType ElementHook
 syn keyword cType ElementMatrix
+syn keyword cType ElementVector
 syn keyword cType Elements
-syn keyword cType ElementVector
 syn keyword cType ExponentialVariogram
 syn keyword cType ExternalResult
@@ -1332 +1332 @@
 syn keyword cType Friction
 syn keyword cType Gauss
-syn keyword cType GaussianVariogram
-syn keyword cType gaussobjects
 syn keyword cType GaussPenta
 syn keyword cType GaussSeg
 syn keyword cType GaussTetra
 syn keyword cType GaussTria
+syn keyword cType GaussianVariogram
 syn keyword cType GenericExternalResult
 syn keyword cType GenericOption
@@ -1352 +1351 @@
 syn keyword cType IssmDirectApplicInterface
 syn keyword cType IssmParallelDirectApplicInterface
-syn keyword cType krigingobjects
 syn keyword cType Load
 syn keyword cType Loads
@@ -1363 +1361 @@
 syn keyword cType Matice
 syn keyword cType Matlitho
-syn keyword cType matrixobjects
 syn keyword cType MatrixParam
 syn keyword cType Misfit
@@ -1376 +1373 @@
 syn keyword cType Observations
 syn keyword cType Option
+syn keyword cType OptionUtilities
 syn keyword cType Options
-syn keyword cType OptionUtilities
 syn keyword cType Param
 syn keyword cType Parameters
@@ -1391 +1388 @@
 syn keyword cType Regionaloutput
 syn keyword cType Results
+syn keyword cType RiftStruct
 syn keyword cType Riftfront
-syn keyword cType RiftStruct
 syn keyword cType Seg
 syn keyword cType SegInput
+syn keyword cType SegRef
 syn keyword cType Segment
-syn keyword cType SegRef
 syn keyword cType SpcDynamic
 syn keyword cType SpcStatic
@@ -1403 +1400 @@
 syn keyword cType StringArrayParam
 syn keyword cType StringParam
-syn keyword cType temp
 syn keyword cType Tetra
 syn keyword cType TetraInput
@@ -1417 +1413 @@
 syn keyword cType Vertex
 syn keyword cType Vertices
+syn keyword cType classes
+syn keyword cType gaussobjects
+syn keyword cType krigingobjects
+syn keyword cType matrixobjects
 syn keyword cType AdjointBalancethickness2Analysis
 syn keyword cType AdjointBalancethicknessAnalysis
@@ -1435 +1435 @@
 syn keyword cType FreeSurfaceBaseAnalysis
 syn keyword cType FreeSurfaceTopAnalysis
+syn keyword cType GLheightadvectionAnalysis
 syn keyword cType GiaIvinsAnalysis
-syn keyword cType GLheightadvectionAnalysis
 syn keyword cType HydrologyDCEfficientAnalysis
 syn keyword cType HydrologyDCInefficientAnalysis

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

@@ -659 +659 @@
         SealevelriseSpcthicknessEnum,
         SealevelriseStericRateEnum,
+        SealevelriseHydroRateEnum,
    SedimentHeadEnum,
    SedimentHeadOldEnum,

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

@@ -665 +665 @@
                 case SealevelriseSpcthicknessEnum : return "SealevelriseSpcthickness";
                 case SealevelriseStericRateEnum : return "SealevelriseStericRate";
+                case SealevelriseHydroRateEnum : return "SealevelriseHydroRate";
                 case SedimentHeadEnum : return "SedimentHead";
                 case SedimentHeadOldEnum : return "SedimentHeadOld";

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

@@ -680 +680 @@
               else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
               else if (strcmp(name,"SealevelriseStericRate")==0) return SealevelriseStericRateEnum;
+              else if (strcmp(name,"SealevelriseHydroRate")==0) return SealevelriseHydroRateEnum;
               else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
               else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
@@ -751 +752 @@
               else if (strcmp(name,"SmbRefreeze")==0) return SmbRefreezeEnum;
               else if (strcmp(name,"SmbReini")==0) return SmbReiniEnum;
-              else if (strcmp(name,"SmbRunoff")==0) return SmbRunoffEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"SmbRunoffSubstep")==0) return SmbRunoffSubstepEnum;
+              if (strcmp(name,"SmbRunoff")==0) return SmbRunoffEnum;
+              else if (strcmp(name,"SmbRunoffSubstep")==0) return SmbRunoffSubstepEnum;
               else if (strcmp(name,"SmbRunoffTransient")==0) return SmbRunoffTransientEnum;
               else if (strcmp(name,"SmbS0gcm")==0) return SmbS0gcmEnum;
@@ -874 +875 @@
               else if (strcmp(name,"Outputdefinition36")==0) return Outputdefinition36Enum;
               else if (strcmp(name,"Outputdefinition37")==0) return Outputdefinition37Enum;
-              else if (strcmp(name,"Outputdefinition38")==0) return Outputdefinition38Enum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"Outputdefinition39")==0) return Outputdefinition39Enum;
+              if (strcmp(name,"Outputdefinition38")==0) return Outputdefinition38Enum;
+              else if (strcmp(name,"Outputdefinition39")==0) return Outputdefinition39Enum;
               else if (strcmp(name,"Outputdefinition3")==0) return Outputdefinition3Enum;
               else if (strcmp(name,"Outputdefinition40")==0) return Outputdefinition40Enum;
@@ -997 +998 @@
               else if (strcmp(name,"ControlInputGrad")==0) return ControlInputGradEnum;
               else if (strcmp(name,"ControlInputMaxs")==0) return ControlInputMaxsEnum;
-              else if (strcmp(name,"ControlInputMins")==0) return ControlInputMinsEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"ControlInputValues")==0) return ControlInputValuesEnum;
+              if (strcmp(name,"ControlInputMins")==0) return ControlInputMinsEnum;
+              else if (strcmp(name,"ControlInputValues")==0) return ControlInputValuesEnum;
               else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
               else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
@@ -1120 +1121 @@
               else if (strcmp(name,"LoveAnalysis")==0) return LoveAnalysisEnum;
               else if (strcmp(name,"LoveHi")==0) return LoveHiEnum;
-              else if (strcmp(name,"LoveHr")==0) return LoveHrEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
+              if (strcmp(name,"LoveHr")==0) return LoveHrEnum;
+              else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
               else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum;
               else if (strcmp(name,"LoveKi")==0) return LoveKiEnum;
@@ -1243 +1244 @@
               else if (strcmp(name,"SegInput")==0) return SegInputEnum;
               else if (strcmp(name,"Segment")==0) return SegmentEnum;
-              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"Separate")==0) return SeparateEnum;
+              if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
+              else if (strcmp(name,"Separate")==0) return SeparateEnum;
               else if (strcmp(name,"Seq")==0) return SeqEnum;
               else if (strcmp(name,"SmbAnalysis")==0) return SmbAnalysisEnum;

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

@@ -173 +173 @@
                 fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
         }
+        else if(strcmp(string_in,"SealevelriseStericRate")==0){
+                const char* field = "md.slr.steric_rate";
+                input_enum        = SealevelriseStericRateEnum;
+                fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
+        }
+        else if(strcmp(string_in,"SealevelriseHydroRate")==0){
+                const char* field = "md.slr.hydro_rate";
+                input_enum        = SealevelriseHydroRateEnum;
+                fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
+        }
         else if(strcmp(string_in,"SealevelUGiaRate")==0){
                 const char* field = "md.slr.Ugia";

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

@@ -26 +26 @@
                 ocean_area_scaling     = 0;
                 steric_rate            = 0; %rate of ocean expansion from steric effects.
+                hydro_rate             = 0; %rate of steric expansion from hydrological effects.
                 geodetic_run_frequency = 1; %how many time steps we skip before we run the geodetic part of the solver during transient
                 geodetic               = 0; %compute geodetic SLR? (in addition to steric?)
@@ -81 +82 @@
                 %steric: 
                 self.steric_rate=0;
+                self.hydro_rate=0;
         
                 %how many time steps we skip before we run SLR solver during transient
@@ -115 +117 @@
                         md = checkfield(md,'fieldname','slr.geodetic_run_frequency','size',[1 1],'>=',1);
                         md = checkfield(md,'fieldname','slr.steric_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','slr.hydro_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','slr.degacc','size',[1 1],'>=',1e-10);
                         md = checkfield(md,'fieldname','slr.requested_outputs','stringrow',1);
@@ -174 +177 @@
                         fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]'); 
                         fielddisplay(self,'steric_rate','rate of steric ocean expansion (in mm/yr)'); 
+                        fielddisplay(self,'hydro_rate','rate of hydrological expansion (in mm/yr)'); 
                         fielddisplay(self,'Ngia','rate of viscous (GIA) geoid expansion (in mm/yr)'); 
                         fielddisplay(self,'Ugia','rate of viscous (GIA) bedrock uplift (in mm/yr)'); 
@@ -210 +214 @@
                         WriteData(fid,prefix,'object',self,'fieldname','ocean_area_scaling','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','geodetic_run_frequency','format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','steric_rate','format','DoubleMat','mattype',1,'scale',1e-3/md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','steric_rate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1e-3/md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','hydro_rate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1e-3/md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','Ngia','format','DoubleMat','mattype',1,'scale',1e-3/md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','Ugia','format','DoubleMat','mattype',1,'scale',1e-3/md.constants.yts);
@@ -252 +257 @@
                         writejsdouble(fid,[modelname '.slr.geodetic_run_frequency'],self.geodetic_run_frequency);
                         writejs1Darray(fid,[modelname '.slr.steric_rate'],self.steric_rate);
+                        writejs1Darray(fid,[modelname '.slr.hydro_rate'],self.hydro_rate);
                         writejsdouble(fid,[modelname '.slr.degacc'],self.degacc);
                         writejscellstring(fid,[modelname '.slr.requested_outputs'],self.requested_outputs);