Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Surface roughness modifications #1596

Closed
wants to merge 52 commits into from
Closed

Surface roughness modifications #1596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
7e5d438
Adapted model to machine and added soil column separation and local t…
Mar 25, 2021
db0b16f
Saving current state
Apr 27, 2021
492c158
Saving state
May 7, 2021
def8ee3
Saving state
May 17, 2021
4018d56
Saving state
May 26, 2021
4a52aa7
Saving state
Jun 14, 2021
e78b02f
Saving state
Jun 16, 2021
37d7d0c
Saving state
Jun 24, 2021
d218ff5
Saving state
Jul 28, 2021
fc20d00
State at first submission
Aug 25, 2021
2e7b2c3
For PR
Jan 6, 2022
864f336
Removing statements of sensitivity experiments. Add more comments fol…
Jan 12, 2022
8318cad
Small correction to proposed statement in CanopyFluxes
Jan 12, 2022
c611d6e
Add user-mod directories for the surface roughness changes from Ronny…
ekluzek Jan 13, 2022
9ae6e30
Remove use_z0v_forest because it's not connected to anything in the F…
ekluzek Jan 13, 2022
0ee8c69
Handle very small values of htop and snowmelt_accum with new Meier202…
ekluzek Jan 13, 2022
02be2d8
Don't set z0mg and displa on first step of run for RonnyMeier2022 rou…
ekluzek Jan 14, 2022
0b7fd39
Skip first few steps as htop isn't set until after first do_alb step
ekluzek Feb 19, 2022
0e71cb2
Correct subscript
ekluzek Feb 20, 2022
84396e6
Add write of rh if negative or over 100 when DEBUG on
ekluzek Feb 22, 2022
23601a7
Write out warning if ustar*thvstar is positive to prevent a cube root…
ekluzek Feb 22, 2022
4eabfbb
Set human stress indices to calculate NONE when Meier surface roughne…
ekluzek Feb 22, 2022
f644624
Fix subscript
ekluzek Feb 22, 2022
32dbda8
Rename test mods to highlight these are non-crop cases
ekluzek Feb 22, 2022
b9d402a
Add tests with Meier surface roughness
ekluzek Feb 23, 2022
8789ca2
Add a bit to not die if htop is zero and it's crop and beginning of t…
ekluzek Feb 23, 2022
821df3c
Correct new testname, and add two tests to the expected fails
ekluzek Feb 23, 2022
d3dee39
Change MeierXXXX namelist to Meier2022
ekluzek Feb 23, 2022
95fb900
Remove commented out line
ekluzek Feb 23, 2022
b0f2856
Remove local time history changes as they are treated seperately in #…
ekluzek Feb 23, 2022
c7ade8d
Remove soil columns on a seperate soil column as handled in #1249
ekluzek Feb 23, 2022
684d61b
Merge tag 'ctsm5.1.dev077'
ekluzek Feb 23, 2022
7916475
Add more compilers for the surf roughness changes
ekluzek Feb 23, 2022
b531f92
Changes to get the updated code to compile on cheyenne_gnu
ekluzek Feb 24, 2022
6e31171
Changes needed to work with nag compiler on izumi, negative sign need…
ekluzek Feb 25, 2022
f0fe877
Update paramsfile for Meier surface roughness changes to latest version
ekluzek Mar 4, 2022
cf0934b
Some updates from @olyson that get more tests to work
ekluzek Mar 8, 2022
7570395
Merge branch 'main' of github.com:RonnyMeier/CTSM into main
ekluzek Mar 8, 2022
1f1cce9
Update forcing height variables and rename/move snomelt_accum to Wate…
olyson Mar 14, 2022
546f615
Merge branch 'main' of https://www.github.com/RonnyMeier/ctsm
olyson Mar 14, 2022
382441c
Add forcing height change back into CanopyFluxesMod after rebase.
olyson Mar 14, 2022
e7579c9
Encapsulated forcing height update in Meier2022 to maintain bfb with …
olyson Mar 15, 2022
902f1cb
Update forcing heights and restrict zeta to less than 20 for now
olyson Mar 21, 2022
46e2dad
Revert restriction on zeta in FrictionVelocityMod
olyson May 17, 2022
189f9f9
Remove restriction on calc_human_stress_indices
olyson Jun 10, 2022
c08d09d
Change zetamaxstable for z0param_method == 'Meier2022' to 2.0
olyson Jun 10, 2022
6be9820
Make zeta a global variable and fix zetamaxstable namelist
olyson Jun 13, 2022
ed9610b
Remove use_z0mg_2d code to read in roughness from surface dataset tha…
ekluzek Oct 18, 2022
0badb30
Remove more use_z0mg_2d
ekluzek Oct 18, 2022
357fea5
Correct so will compile
ekluzek Oct 19, 2022
a924de8
Merge branch 'main' of github.com:RonnyMeier/CTSM into main
ekluzek Oct 19, 2022
e5cd7b0
Use parenthesis to clarify statement as required by the nag compiler …
ekluzek Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,7 @@ sub process_namelist_inline_logic {
setup_logic_supplemental_nitrogen($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_snowpack($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_fates($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_z0param($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_misc($opts, $nl_flags, $definition, $defaults, $nl);

#########################################
Expand Down Expand Up @@ -3884,7 +3885,10 @@ sub setup_logic_friction_vel {
#
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;

add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'zetamaxstable' );
my $z0param_method = remove_leading_and_trailing_quotes($nl->get_value('z0param_method' ));

add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'zetamaxstable',
'z0param_method'=>$z0param_method );
}

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -4144,6 +4148,21 @@ sub setup_logic_fates {

#-------------------------------------------------------------------------------

sub setup_logic_z0param {
#
# Set default z0 paramterization
#
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;

add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'z0param_method');

my $z0param_method = remove_leading_and_trailing_quotes($nl->get_value('z0param_method' ));
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_z0m_snowmelt',
'z0param_method'=>$z0param_method );
}

#-------------------------------------------------------------------------------

sub setup_logic_misc {
#
# Set some misc options
Expand Down
16 changes: 15 additions & 1 deletion bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- Friction velocity -->
<zetamaxstable phys="clm4_5" >2.0d00</zetamaxstable>
<zetamaxstable phys="clm5_0" >0.5d00</zetamaxstable>
<zetamaxstable phys="clm5_1" >0.5d00</zetamaxstable>
<zetamaxstable phys="clm5_1" z0param_method="ZengWang2007" >0.5d00</zetamaxstable>
<zetamaxstable phys="clm5_1" z0param_method="Meier2022" >2.0d00</zetamaxstable>

<!-- atm2lnd defaults -->
<repartition_rain_snow phys="clm5_1" >.true.</repartition_rain_snow>
Expand Down Expand Up @@ -319,6 +320,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<itmax_canopy_fluxes structure="standard">40</itmax_canopy_fluxes>
<itmax_canopy_fluxes structure="fast" >3</itmax_canopy_fluxes>


<!-- Canopy hydrology namelist defaults -->
<use_clm5_fpi phys="clm5_1" >.true.</use_clm5_fpi>
<interception_fraction phys="clm5_1" >1.0</interception_fraction>
Expand Down Expand Up @@ -490,6 +492,16 @@ attributes from the config_cache.xml file (with keys converted to upper-case).

<fates_paramfile>lnd/clm2/paramdata/fates_params_api.16.1.0_12pft_c210630.nc </fates_paramfile>

<!-- ================================================================== -->
<!-- Default surface roughness parameterization -->
<!-- ================================================================== -->

<z0param_method>ZengWang2007</z0param_method>

<use_z0m_snowmelt z0param_method="Meier2022" >.true.</use_z0m_snowmelt>
<use_z0m_snowmelt z0param_method="ZengWang2007" >.false.</use_z0m_snowmelt>
<use_z0m_snowmelt >.false.</use_z0m_snowmelt>

<!-- ======================================================================================== -->
<!-- clm 5.0 BGC nitrogen model -->
<!-- ======================================================================================== -->
Expand Down Expand Up @@ -1082,6 +1094,8 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_C24_hist_78pfts_CMIP6_simyr2000
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr2000_c190214.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true." use_vichydro=".false.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1.9x2.5_hist_78pfts_CMIP6_simyr2000_c190304.nc</fsurdat>
<fsurdat hgrid="hcru_hcru" sim_year="2000">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_360x720cru_78pfts_CMIP6_simyr2000_c170824.nc</fsurdat>
<fsurdat hgrid="0.125x0.125" sim_year="2000" use_crop=".true." >
lnd/clm2/surfdata_map/release-clm5.0.24/surfdata_0.125x0.125_hist_78pfts_CMIP6_simyr2005_c190624.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true." use_vichydro=".false.">
Expand Down
18 changes: 18 additions & 0 deletions bld/namelist_files/namelist_definition_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2759,6 +2759,24 @@ the related bulk quantities.
If .true., run with water isotopes
</entry>

<!-- ======================================================================================== -->
<!-- Namelist options related to surface roughness -->
<!-- ======================================================================================== -->

<entry id="z0param_method" type="char*64" category="clm_physics"
group="clm_inparm" valid_values="ZengWang2007,Meier2022" >
Parameterization/parameters to use for surface roughness
ZengWang2007: Zeng and Wang 2007
Meier2022: Meier et al. in prep. 2022
</entry>

<entry id="use_z0m_snowmelt" type="logical" category="clm_physics"
group="clm_inparm" valid_values="" >
If FALSE use constant snow z0m
If TRUE use parameterization of snow z0m as a function of accumulated
snow melt of Brock et al. (2006)
</entry>

<!-- ======================================================================================== -->
<!-- Namelist options related to initInterp -->
<!-- ======================================================================================== -->
Expand Down
7 changes: 7 additions & 0 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@

<!-- aux_clm test suite failures -->

<test name="ERS_D.f10_f10_mg37.I1850Clm51Sp.cheyenne_intel.clm-Meier2022_surf_rough">
<phase name="RUN">
<status>FAIL</status>
<issue>Error: Forcing height is below canopy height for patch index</issue>
</phase>
</test>

<test name="SMS.f10_f10_mg37.I2000Clm50BgcCrop.izumi_pgi.clm-crop">
<phase name="MODEL_BUILD">
<status>FAIL</status>
Expand Down
40 changes: 40 additions & 0 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SMS_D_Ln1" grid="f09_g17" compset="I1850Clm50BgcNoAnthro" testmods="clm/Meier2022_surf_rough">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Meier Surface roughness with no-anthro compset</option>
</options>
</test>
<test name="SMS_Ld5" grid="f09_g17" compset="I1850Clm45BgcCru" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="ctsm_sci"/>
Expand Down Expand Up @@ -1275,6 +1284,37 @@
<option name="comment" >include a long Clm45 test, and include a production intel test of Clm45</option>
</options>
</test>
<test name="ERS_Ly3" grid="f10_f10_mg37" compset="I2000Clm51BgcCrop" testmods="clm/Meier2022_surf_rough">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">01:40:00</option>
<option name="comment" >include a long exact restart test with Meier surface roughness</option>
</options>
</test>
<test name="SMS_D" grid="f10_f10_mg37" compset="I2000Clm51Bgc" testmods="clm/Meier2022_surf_rough">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
<machine name="cheyenne" compiler="gnu" category="aux_clm"/>
<machine name="izumi" compiler="nag" category="aux_clm"/>
<machine name="izumi" compiler="intel" category="aux_clm"/>
<machine name="izumi" compiler="gnu" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >include a short DEBUG test with Meier surface roughness without crop</option>
</options>
</test>
<test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm51Sp" testmods="clm/Meier2022_surf_rough">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Exact restart short DEBUG SP test with Meier surface roughness</option>
</options>
</test>
<test name="ERS_Ly6_Mmpi-serial" grid="1x1_smallvilleIA" compset="IHistClm50BgcCropQianRs" testmods="clm/cropMonthOutput">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
Expand Down
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/clm/Meier2022_surf_rough/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../default
5 changes: 5 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/Meier2022_surf_rough/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
z0param_method = 'Meier2022'
use_z0m_snowmelt = .true.
use_z0mg_2d = .false.
paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_params.RMz0.c220304.nc'

Loading