Skip to content

alpha-ctsm5.4.CMIP7.13.ctsm5.3.079: Prepare Makefile to make CTSM5.4 fsurdat/landuse datasets #3482

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

Merged
merged 20 commits into from
Oct 17, 2025
Merged

alpha-ctsm5.4.CMIP7.13.ctsm5.3.079: Prepare Makefile to make CTSM5.4 fsurdat/landuse datasets #3482

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1b214aa
Merge tag 'alpha-ctsm5.4.CMIP7.09.ctsm5.3.071' into make_ctsm54_datasets
slevis-lmwg Sep 9, 2025
e69570a
Update Makefile/_multi.py to accommodate new fsurdat/landuse needs
slevis-lmwg Sep 10, 2025
4faa434
Merge tag 'alpha-ctsm5.4.CMIP7.10.ctsm5.3.071' into make_ctsm54_datasets
slevis-lmwg Sep 10, 2025
0247d55
Update Makefile/_multi.py for fsurdat/landuse updates in ctsm54 (part 2)
slevis-lmwg Sep 12, 2025
ffede38
Rm unnecessary 400pt_sparse grid from gen_mksurfdata_jobscript_multi.py
slevis-lmwg Sep 15, 2025
7b6a268
Makefile corrections after first test of `make all` (part 1)
slevis-lmwg Sep 15, 2025
98ee059
Makefile / _multi.py updates after first test of 'make all' (part 2)
slevis-lmwg Sep 17, 2025
60e1907
Makefile / _multi.py updates after first test of 'make all' (part 3)
slevis-lmwg Sep 17, 2025
8c7a0de
Add input_pftdata_filename variable to landuse.timeseries files
slevis-lmwg Sep 17, 2025
883012b
Update README.md with how to turn on DEBUG in mksurfdata_esmf
slevis-lmwg Sep 17, 2025
889bb38
Merge tag 'alpha-ctsm5.4.CMIP7.11.ctsm5.3.071' into make_ctsm54_datasets
slevis-lmwg Sep 17, 2025
70e778b
Merge tag 'alpha-ctsm5.4.CMIP7.11.ctsm5.3.075' into make_ctsm54_datasets
slevis-lmwg Sep 19, 2025
92dd6d5
Add comment explaining why I split hist-ne3 into three separate jobs
slevis-lmwg Oct 14, 2025
c3e1ca1
Point to corrected raw lai file and correspondng soil color file
slevis-lmwg Oct 14, 2025
5a09596
Added back 1x1_brazil_transient to the mksurfdata_esmf Makefile
slevis-lmwg Oct 14, 2025
2ea100a
Revert c3e1ca1 "Point to corrected raw lai file and corresp. soil color"
slevis-lmwg Oct 14, 2025
11235f4
Merge remote-tracking branch 'escomp/alpha-ctsm5.4.CMIP7' into make_c…
slevis-lmwg Oct 14, 2025
21c9a87
Merge tag 'ctsm5.3.079' into make_ctsm54_datasets
slevis-lmwg Oct 14, 2025
bbc9e40
Add test back to expected failures (issue #1733)
slevis-lmwg Oct 16, 2025
157d3ae
Merge branch 'alpha-ctsm5.4.CMIP7' into make_ctsm54_datasets
slevis-lmwg Oct 17, 2025
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
51 changes: 27 additions & 24 deletions python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"global-present-low-res",
"global-present-ultra-hi-res",
"global-hist-1850-f19",
"global-hist-1850-f45",
"global-hist-1850-low-res",
"crop-tropics-present",
"crop",
"crop-global-present",
"crop-global-present-low-res",
"crop-global-present-ne16",
"crop-global-present-ne30",
"crop-global-present-ne120",
"crop-global-present-vrandne120",
"crop-global-present-mpasa480",
"crop-global-present-nldas",
"crop-global-1850",
Expand All @@ -45,14 +45,15 @@
"crop-global-hist-low-res",
"crop-global-hist-ne16",
"crop-global-hist-ne30",
"crop-global-hist-f09",
"crop-global-hist-1700",
"crop-global-hist-mpasa480",
"crop-global-SSP1-1.9-f09",
"crop-global-SSP1-2.6-f09",
"crop-global-SSP2-4.5-f09",
"crop-global-SSP2-4.5-f19",
"crop-global-SSP2-4.5-f10",
"crop-global-SSP2-4.5-f45",
"crop-global-SSP2-4.5-ne0np4",
"crop-global-SSP2-4.5-vrandne120",
"crop-global-SSP2-4.5-ne3",
"crop-global-SSP2-4.5-ne16",
"crop-global-SSP2-4.5-ne30",
Expand Down Expand Up @@ -193,36 +194,34 @@ def main():
# ],
# --------------------------
resolution_dict = {
"standard_res_no_crop": ["0.9x1.25", "1.9x2.5", "mpasa60"],
"potveg_res": ["0.9x1.25", "1.9x2.5", "ne16np4.pg3", "ne30np4.pg3"],
"standard_res_no_crop": ["0.9x1.25", "1.9x2.5", "mpasa60", "mpasa30", "ne30np4.pg3"],
"1700_res": ["0.9x1.25", "360x720cru"],
"f09": ["0.9x1.25"],
"f19": ["1.9x2.5"],
"hcru": ["360x720cru"],
"C96": ["C96"],
"mpasa120": ["mpasa120"],
"f10": ["10x15"],
"f45": ["4x5"],
"low_res_no_crop": ["4x5", "10x15"],
"low_res_no_crop": ["4x5", "10x15", "400pt_sparse"],
"ultra_hi_res_no_crop": ["mpasa15", "mpasa3p75"],
"standard_res": ["360x720cru", "0.9x1.25", "1.9x2.5", "C96", "mpasa120"],
"standard_res_no_f09": ["360x720cru", "1.9x2.5", "C96", "mpasa120"],
"low_res": ["4x5", "10x15", "ne3np4.pg3", "ne3np4"],
"low_res": ["4x5", "10x15", "ne3np4.pg3", "ne3np4.pg2", "ne3np4", "400pt_sparse"],
"mpasa480": ["mpasa480"],
"nldas_res": ["0.125nldas2"],
"5x5_amazon": ["5x5_amazon"],
"ne3": ["ne3np4", "ne3np4.pg3"],
"ne16": ["ne16np4.pg3"],
"ne30": ["ne30np4.pg3", "ne30np4.pg2", "ne30np4"],
"ne0np4": [
"ne0np4.ARCTICGRIS.ne30x8",
"ne0np4.ARCTIC.ne30x4",
"ne0np4CONUS.ne30x8",
"ne0np4.POLARCAP.ne30x4",
],
"ne120": [
"ne120": ["ne120np4.pg3"],
"vr_and_ne120": [
"ne0np4.ARCTICGRIS.ne30x8",
"ne0np4.ARCTIC.ne30x4",
"ne0np4CONUS.ne30x8",
"ne0np4.POLARCAP.ne30x4",
"ne0np4.NATL.ne30x8",
"ne120np4.pg3",
],
}
Expand All @@ -233,7 +232,7 @@ def main():
dataset_dict = {
"global-potveg": (
"--start-year 1850 --end-year 1850 --nocrop --potveg --res",
"f09",
"potveg_res",
),
"global-present": (
"--start-year 2000 --end-year 2000 --nocrop --res",
Expand All @@ -251,9 +250,9 @@ def main():
"--start-year 1850 --end-year 2023 --nocrop --res",
"f19",
),
"global-hist-1850-f45": (
"global-hist-1850-low-res": (
"--start-year 1850 --end-year 2023 --nocrop --res",
"f45",
"low_res_no_crop",
),
"crop-tropics-present": (
"--start-year 2000 --end-year 2000 --res",
Expand All @@ -275,9 +274,9 @@ def main():
"--start-year 2000 --end-year 2000 --res",
"ne30",
),
"crop-global-present-ne120": (
"crop-global-present-vrandne120": (
"--start-year 2000 --end-year 2000 --res",
"ne120",
"vr_and_ne120",
),
"crop-global-present-mpasa480": (
"--start-year 2000 --end-year 2000 --res",
Expand Down Expand Up @@ -311,6 +310,10 @@ def main():
"--start-year 1850 --end-year 1850 --res",
"mpasa480",
),
"crop-global-hist-mpasa480": (
"--start-year 1850 --end-year 2023 --nosurfdata --res",
"mpasa480",
),
"crop-global-hist": (
"--start-year 1850 --end-year 2023 --nosurfdata --res",
"standard_res_no_f09",
Expand All @@ -327,9 +330,9 @@ def main():
"--start-year 1850 --end-year 2023 --nosurfdata --res",
"ne30",
),
"crop-global-hist-f09": (
"crop-global-hist-1700": (
"--start-year 1700 --end-year 2023 --res",
"f09",
"1700_res",
),
"crop-global-SSP1-1.9-f09": (
"--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP1-1.9 --res",
Expand Down Expand Up @@ -359,9 +362,9 @@ def main():
"--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res",
"f45",
),
"crop-global-SSP2-4.5-ne0np4": (
"--start-year 1979 --end-year 2026 --ssp-rcp SSP2-4.5 --res",
"ne0np4",
"crop-global-SSP2-4.5-vrandne120": (
"--start-year 1979 --end-year 2030 --ssp-rcp SSP2-4.5 --res",
"vr_and_ne120",
),
"crop-global-SSP2-4.5-ne3": (
"--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res",
Expand Down
32 changes: 19 additions & 13 deletions tools/mksurfdata_esmf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# To generate a single dataset, run make with the name of the rule you
# want to build. For example, to generate the crop data set for 1x1_numaIA:
#
# make crop-numa
# make 1x1-numa-present
#
# NOTE: The default behavior is to parallelize data set creation using
# the batch system by submitting jobs to the batch queue (on Derecho).
Expand Down Expand Up @@ -87,19 +87,22 @@ SUBSETDATA_1X1_URBALPHA := --lat -37.7308 --lon 360 --site 1x1_urbanc_alpha -
# 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
# global-hist-1850-low-res is used by FATES; we expected to phase it out, but to f45 we added f10 in ctsm5.4
STANDARD = \
global-potveg \
global-present \
global-present-low-res \
global-hist-1850-f19 \
global-hist-1850-f45 \
global-hist-1850-low-res \

# NOTE slevis 2025/9/10: For CTSM5.4, I removed from CROP:
# crop-global-future
# and I added here because it spans 1979-2030:
# crop-global-SSP2-4.5-vrandne120
CROP = \
crop-global-future \
crop-global-hist-f09 \
crop-global-hist-1700 \
crop-global-1850-ne120 \
crop-global-present-ne120 \
crop-global-present-vrandne120 \
crop-global-present-nldas \
crop-global-present-ne30 \
crop-global-present \
Expand All @@ -111,6 +114,7 @@ CROP = \
crop-global-1850-ne16 \
crop-global-1850-ne30 \
crop-global-1850-mpasa480 \
crop-global-SSP2-4.5-vrandne120 \

# Build the executable if it doesn't exist and any target depends on it
$(MKSURFDATA_EXE):
Expand All @@ -127,11 +131,12 @@ all : all-subset global-present-ultra-hi-res crop standard crop-tropics-present

# These are all the surface datasets generated by subset_data
# This runs interactively and does not send jobs to the batch queue
# NOTE slevis 2025/9/10: For CTSM5.4, I removed from all-subset:
# 1x1_brazil-transient
# 1x1-smallville-present
all-subset : \
1x1_brazil-present \
1x1_brazil-transient \
1x1-numa-present \
1x1-smallville-present \
1x1-smallville-1850 \
1x1-smallville-transient \
1x1-cidadinho-present \
Expand Down Expand Up @@ -171,7 +176,7 @@ global-present-low-res : FORCE
global-hist-1850-f19 : FORCE
$(MKSURFDATA) --number-of-nodes 8 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]
global-hist-1850-f45 : FORCE
global-hist-1850-low-res : FORCE
$(MKSURFDATA) --number-of-nodes 2 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]
#
Expand Down Expand Up @@ -216,7 +221,7 @@ crop-global-present-ne30 : FORCE
$(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file [email protected] --walltime 01:00:00
$(BATCHJOBS) [email protected]

crop-global-present-ne120 : FORCE
crop-global-present-vrandne120 : FORCE
$(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file [email protected] --walltime 01:00:00
$(BATCHJOBS) [email protected]

Expand Down Expand Up @@ -256,7 +261,7 @@ crop-global-hist : FORCE
$(MKSURFDATA) --number-of-nodes 72 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]

crop-global-hist-f09 : FORCE
crop-global-hist-1700 : FORCE
$(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]

Expand Down Expand Up @@ -310,12 +315,13 @@ crop-global-future : crop-global-SSP1-1.9-f09 \
crop-global-SSP2-4.5-low-res : crop-global-SSP2-4.5-f10 \
crop-global-SSP2-4.5-f45 \
crop-global-SSP2-4.5-ne3
# NOTE slevis 2025/9/10: For CTSM5.4, I moved to CROP because it spans 1979-2030:
# crop-global-SSP2-4.5-vrandne120
crop-global-SSP2-4.5 : crop-global-SSP2-4.5-f09 \
crop-global-SSP2-4.5-f19 \
crop-global-SSP2-4.5-hcru \
crop-global-SSP2-4.5-ne16 \
crop-global-SSP2-4.5-ne30 \
crop-global-SSP2-4.5-ne0np4 \
crop-global-SSP2-4.5-C96 \
crop-global-SSP2-4.5-mpasa120

Expand Down Expand Up @@ -359,7 +365,7 @@ crop-global-SSP2-4.5-ne30 : FORCE
$(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]

crop-global-SSP2-4.5-ne0np4 : FORCE
crop-global-SSP2-4.5-vrandne120 : FORCE
$(MKSURFDATA) --number-of-nodes 2 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
$(BATCHJOBS) [email protected]

Expand Down
Loading