Index: /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp (revision 22474) +++ /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp (revision 22475) @@ -178,4 +178,5 @@ parameters->AddObject(iomodel->CopyConstantObject("md.smb.isturbulentflux",SmbIsturbulentfluxEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.smb.InitDensityScaling",SmbInitDensityScalingEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.smb.ThermoDeltaTScaling",SmbThermoDeltaTScalingEnum)); break; case SMBpddEnum: Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 22474) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 22475) @@ -2605,4 +2605,5 @@ bool isgraingrowth,isalbedo,isshortwave,isthermal,isaccumulation,ismelt,isdensification,isturbulentflux; IssmDouble init_scaling=0.0; + IssmDouble thermo_scaling=1.0; /*}}}*/ @@ -2666,4 +2667,5 @@ parameters->FindParam(&isturbulentflux,SmbIsturbulentfluxEnum); parameters->FindParam(&init_scaling,SmbInitDensityScalingEnum); + parameters->FindParam(&thermo_scaling,SmbThermoDeltaTScalingEnum); /*}}}*/ @@ -2849,5 +2851,5 @@ /*Thermal profile computation:*/ - if(isthermal)thermo(&EC, &T, dz, d, swf, dlw, Ta, V, eAir, pAir, teValue, W[0], smb_dt, m, Vz, Tz,rho_ice,this->Sid()); + if(isthermal)thermo(&EC, &T, dz, d, swf, dlw, Ta, V, eAir, pAir, teValue, W[0], smb_dt, m, Vz, Tz, thermo_scaling,rho_ice,this->Sid()); /*Change in thickness of top cell due to evaporation/condensation assuming same density as top cell. Index: /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp (revision 22474) +++ /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp (revision 22475) @@ -345,9 +345,10 @@ // 3 : density and cloud amount (Greuell & Konzelmann, 1994) // 4 : exponential time decay & wetness (Bougamont & Bamber, 2005) + // 5 : ingest MODIS mode, direct input from aValue parameter applied to surface ice only //// Inputs // aIdx = albedo method to use - // Method 0 + // Method 0 & 5 // aValue = direct input value for albedo @@ -495,5 +496,8 @@ } - else _error_("albedo method switch should range from 0 to 4!"); + else if(aIdx==5){ + for(int i=0;i 1/2) [s] - // NS: 2.16.18 divided dt by 11 for stability (changed 3 to 33) + // NS: 2.16.18 divided dt by scaling factor, default set to 1/11 for stability dt=1e12; - for(int i=0;i 1/2 @@ -1171,5 +1176,5 @@ // adjust a, re, gdn & gsp - if(aIdx>0)a[0] = (aSnow * P + a[0] * mInit[0])/mass; + if(aIdx>0 | aIdx!=5 | (aIdx==5 & !(dIce - d[0]=',0,'<=',1); - md = checkfield(md,'fieldname','smb.aIdx','NaN',1,'Inf',1,'values',[0,1,2,3,4]); + md = checkfield(md,'fieldname','smb.aIdx','NaN',1,'Inf',1,'values',[0,1,2,3,4,5]); md = checkfield(md,'fieldname','smb.swIdx','NaN',1,'Inf',1,'values',[0,1]); md = checkfield(md,'fieldname','smb.denIdx','NaN',1,'Inf',1,'values',[1,2,3,4,5]); @@ -216,4 +222,5 @@ md = checkfield(md,'fieldname','smb.outputFreq','NaN',1,'Inf',1,'>',0,'<',10*365); %10 years max md = checkfield(md,'fieldname','smb.InitDensityScaling','NaN',1,'Inf',1,'>=',0,'<=',1); + md = checkfield(md,'fieldname','smb.ThermoDeltaTScaling','NaN',1,'Inf',1,'>=',0,'<=',1); switch self.aIdx, @@ -269,11 +276,13 @@ fielddisplay(self,'zY','strech grid cells bellow top_z by a [top_dz * y ^ (cells bellow top_z)]'); fielddisplay(self,'InitDensityScaling',{'initial scaling factor multiplying the density of ice','which describes the density of the snowpack.'}); + fielddisplay(self,'ThermoDeltaTScaling',{'scaling factor to multiply the thermal diffusion timestep (delta t)'}); fielddisplay(self,'outputFreq','output frequency in days (default is monthly, 30)'); fielddisplay(self,'aIdx',{'method for calculating albedo and subsurface absorption (default is 1)',... - '0: direct input from aValue parameter',... - '1: effective grain radius [Gardner & Sharp, 2009]',... - '2: effective grain radius [Brun et al., 2009]',... - '3: density and cloud amount [Greuell & Konzelmann, 1994]',... - '4: exponential time decay & wetness [Bougamont & Bamber, 2005]'}); + '0: direct input from aValue parameter',... + '1: effective grain radius [Gardner & Sharp, 2009]',... + '2: effective grain radius [Brun et al., 2009]',... + '3: density and cloud amount [Greuell & Konzelmann, 1994]',... + '4: exponential time decay & wetness [Bougamont & Bamber, 2005]',... + '5: ingest MODIS mode, direct input from aValue parameter applied to surface ice only'}); fielddisplay(self,'teValue','Outward longwave radiation thermal emissivity forcing at every element (default in code is 1)'); @@ -294,6 +303,6 @@ %additional albedo parameters: switch self.aIdx - case 0 - fielddisplay(self,'aValue','Albedo forcing at every element. Used only if aIdx == 0.'); + case {0 5} + fielddisplay(self,'aValue','Albedo forcing at every element. Used only if aIdx == {0,5}.'); case {1 2} fielddisplay(self,'aSnow','new snow albedo (0.64 - 0.89)'); @@ -356,4 +365,5 @@ WriteData(fid,prefix,'object',self,'class','smb','fieldname','denIdx','format','Integer'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','InitDensityScaling','format','Double'); + WriteData(fid,prefix,'object',self,'class','smb','fieldname','ThermoDeltaTScaling','format','Double'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','outputFreq','format','Double'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','aSnow','format','Double'); Index: /issm/trunk-jpl/src/m/classes/SMBgemb.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBgemb.py (revision 22474) +++ /issm/trunk-jpl/src/m/classes/SMBgemb.py (revision 22475) @@ -66,4 +66,6 @@ # 3: density and cloud amount [Greuell & Konzelmann, 1994] # 4: exponential time decay & wetness [Bougamont & Bamber, 2005] + # 5: ingest MODIS mode, direct input from aValue parameter applied to surface ice only + swIdx = float('NaN') # apply all SW to top grid cell (0) or allow SW to penetrate surface (1) (default 1) @@ -96,4 +98,7 @@ #densities: InitDensityScaling = float('NaN') #initial scaling factor multiplying the density of ice, which describes the density of the snowpack. + + #thermo: + ThermoDeltaTScaling = float('NaN') #scaling factor to multiply the thermal diffusion timestep (delta t) requested_outputs = [] @@ -138,4 +143,5 @@ string = "%s\n%s"%(string,fielddisplay(self,'zY','strech grid cells bellow top_z by a [top_dz * y ^ (cells bellow top_z)]')) string = "%s\n%s"%(string,fielddisplay(self,'InitDensityScaling',['initial scaling factor multiplying the density of ice','which describes the density of the snowpack.'])) + string = "%s\n%s"%(string,fielddisplay(self,'ThermoDeltaTScaling','scaling factor to multiply the thermal diffusion timestep (delta t)')) string = "%s\n%s"%(string,fielddisplay(self,'outputFreq','output frequency in days (default is monthly, 30)')) string = "%s\n%s"%(string,fielddisplay(self,'aIdx',['method for calculating albedo and subsurface absorption (default is 1)', @@ -144,5 +150,6 @@ '2: effective grain radius [Brun et al., 2009]', '3: density and cloud amount [Greuell & Konzelmann, 1994]', - '4: exponential time decay & wetness [Bougamont & Bamber, 2005]'])) + '4: exponential time decay & wetness [Bougamont & Bamber, 2005]', + '5: ingest MODIS mode, direct input from aValue parameter applied to surface ice only'])) string = "%s\n%s"%(string,fielddisplay(self,'teValue','Outward longwave radiation thermal emissivity forcing at every element (default in code is 1)')) @@ -164,6 +171,8 @@ string = "%s\n%s"%(string,fielddisplay(self,'aSnow','new snow albedo (0.64 - 0.89)')) string = "%s\n%s"%(string,fielddisplay(self,'aIce','albedo of ice (0.27-0.58)')) - elif self.aIdx == 0: - string = "%s\n%s"%(string,fielddisplay(self,'aValue','Albedo forcing at every element. Used only if aIdx == 0.')) + elif elf.aIdx == 0: + string = "%s\n%s"%(string,fielddisplay(self,'aValue','Albedo forcing at every element. Used only if aIdx == {0,5}')) + elif elf.aIdx == 5: + string = "%s\n%s"%(string,fielddisplay(self,'aValue','Albedo forcing at every element. Used only if aIdx == {0,5}')) elif self.aIdx == 3: string = "%s\n%s"%(string,fielddisplay(self,'cldFrac','average cloud amount')) @@ -194,5 +203,5 @@ self.pAir = project3d(md,'vector',self.pAir,'type','node') - if aIdx == 0 and np.isnan(self.aValue): + if (aIdx == 0 or aIdx == 5) and np.isnan(self.aValue): self.aValue=project3d(md,'vector',self.aValue,'type','node'); if np.isnan(self.teValue): @@ -222,4 +231,5 @@ self.dzMin = self.dzTop/2 self.InitDensityScaling = 1.0 + self.ThermoDeltaTScaling = 1/11.0 self.zMax = 250*np.ones((mesh.numberofelements,)) @@ -278,5 +288,5 @@ md = checkfield(md,'fieldname','smb.teValue','timeseries',1,'NaN',1,'Inf',1,'>=',0,'<=',1); - md = checkfield(md,'fieldname','smb.aIdx','NaN',1,'Inf',1,'values',[0,1,2,3,4]) + md = checkfield(md,'fieldname','smb.aIdx','NaN',1,'Inf',1,'values',[0,1,2,3,4,5]) md = checkfield(md,'fieldname','smb.swIdx','NaN',1,'Inf',1,'values',[0,1]) md = checkfield(md,'fieldname','smb.denIdx','NaN',1,'Inf',1,'values',[1,2,3,4,5]) @@ -288,4 +298,5 @@ md = checkfield(md,'fieldname','smb.outputFreq','NaN',1,'Inf',1,'>',0,'<',10*365) #10 years max md = checkfield(md,'fieldname','smb.InitDensityScaling','NaN',1,'Inf',1,'> = ',0,'< = ',1) + md = checkfield(md,'fieldname','smb.ThermoDeltaTScaling','NaN',1,'Inf',1,'> = ',0,'< = ',1) if type(self.aIdx) == list or type(self.aIdx) == type(np.array([1,2])) and (self.aIdx == [1,2] or (1 in self.aIdx and 2 in self.aIdx)): @@ -349,4 +360,5 @@ WriteData(fid,prefix,'object',self,'class','smb','fieldname','denIdx','format','Integer') WriteData(fid,prefix,'object',self,'class','smb','fieldname','InitDensityScaling','format','Double') + WriteData(fid,prefix,'object',self,'class','smb','fieldname','ThermoDeltaTScaling','format','Double') WriteData(fid,prefix,'object',self,'class','smb','fieldname','outputFreq','format','Double') WriteData(fid,prefix,'object',self,'class','smb','fieldname','aSnow','format','Double')