![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 22840
- Timestamp:
- 06/11/18 13:42:55 (7 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 5 edited
-
c/modules/SurfaceMassBalancex/Gembx.cpp (modified) (5 diffs)
-
m/classes/SMBgemb.m (modified) (3 diffs)
-
m/classes/SMBgemb.py (modified) (3 diffs)
-
m/classes/qmu.m (modified) (1 diff)
-
m/classes/qmu.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp
r22747 r22840 24 24 const double LS = 2.8295E6; // latent heat of sublimation (J kg-1) 25 25 const double SB = 5.67E-8; // Stefan-Boltzmann constant (W m-2 K-4) 26 const double CA = 1005.0; // heat capacity of air (J kg-1 k-1)27 const double R = 8.314; // gas constant ( mol-1 K-1)26 const double CA = 1005.0; // heat capacity of air (J kg-1 K-1) 27 const double R = 8.314; // gas constant (J mol-1 K-1) 28 28 29 29 void Gembx(FemModel* femmodel){ /*{{{*/ … … 1854 1854 IssmDouble c1=0.0; 1855 1855 IssmDouble H=0.0; 1856 IssmDouble M0=0.0; 1857 IssmDouble M1=0.0; 1858 IssmDouble c0arth=0.0; 1859 IssmDouble c1arth=0.0; 1856 1860 1857 1861 /*output: */ … … 1885 1889 switch (denIdx){ 1886 1890 case 1: // Herron and Langway (1980) 1887 c0 = (11.0 * exp(-10160.0 / (T[i] * 8.314))) * C/1000.0;1888 c1 = (575.0 * exp(-21400.0 / (T[i]* 8.314))) * pow(C/1000.0,.5);1891 c0 = (11.0 * exp(-10160.0 / (T[i] * R))) * C/1000.0; 1892 c1 = (575.0 * exp(-21400.0 / (T[i]* R))) * pow(C/1000.0,.5); 1889 1893 break; 1894 1890 1895 case 2: // Arthern et al. (2010) [semi-emperical] 1891 1896 // common variable 1892 1897 // NOTE: Ec=60000, Eg=42400 (i.e. should be in J not kJ) 1893 H = exp((-60000.0/(T[i] * 8.314)) + (42400.0/(Tmean * 8.314))) * (C * 9.81);1898 H = exp((-60000.0/(T[i] * R)) + (42400.0/(Tmean * R))) * (C * 9.81); 1894 1899 c0 = 0.07 * H; 1895 1900 c1 = 0.03 * H; … … 1899 1904 1900 1905 // common variable 1901 H = exp((-60 .0/(T[i] * 8.314))) * obp[i] / pow(re[i]/1000.0,2.0);1906 H = exp((-60000.0/(T[i] * R))) * obp[i] / pow(re[i]/1000.0,2.0); 1902 1907 c0 = 9.2e-9 * H; 1903 1908 c1 = 3.7e-9 * H; … … 1913 1918 c0 = (C/dIce) * (76.138 - 0.28965*Tmean)*8.36*pow(CtoK - T[i],-2.061); 1914 1919 c1 = c0; 1920 break; 1921 1922 case 6: // Ligtenberg and others (2011) [semi-emperical], Antarctica 1923 // common variable 1924 H = exp((-60000.0/(Tmean * R)) + (42400.0/(Tmean * R))) * (C * 9.81); 1925 c0arth = 0.07 * H; 1926 c1arth = 0.03 * H; 1927 M0 = fmax(1.435 - (0.151 * log(C)),0.25); 1928 M1 = fmax(2.366 - (0.293 * log(C)),0.25); 1929 c0 = M0*c0arth; 1930 c1 = M1*c1arth; 1931 break; 1932 1933 case 7: // Kuipers Munneke and others (2015) [semi-emperical], Greenland 1934 // common variable 1935 H = exp((-60000.0/(T[i] * R)) + (42400.0/(T[i] * R))) * (C * 9.81); 1936 c0arth = 0.07 * H; 1937 c1arth = 0.03 * H; 1938 M0 = fmax(1.042 - (0.0916 * log(C)),0.25); 1939 M1 = fmax(1.734 - (0.2039 * log(C)),0.25); 1940 c0 = M0*c0arth; 1941 c1 = M1*c1arth; 1915 1942 break; 1916 1943 } -
issm/trunk-jpl/src/m/classes/SMBgemb.m
r22482 r22840 65 65 denIdx = NaN; %densification model to use (default is 2): 66 66 % 1 = emperical model of Herron and Langway (1980) 67 % 2 = semi-em erical model of Anthern et al. (2010)67 % 2 = semi-emperical model of Anthern et al. (2010) 68 68 % 3 = DO NOT USE: physical model from Appendix B of Anthern et al. (2010) 69 69 % 4 = DO NOT USE: emperical model of Li and Zwally (2004) 70 70 % 5 = DO NOT USE: modified emperical model (4) by Helsen et al. (2008) 71 % 6 = Antarctica semi-emperical model of Ligtenberg et al. (2011) 72 % 7 = Greenland semi-emperical model of Kuipers Munneke et al. (2015) 71 73 72 74 zTop = NaN; % depth over which grid length is constant at the top of the snopack (default 10) [m] … … 217 219 md = checkfield(md,'fieldname','smb.aIdx','NaN',1,'Inf',1,'values',[0,1,2,3,4]); 218 220 md = checkfield(md,'fieldname','smb.swIdx','NaN',1,'Inf',1,'values',[0,1]); 219 md = checkfield(md,'fieldname','smb.denIdx','NaN',1,'Inf',1,'values',[1,2,3,4,5 ]);221 md = checkfield(md,'fieldname','smb.denIdx','NaN',1,'Inf',1,'values',[1,2,3,4,5,6,7]); 220 222 221 223 md = checkfield(md,'fieldname','smb.zTop','NaN',1,'Inf',1,'>=',0); … … 323 325 fielddisplay(self,'denIdx',{'densification model to use (default is 2):',... 324 326 '1 = emperical model of Herron and Langway (1980)',... 325 '2 = semi-em erical model of Anthern et al. (2010)',...327 '2 = semi-emperical model of Anthern et al. (2010)',... 326 328 '3 = DO NOT USE: physical model from Appendix B of Anthern et al. (2010)',... 327 329 '4 = DO NOT USE: emperical model of Li and Zwally (2004)',... 328 '5 = DO NOT USE: modified emperical model (4) by Helsen et al. (2008)'}); 330 '5 = DO NOT USE: modified emperical model (4) by Helsen et al. (2008)',... 331 '6 = Antarctica semi-emperical model of Ligtenberg et al. (2011)',... 332 '7 = Greenland semi-emperical model of Kuipers Munneke et al. (2015)'}); 329 333 fielddisplay(self,'requested_outputs','additional outputs requested'); 330 334 -
issm/trunk-jpl/src/m/classes/SMBgemb.py
r22482 r22840 72 72 denIdx = float('NaN') #densification model to use (default is 2): 73 73 # 1 = emperical model of Herron and Langway (1980) 74 # 2 = semi-em erical model of Anthern et al. (2010)74 # 2 = semi-emperical model of Anthern et al. (2010) 75 75 # 3 = DO NOT USE: physical model from Appix B of Anthern et al. (2010) 76 76 # 4 = DO NOT USE: emperical model of Li and Zwally (2004) 77 77 # 5 = DO NOT USE: modified emperical model (4) by Helsen et al. (2008) 78 # 6 = Antarctica semi-emperical model of Ligtenberg et al. (2011) 79 # 7 = Greenland semi-emperical model of Kuipers Munneke et al. (2015) 78 80 79 81 zTop = float('NaN') # depth over which grid length is constant at the top of the snopack (default 10) [m] … … 188 190 string = "%s\n%s"%(string,fielddisplay(self,'denIdx',['densification model to use (default is 2):', 189 191 '1 = emperical model of Herron and Langway (1980)', 190 '2 = semi-em erical model of Anthern et al. (2010)',192 '2 = semi-emperical model of Anthern et al. (2010)', 191 193 '3 = DO NOT USE: physical model from Appix B of Anthern et al. (2010)', 192 194 '4 = DO NOT USE: emperical model of Li and Zwally (2004)', 193 '5 = DO NOT USE: modified emperical model (4) by Helsen et al. (2008)'])) 195 '5 = DO NOT USE: modified emperical model (4) by Helsen et al. (2008)', 196 '6 = Antarctica semi-emperical model of Ligtenberg et al. (2011)', 197 '7 = Greenland semi-emperical model of Kuipers Munneke et al. (2015)'])) 194 198 string = "%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional outputs requested')) 195 199 return string … … 294 298 md = checkfield(md,'fieldname','smb.aIdx','NaN',1,'Inf',1,'values',[0,1,2,3,4]) 295 299 md = checkfield(md,'fieldname','smb.swIdx','NaN',1,'Inf',1,'values',[0,1]) 296 md = checkfield(md,'fieldname','smb.denIdx','NaN',1,'Inf',1,'values',[1,2,3,4,5 ])300 md = checkfield(md,'fieldname','smb.denIdx','NaN',1,'Inf',1,'values',[1,2,3,4,5,6,7]) 297 301 298 302 md = checkfield(md,'fieldname','smb.zTop','NaN',1,'Inf',1,'> = ',0) -
issm/trunk-jpl/src/m/classes/qmu.m
r22069 r22840 76 76 end 77 77 78 if ~strcmpi(md.cluster.name,'none'),79 if md.settings.waitonlock==0,80 md = checkmessage(md,['waitonlock should be activated when running qmu in parallel mode!']);81 end82 end83 78 end % }}} 84 79 function disp(self) % {{{ -
issm/trunk-jpl/src/m/classes/qmu.py
r21303 r22840 127 127 md.checkmessage("for qmu analysis, partitioning vector cannot go over npart, number of partition areas") 128 128 129 if md.cluster.name!='none':130 if not md.settings.waitonlock:131 md.checkmessage("waitonlock should be activated when running qmu in parallel mode!")132 133 129 return md 134 130 # }}}
Note:
See TracChangeset
for help on using the changeset viewer.
