Changeset 28036

Timestamp:

12/25/23 00:04:06 (15 months ago)

Author:

inwoo

Message:

CHG: The SMBsemic module uses the surface mass balance = SMB_ice + SMB_snow, not solely SMB_ice. Also, the term "SurfaceMassBalanceSemicEnum" is removed from Enum field.

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/Element.cpp (modified) (2 diffs)
• c/shared/Enum/Enum.vim (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/Enumjl.vim (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (6 diffs)
• m/classes/SMBsemic.m (modified) (2 diffs)
• m/classes/SMBsemic.py (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -4831 +4831 @@
                  w.e. : water equivalenet.
                  */
-                smb_out[iv]  = smb_out[iv]*yts;  // w.e. m/sec -> m/yr
-                smbi_out[iv] = smbi_out[iv]*rho_water/rho_ice; // w.e. m/sec -> ice m/yr
-                smbs_out[iv] = smbs_out[iv]*yts; // w.e. m/sec -> m/yr
-                saccu_out[iv] = saccu_out[iv]*yts; // w.e. m/sec -> m/yr
+                smb_out[iv]  = smb_out[iv]*rho_water/rho_ice;      // w.e. m/sec -> ice m/yr
+                smbi_out[iv] = smbi_out[iv]*rho_water/rho_ice*yts; // w.e. m/sec -> ice m/yr
+                smbs_out[iv] = smbs_out[iv]*rho_water/rho_ice*yts; // w.e. m/sec -> ice m/yr
+                saccu_out[iv] = saccu_out[iv]*rho_water/rho_ice*yts; // w.e. m/sec -> ice m/yr
                 smelt_out[iv] = smelt_out[iv]*rho_water/rho_ice; // w.e. m/sec -> ice m/yr
                 refr_out[iv]  = refr_out[iv]*rho_water/rho_ice; // w.e. m/sec -> ice m/yr
@@ -4853 +4853 @@
                         //this->AddInput(SmbMassBalanceTotalEnum,&smb_out[0],P1DGEnum);
                         // water equivalent SMB ice to ice equivalent.
-                        this->AddInput(SmbMassBalanceEnum,     &smbi_out[0],P1DGEnum);
+                        this->AddInput(SmbMassBalanceEnum,     &smb_out[0],P1DGEnum);
                         this->AddInput(SmbMassBalanceIceEnum,  &smbi_out[0],P1DGEnum);
                         this->AddInput(SmbMassBalanceSnowEnum, &smbs_out[0],P1DGEnum);
-                        this->AddInput(SmbMassBalanceSemicEnum,&smb_out[0],P1DGEnum);
                         //this->AddInput(SmbMassBalanceSnowEnum,&smbs_out[0],P1DGEnum);
                         // saccu - accumulation of snow.

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

@@ -1115 +1115 @@
 syn keyword cConstant SmbMassBalanceSnowEnum
 syn keyword cConstant SmbMassBalanceIceEnum
-syn keyword cConstant SmbMassBalanceSemicEnum
 syn keyword cConstant SmbMassBalanceSubstepEnum
 syn keyword cConstant SmbMassBalanceTransientEnum

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

@@ -1111 +1111 @@
         SmbMassBalanceSnowEnum,
         SmbMassBalanceIceEnum,
-        SmbMassBalanceSemicEnum,
    SmbMassBalanceSubstepEnum,
    SmbMassBalanceTransientEnum,

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

@@ -1117 +1117 @@
                 case SmbMassBalanceSnowEnum : return "SmbMassBalanceSnow";
                 case SmbMassBalanceIceEnum : return "SmbMassBalanceIce";
-                case SmbMassBalanceSemicEnum : return "SmbMassBalanceSemic";
                 case SmbMassBalanceSubstepEnum : return "SmbMassBalanceSubstep";
                 case SmbMassBalanceTransientEnum : return "SmbMassBalanceTransient";

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

@@ -1108 +1108 @@
 syn keyword juliaConstC SmbMassBalanceSnowEnum
 syn keyword juliaConstC SmbMassBalanceIceEnum
-syn keyword juliaConstC SmbMassBalanceSemicEnum
 syn keyword juliaConstC SmbMassBalanceSubstepEnum
 syn keyword juliaConstC SmbMassBalanceTransientEnum

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

@@ -1144 +1144 @@
               else if (strcmp(name,"SmbMassBalanceSnow")==0) return SmbMassBalanceSnowEnum;
               else if (strcmp(name,"SmbMassBalanceIce")==0) return SmbMassBalanceIceEnum;
-              else if (strcmp(name,"SmbMassBalanceSemic")==0) return SmbMassBalanceSemicEnum;
               else if (strcmp(name,"SmbMassBalanceSubstep")==0) return SmbMassBalanceSubstepEnum;
               else if (strcmp(name,"SmbMassBalanceTransient")==0) return SmbMassBalanceTransientEnum;
@@ -1244 +1243 @@
               else if (strcmp(name,"SealevelArea")==0) return SealevelAreaEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
+              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
-              else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
+              if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
               else if (strcmp(name,"Surface")==0) return SurfaceEnum;
               else if (strcmp(name,"SurfaceOld")==0) return SurfaceOldEnum;
@@ -1367 +1366 @@
               else if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum;
               else if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum;
+              else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum;
-              else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum;
+              if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum;
               else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
               else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
@@ -1490 +1489 @@
               else if (strcmp(name,"DataSet")==0) return DataSetEnum;
               else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum;
+              else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
          else stage=13;
    }
    if(stage==13){
-              if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
-              else if (strcmp(name,"DebrisAnalysis")==0) return DebrisAnalysisEnum;
+              if (strcmp(name,"DebrisAnalysis")==0) return DebrisAnalysisEnum;
               else if (strcmp(name,"DebrisSolution")==0) return DebrisSolutionEnum;
               else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
@@ -1613 +1612 @@
               else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
               else if (strcmp(name,"Loads")==0) return LoadsEnum;
+              else if (strcmp(name,"LoveAnalysis")==0) return LoveAnalysisEnum;
          else stage=14;
    }
    if(stage==14){
-              if (strcmp(name,"LoveAnalysis")==0) return LoveAnalysisEnum;
-              else if (strcmp(name,"LoveHf")==0) return LoveHfEnum;
+              if (strcmp(name,"LoveHf")==0) return LoveHfEnum;
               else if (strcmp(name,"LoveHt")==0) return LoveHtEnum;
               else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
@@ -1736 +1735 @@
               else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
               else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
+              else if (strcmp(name,"SMBpddSicopolis")==0) return SMBpddSicopolisEnum;
          else stage=15;
    }
    if(stage==15){
-              if (strcmp(name,"SMBpddSicopolis")==0) return SMBpddSicopolisEnum;
-              else if (strcmp(name,"SMBsemic")==0) return SMBsemicEnum;
+              if (strcmp(name,"SMBsemic")==0) return SMBsemicEnum;
               else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
               else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;

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

@@ -90 +90 @@
                         if self.ismethod == 1
                                 list = {'default','SmbMassBalance','SmbMassBalanceSnow','SmbMassBalanceIce',...
-                                        'SmbMassBalanceSemic','SmbMelt','SmbRefreeze','SmbAccumulation',...
+                                        'SmbMelt','SmbRefreeze','SmbAccumulation',...
                                         'SmbHIce','SmbHSnow','SmbAlbedo','SmbAlbedoSnow','TemperatureSEMIC',...
                                         'SmbSemicQmr','TotalSmb','TotalSmbMelt','TotalSmbRefreeze'};
@@ -172 +172 @@
                                 md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','smb.rdl','>=',0,'numel',1);
-                                md = checkfield(md,'fieldname','smb.dailysnowfall','timeseries',1,'NaN',1,'Inf',1);
-                                md = checkfield(md,'fieldname','smb.dailyrainfall','timeseries',1,'NaN',1,'Inf',1);
-                                md = checkfield(md,'fieldname','smb.dailydsradiation','timeseries',1,'NaN',1,'Inf',1);
-                                md = checkfield(md,'fieldname','smb.dailydlradiation','timeseries',1,'NaN',1,'Inf',1);
-                                md = checkfield(md,'fieldname','smb.dailywindspeed','timeseries',1,'NaN',1,'Inf',1);
-                                md = checkfield(md,'fieldname','smb.dailypressure','timeseries',1,'NaN',1,'Inf',1);
-                                md = checkfield(md,'fieldname','smb.dailyairdensity','timeseries',1,'NaN',1,'Inf',1);
-                                md = checkfield(md,'fieldname','smb.dailyairhumidity','timeseries',1,'NaN',1,'Inf',1);
-                                md = checkfield(md,'fieldname','smb.dailytemperature','timeseries',1,'NaN',1,'Inf',1);
+                                md = checkfield(md,'fieldname','smb.dailysnowfall','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','smb.dailyrainfall','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','smb.dailydsradiation','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','smb.dailydlradiation','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','smb.dailywindspeed','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','smb.dailypressure','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','smb.dailyairdensity','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','smb.dailyairhumidity','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','smb.dailytemperature','timeseries',1,'NaN',1,'Inf',1,'>=',0);
 
                                 % TODO: transient model should be merged with SEMIC developed by Ruckamp et al. (2018)

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

@@ -173 +173 @@
         if self.ismethod:
             list = ['default','SmbMassBalance', 'SmbMassBalanceSnow', 'SmbMassBalanceIce',
-                  'SmbMassBalanceSemic', 'SmbMelt', 'SmbRefreeze','SmbAccumulation',
+                  'SmbMelt', 'SmbRefreeze','SmbAccumulation',
                   'SmbHIce', 'SmbHSnow', 'SmbAlbedo', 'SmbAlbedoSnow', 'TemperatureSEMIC',
                   'SmbSemicQmr', 'TotalSmb', 'TotalSmbMelt', 'TotalSmbRefreeze']
@@ -237 +237 @@
             md = checkfield(md, 'fieldname', 'smb.desfac', '<=', 1, 'numel', 1)
             md = checkfield(md, 'fieldname', 'smb.s0gcm', '>=', 0, 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices, 1])
-            md = checkfield(md, 'fieldname', 'smb.rlaps', '>=', 0, 'numel', 1)
-            md = checkfield(md, 'fieldname', 'smb.rdl', '>=', 0, 'numel', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailysnowfall', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailyrainfall', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailydsradiation', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailydlradiation', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailywindspeed', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailypressure', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailyairdensity', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailyairhumidity', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-            md = checkfield(md, 'fieldname', 'smb.dailytemperature', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
+            md = checkfield(md, 'fieldname', 'smb.rlaps', '>=', 0, 'numel', 1);
+            md = checkfield(md, 'fieldname', 'smb.rdl', '>=', 0, 'numel', 1);
+            md = checkfield(md, 'fieldname', 'smb.dailysnowfall','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+            md = checkfield(md, 'fieldname', 'smb.dailyrainfall','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+            md = checkfield(md, 'fieldname', 'smb.dailydsradiation','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+            md = checkfield(md, 'fieldname', 'smb.dailydlradiation','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+            md = checkfield(md, 'fieldname', 'smb.dailywindspeed','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+            md = checkfield(md, 'fieldname', 'smb.dailypressure','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+            md = checkfield(md, 'fieldname', 'smb.dailyairdensity','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+            md = checkfield(md, 'fieldname', 'smb.dailyairhumidity','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+            md = checkfield(md, 'fieldname', 'smb.dailytemperature','timeseries',1,'NaN',1,'Inf',1,'>=',0);
 
             # TODO: transient model should be merged with SEMIC developed by Ruckamp et al. (2018)