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

Enable rough topograph and add remaining atm and lnd settings for v3b02 #6113

Merged
merged 2 commits into from
Jan 10, 2024
Merged

Enable rough topograph and add remaining atm and lnd settings for v3b02 #6113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d72650
Enable rough topograph and add remaining atm and lnd settings for v3b02
wlin7 Dec 8, 2023
a2072b0
Fix default value for pgrad_correction
wlin7 Dec 18, 2023
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
6 changes: 6 additions & 0 deletions components/eam/bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,12 @@ if ($sim_year =~ /(\d+)-(\d+)/) {

# Topography
add_default($nl, 'bnd_topo', 'nofail'=>1);
if (defined($defaults->get_value('pgrad_correction'))) {
add_default($nl, 'pgrad_correction', 'val' =>$nl->get_value('pgrad_correction'));
}
if (defined($defaults->get_value('hv_ref_profiles'))) {
add_default($nl, 'hv_ref_profiles', 'val' =>$nl->get_value('hv_ref_profiles'));
}

# Tropopause climatology
add_default($nl, 'tropopause_climo_file');
Expand Down
10 changes: 7 additions & 3 deletions components/eam/bld/namelist_files/namelist_defaults_eam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@
<bnd_topo hgrid="ne16np4" npg="0">atm/cam/topo/USGS-gtopo30_ne16np4_16xconsistentSGH.c20160612.nc</bnd_topo>
<bnd_topo hgrid="ne16np4" npg="2">atm/cam/topo/USGS-gtopo30_ne16np4pg2_16xdel2_20200527.nc</bnd_topo>
<bnd_topo hgrid="ne30np4" npg="0">atm/cam/topo/USGS-gtopo30_ne30np4_16xdel2-PFC-consistentSGH.nc</bnd_topo>
<bnd_topo hgrid="ne30np4" npg="2">atm/cam/topo/USGS-gtopo30_ne30np4pg2_16xdel2.c20200108.nc</bnd_topo>
<bnd_topo hgrid="ne30np4" npg="2">atm/cam/topo/USGS-gtopo30_ne30np4pg2_x6t-SGH.c20210614.nc</bnd_topo>
<bnd_topo hgrid="ne30np4" npg="3">atm/cam/topo/USGS-gtopo30_ne30np4pg3_16xdel2.c20200504.nc</bnd_topo>
<bnd_topo hgrid="ne30np4" npg="4">atm/cam/topo/USGS-gtopo30_ne30np4pg4_16xdel2.c20200504.nc</bnd_topo>
<bnd_topo hgrid="ne45np4" npg="2">atm/cam/topo/USGS-gtopo30_ne45np4pg2_16xdel2.c20200615.nc</bnd_topo>
<bnd_topo hgrid="ne60np4" npg="0">atm/cam/topo/USGS-gtopo30_ne60np4_16xconsistentSGH.c20140517.nc</bnd_topo>
<bnd_topo hgrid="ne120np4" npg="0">atm/cam/topo/USGS-gtopo30_ne120np4_16xdel2-PFC-consistentSGH.nc</bnd_topo>
<bnd_topo hgrid="ne120np4" npg="2">atm/cam/topo/USGS-gtopo30_ne120np4pg2_16xdel2.nc</bnd_topo>
<bnd_topo hgrid="ne120np4" npg="2">atm/cam/topo/USGS-gtopo30_ne120np4pg2_x6t_20230404.nc</bnd_topo>
mahf708 marked this conversation as resolved.
Show resolved Hide resolved
<bnd_topo hgrid="ne240np4" npg="0">atm/cam/topo/USGS-gtopo30_ne240np4_16xconsistentSGH.c20130724.nc</bnd_topo>
<bnd_topo hgrid="ne512np4" npg="0">atm/cam/topo/USGS-gtopo30_ne512np4_16xconsistentSGH_20190212.nc</bnd_topo>
<bnd_topo hgrid="ne1024np4" npg="0">atm/cam/topo/USGS-gtopo30_ne1024np4_16xconsistentSGH_20190528.nc</bnd_topo>
Expand Down Expand Up @@ -1887,7 +1887,7 @@ with se_tstep, dt_remap_factor, dt_tracer_factor set to -1
<use_gw_energy_fix phys="default"> .true. </use_gw_energy_fix>
<clubb_C14 phys="default"> 2.5D0 </clubb_C14>
<clubb_tk1 phys="default"> 268.15D0 </clubb_tk1>
<dust_emis_fact phys="default"> 12.8D0 </dust_emis_fact>
<dust_emis_fact phys="default"> 13.8D0 </dust_emis_fact>
<linoz_psc_T > 198.0D0 </linoz_psc_T>
<lght_no_prd_factor > 5.0D0 </lght_no_prd_factor>
<micro_mincdnc phys="default" microphys="mg2"> 10.D6 </micro_mincdnc>
Expand Down Expand Up @@ -1942,4 +1942,8 @@ with se_tstep, dt_remap_factor, dt_tracer_factor set to -1
<cflx_cpl_opt phys="default"> 2 </cflx_cpl_opt>
<tropopause_E90_thrd phys="default"> 80.0e-9 </tropopause_E90_thrd>

<!-- set following parameters to go with rough topography -->
<pgrad_correction phys="default"> 1 </pgrad_correction>
<hv_ref_profiles phys="default"> 6 </hv_ref_profiles>

</namelist_defaults>
4 changes: 4 additions & 0 deletions components/elm/bld/namelist_files/namelist_defaults.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,8 +670,12 @@ this mask will have smb calculated over the entire global land surface


<!-- Phosphorus deposition streams namelist defaults -->
<stream_year_first_pdep use_cn=".true." sim_year="2010" >2000</stream_year_first_pdep>
<stream_year_last_pdep use_cn=".true." sim_year="2010" >2000</stream_year_last_pdep>
<stream_year_first_pdep use_cn=".true." sim_year="2000" >2000</stream_year_first_pdep>
<stream_year_last_pdep use_cn=".true." sim_year="2000" >2000</stream_year_last_pdep>
<stream_year_first_pdep use_cn=".true." sim_year="1950" >2000</stream_year_first_pdep>
<stream_year_last_pdep use_cn=".true." sim_year="1950" >2000</stream_year_last_pdep>
Comment on lines +673 to +678
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For sim_year=2010 or sim_year=1950, why is the pdep corresponding to 2000 being used?

<stream_year_first_pdep use_cn=".true." sim_year="1850" >2000</stream_year_first_pdep>
<stream_year_last_pdep use_cn=".true." sim_year="1850" >2000</stream_year_last_pdep>
<stream_year_first_pdep use_cn=".true." sim_year="1000" >2000</stream_year_first_pdep>
Expand Down
4 changes: 2 additions & 2 deletions components/elm/bld/namelist_files/use_cases/1950_CMIP6_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<stream_year_first_ndep phys="elm" use_cn=".true." ndepsrc="stream" >1950</stream_year_first_ndep>
<stream_year_last_ndep phys="elm" use_cn=".true." ndepsrc="stream" >1950</stream_year_last_ndep>

<stream_year_first_pdep phys="elm" use_cn=".true." ndepsrc="stream" >1950</stream_year_first_pdep>
<stream_year_last_pdep phys="elm" use_cn=".true." ndepsrc="stream" >1950</stream_year_last_pdep>
<stream_year_first_pdep phys="elm" use_cn=".true." ndepsrc="stream" >2000</stream_year_first_pdep>
<stream_year_last_pdep phys="elm" use_cn=".true." ndepsrc="stream" >2000</stream_year_last_pdep>
Comment on lines +14 to +15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as https://github.com/E3SM-Project/E3SM/pull/6113/files#r1440056541.


<stream_year_first_popdens phys="elm" use_cn=".true." ndepsrc="stream" >1950</stream_year_first_popdens>
<stream_year_last_popdens phys="elm" use_cn=".true." ndepsrc="stream" >1950</stream_year_last_popdens>
Expand Down
4 changes: 2 additions & 2 deletions components/elm/bld/namelist_files/use_cases/2010_CMIP6_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<stream_year_first_ndep phys="elm" use_cn=".true." ndepsrc="stream" >2010</stream_year_first_ndep>
<stream_year_last_ndep phys="elm" use_cn=".true." ndepsrc="stream" >2010</stream_year_last_ndep>

<stream_year_first_pdep phys="elm" use_cn=".true." ndepsrc="stream" >2010</stream_year_first_pdep>
<stream_year_last_pdep phys="elm" use_cn=".true." ndepsrc="stream" >2010</stream_year_last_pdep>
<stream_year_first_pdep phys="elm" use_cn=".true." ndepsrc="stream" >2000</stream_year_first_pdep>
<stream_year_last_pdep phys="elm" use_cn=".true." ndepsrc="stream" >2000</stream_year_last_pdep>
Comment on lines +14 to +15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as https://github.com/E3SM-Project/E3SM/pull/6113/files#r1440056541.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, @bishtgautam . Intuitively, when first testing it, did try 2010. But look like only simyr2000 stream file is available, which is used for piControl as well, so I thought it being treated as time-invariant. If time varying for this data stream is necessary, we will need quick help to generate the files for compsets of different TIME (or forcing scenarios)
The file is : inputdata/lnd/clm2/pdepdata/fpdep_clm_hist_simyr2000_1.9x2.5_c150929.nc


<stream_year_first_popdens phys="elm" use_cn=".true." ndepsrc="stream" >2010</stream_year_first_popdens>
<stream_year_last_popdens phys="elm" use_cn=".true." ndepsrc="stream" >2010</stream_year_last_popdens>
Expand Down