Skip to content

Commit

Permalink
Merge pull request #2834 from slevis-lmwg/f19_16pft_to_defaults_and_m…
Browse files Browse the repository at this point in the history 
…akefile

f19 + f45 16pft fsurdat/landuse files to namelist_defaults_ctsm + Makefile
  • Loading branch information
@slevis-lmwg
slevis-lmwg authored Oct 25, 2024
2 parents 8a019d9 + cdbc561 commit c35b64e
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 27 deletions.
57 changes: 30 additions & 27 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1618,22 +1618,13 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa15_hist_2000_16pfts_c240908.nc</f
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa3p75_hist_2000_16pfts_c240908.nc</fsurdat>

<!-- fsurdat files with 78 PFTS -->
<!-- The same files can be used with use_vichydro='.true.' or '.false' -->
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".true." use_vichydro=".true.">
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".true." use_vichydro=".false.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true." use_vichydro=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true." use_vichydro=".false.">
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true." use_vichydro=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_10x15_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true." use_vichydro=".false.">
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_10x15_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="2000" use_crop=".true." use_vichydro=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="2000" use_crop=".true." use_vichydro=".false.">
<fsurdat hgrid="4x5" sim_year="2000" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_2000_78pfts_c240908.nc</fsurdat>

<fsurdat hgrid="1x1_brazil" sim_year="2000">
Expand Down Expand Up @@ -1693,29 +1684,36 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/surfdata_1x1_urbanc_alpha_synth_hist_

<!-- for pre-industrial simulations - year 1850 -->

<!-- fsurdat files with 16 PFTS for use with PPE and/or FATES -->
<fsurdat hgrid="1.9x2.5" sim_year="1850" use_crop=".false.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_1850_16pfts_c240926.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="1850" use_crop=".false.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_1850_16pfts_c241007.nc</fsurdat>

<!-- fsurdat files with 78 PFTS -->
<fsurdat hgrid="360x720cru" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_360x720cru_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="0.9x1.25" sim_year="1850" >
<fsurdat hgrid="0.9x1.25" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_0.9x1.25_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="1850" >
<fsurdat hgrid="1.9x2.5" sim_year="1850" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="1850" >
<fsurdat hgrid="10x15" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_10x15_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="1850" >
<fsurdat hgrid="4x5" sim_year="1850" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_1850_78pfts_c240908.nc</fsurdat>

<fsurdat hgrid="mpasa480" sim_year="1850" >
<fsurdat hgrid="mpasa480" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa480_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="mpasa120" sim_year="1850" >
<fsurdat hgrid="mpasa120" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa120_hist_1850_78pfts_c240908.nc</fsurdat>

<fsurdat hgrid="ne30np4" sim_year="1850">
<fsurdat hgrid="ne30np4" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne30np4.pg2" sim_year="1850">
<fsurdat hgrid="ne30np4.pg2" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg2_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne30np4.pg3" sim_year="1850">
<fsurdat hgrid="ne30np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>

<fsurdat hgrid="C96" sim_year="1850">
Expand Down Expand Up @@ -1766,9 +1764,16 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
-->

<!-- Historical 1850-2000 -->
<!-- PPE and/or FATES need 16-pft landuse files -->
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" use_crop=".false."
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_1.9x2.5_hist_1850-2023_16pfts_c240926.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000" use_crop=".false."
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_4x5_hist_1850-2023_16pfts_c241007.nc</flanduse_timeseries>

<!-- 78-pft landuse files -->
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000"
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" use_crop=".true."
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_1.9x2.5_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne0np4.ARCTICGRIS.ne30x8" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne0np4.ARCTICGRIS.ne30x8_SSP2-4.5_1979-2026_78pfts_c240908.nc</flanduse_timeseries>
Expand All @@ -1778,9 +1783,7 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne0np4.POLARCAP.ne30x4_SSP2-4.5_1979-2026_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne0np4CONUS.ne30x8" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne0np4CONUS.ne30x8_SSP2-4.5_1979-2026_78pfts_c240908.nc</flanduse_timeseries>
<!-- Do we need both use_crop=".false." and ".true." for FATES transient? -->
<!-- As of 2024/02/02 the Grids Support spreadsheet includes no 16-pft landuse files. -->
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000"
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000" use_crop=".true."
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_4x5_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_10x15_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
Expand Down
1 change: 1 addition & 0 deletions bld/unit_testers/build-namelist_test.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ sub cat_and_create_namelistinfile {
"--res 0.9x1.25 --bgc sp --use_case 1850-2100_SSP2-4.5_transient --namelist '&a start_ymd=18501223/'",
"-bgc fates -use_case 2000_control -no-megan",
"-bgc fates -use_case 20thC_transient -no-megan",
"-bgc fates -use_case 20thC_transient -no-megan -no-crop --res 4x5",
"-bgc fates -use_case 1850_control -no-megan -namelist \"&a use_fates_sp=T, soil_decomp_method='None'/\"",
"-bgc sp -use_case 2000_control -res 0.9x1.25 -namelist '&a use_soil_moisture_streams = T/'",
"--res 1.9x2.5 --bgc bgc --use_case 1850-2100_SSP2-4.5_transient --namelist '&a start_ymd=19101023/'",
Expand Down
10 changes: 10 additions & 0 deletions python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
"global-present",
"global-present-low-res",
"global-present-ultra-hi-res",
"global-hist-1850-f19",
"global-hist-1850-f45",
"crop-tropics-present",
"crop",
"crop-global-present",
Expand Down Expand Up @@ -242,6 +244,14 @@ def main():
"--start-year 2000 --end-year 2000 --nocrop --res",
"ultra_hi_res_no_crop",
),
"global-hist-1850-f19": (
"--start-year 1850 --end-year 2023 --nocrop --res",
"f19",
),
"global-hist-1850-f45": (
"--start-year 1850 --end-year 2023 --nocrop --res",
"f45",
),
"crop-tropics-present": (
"--start-year 2000 --end-year 2000 --res",
"5x5_amazon",
Expand Down
9 changes: 9 additions & 0 deletions tools/mksurfdata_esmf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,13 @@ SUBSETDATA_1X1_URBALPHA := --lat -37.7308 --lon 0 --site 1x1_urbanc_alpha --o
# low-res is for low resolutions for testing
# nldas is for NWP working with WRF
# STANDARD means no crop, so 16 pfts
# global-hist-1850-f45 is used by FATES and we expect it to be phased out
STANDARD = \
global-potveg \
global-present \
global-present-low-res \
global-hist-1850-f19 \
global-hist-1850-f45 \

CROP = \
crop-global-future \
Expand Down Expand Up @@ -153,6 +156,12 @@ global-present-low-res : FORCE
$(MKSURFDATA) --number-of-nodes 1 --tasks-per-node 64 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
$(BATCHJOBS) $@.sh

global-hist-1850-f19 : FORCE
$(MKSURFDATA) --number-of-nodes 8 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
$(BATCHJOBS) $@.sh
global-hist-1850-f45 : FORCE
$(MKSURFDATA) --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
$(BATCHJOBS) $@.sh
#
# Ultra high resolutions (Don't do by default user should select this by hand)
#
Expand Down

0 comments on commit c35b64e

Please sign in to comment.