Skip to content

enable NEON v4 data #3597

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

Closed
wwieder wants to merge 159 commits into from
Closed

enable NEON v4 data #3597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
a999afb
big commit
lifang0209 May 30, 2025
88a32eb
Include abm = 13 values when determining dominant abm in mksurfdata_esmf
slevis-lmwg Jun 4, 2025
7477372
Change unsetmon from 13 to 14
slevis-lmwg Jun 4, 2025
16a1921
Adding comments explaining some of mkagfirepkmonthMod.F90
slevis-lmwg Jun 4, 2025
7d7a49e
mkagfirepkmonthMod: Add some TODOs.
samsrabin Jun 5, 2025
7f28c6f
Remove unsetmon as recommended in the code review
slevis-lmwg Jun 5, 2025
1469512
Document more variables as recommended in the code review
slevis-lmwg Jun 5, 2025
f70e958
Merge tag 'ctsm5.3.055' into abm_dominant_in_mksurfdata_esmf
slevis-lmwg Jun 5, 2025
27259b1
Update paths in gen_mksurfdata_namelist.xml and get mods from #3224
slevis-lmwg Jun 6, 2025
b9feb79
Merge remote-tracking branch 'escomp/alpha-ctsm5.4.CMIP7' into abm_do…
slevis-lmwg Jun 13, 2025
ff3bc9e
Correct a message to the user in gen_mksurfdata_jobscript_*.py files
slevis-lmwg Jun 13, 2025
bd3ce96
Corrections to messages to the user
slevis-lmwg Jun 13, 2025
5d426ba
Refine message to the user
slevis-lmwg Jun 13, 2025
bd0c628
Bring back unsetmon but equal to 14 for ocean to not skew the regridding
slevis-lmwg Jun 17, 2025
9e5c37b
Merge branch 'abm_dominant_in_mksurfdata_esmf' into mk_ctsm54_datasets
slevis-lmwg Jun 17, 2025
fd503dc
Merge remote-tracking branch 'samsrabin/subset_data-lon-fixes' into m…
slevis-lmwg Jun 17, 2025
f84e650
Update Makefile and .cfg file to accommodate changes in subset_data
slevis-lmwg Jun 18, 2025
7fc50e4
Merge pull request #3224 from slevis-lmwg/abm_dominant_in_mksurfdata_…
slevis-lmwg Jun 18, 2025
c106c33
Correct inadvertent conflict that crept in with one of the merges
slevis-lmwg Jun 18, 2025
f6a903e
Update to new abm raw dataset provided today by Fang Li
slevis-lmwg Jul 15, 2025
4f71910
Merge tag 'ctsm5.3.063' into alpha-ctsm5.4.CMIP7
slevis-lmwg Jul 22, 2025
b38e5f8
Merge pull request #3344 from slevis-lmwg/merge_master_to_alpha
slevis-lmwg Jul 22, 2025
9790364
Merge tag 'ctsm5.3.063' into mk_ctsm54_datasets
slevis-lmwg Jul 22, 2025
d3cf177
Update default popdens stream file
slevis-lmwg Jul 22, 2025
bf0cb1c
Merge tag 'alpha-ctsm5.4.CMIP7.03.ctsm5.3.063' into mk_ctsm54_datasets
slevis-lmwg Jul 23, 2025
fd3c96b
Merge pull request #3233 from slevis-lmwg/mk_ctsm54_datasets
slevis-lmwg Jul 23, 2025
a945178
Urban mesh was pointing to a 3x3min instead of a 0.25x0.25 file
slevis-lmwg Jul 23, 2025
d10ee57
Merge pull request #3347 from slevis-lmwg/urban_mesh_correction
slevis-lmwg Jul 23, 2025
473db81
Add ctsm54 ne30, f09, f19 fsurdat/landuse files to namelist defaults
slevis-lmwg Jul 24, 2025
2b9a05b
Merge pull request #3349 from slevis-lmwg/upd_nml_default_fsurdat_lan…
slevis-lmwg Jul 24, 2025
d6f97ff
New hdm stream file should be used only with clm6 by default
slevis-lmwg Jul 25, 2025
1f19dbb
Merge pull request #3361 from slevis-lmwg/new_hdm_clm6_only
slevis-lmwg Jul 25, 2025
66b83d1
Remove 64bitoffset suffix from finidat to use the unmodified files
slevis-lmwg Jul 25, 2025
204198a
Remove LII2 tests from expected fails
slevis-lmwg Jul 25, 2025
1483483
Merge pull request #3362 from slevis-lmwg/fix_failing_LII2_tests
slevis-lmwg Jul 25, 2025
16e5391
Merge pull request #3406 from slevis-lmwg/megan_use_gamma_sm_false
slevis-lmwg Aug 11, 2025
d67ed0c
Merge remote-tracking branch 'escomp/alpha-ctsm5.4.CMIP7' into ctsm6_…
samsrabin Aug 12, 2025
5cc650a
defo_fire_precip_thresh_bet now 3.0 for li2024crujra.
samsrabin Aug 12, 2025
b1a9acd
cropfire_a1 now 0.32 for li2024crujra.
samsrabin Aug 12, 2025
dec8131
CNFireLi2024Mod: Improve comments.
samsrabin Aug 12, 2025
cfb4648
cli_scale updated for li2024* fire methods.
samsrabin Aug 12, 2025
8fa0747
Set init_interp_fill_missing_urban_with_HD = .true. always
slevis-lmwg Aug 15, 2025
0991175
Merge pull request #3419 from slevis-lmwg/init_interp_fill_missing_ur…
slevis-lmwg Aug 16, 2025
1fec91a
Merge remote-tracking branch 'samsrabin/b4b-dev-merge-20250822' into …
samsrabin Aug 22, 2025
57c4a15
Update clm6_0 paramfile with Fang's fire changes.
samsrabin Aug 22, 2025
baa7660
CNFireLi2024Mod: Delete ">10% crop" condition.
samsrabin Aug 22, 2025
71f9680
li2024crujra cropfire_a1: was 0.32, now 0.34.
samsrabin Aug 22, 2025
365e10b
Merge tag 'alpha-ctsm5.4.CMIP7.09.ctsm5.3.068' into ctsm6_li2024
samsrabin Aug 22, 2025
9c59d7e
namelist_defaults_ctsm.xml: Group stream_fldfilename_cultivar_gdds li…
samsrabin Aug 25, 2025
f4694d7
Update default stream_fldfilename_cultivar_gdds.
samsrabin Aug 25, 2025
bfd9e64
Merge tag 'ctsm5.3.071' into ctsm5.4_update5.3.071
ekluzek Aug 30, 2025
d526c5a
Merge pull request #3464 from ekluzek/ctsm5.4_update5.3.071
slevis-lmwg Sep 8, 2025
3123c32
Merge tag 'alpha-ctsm5.4.CMIP7.09.ctsm5.3.071' into ctsm6_li2024
samsrabin Sep 9, 2025
6c08359
Add LII2FINIDATAREAS tests to expected fails.
samsrabin Sep 9, 2025
ab03812
Add ISSP test to expected fails.
samsrabin Sep 9, 2025
1b214aa
Merge tag 'alpha-ctsm5.4.CMIP7.09.ctsm5.3.071' into make_ctsm54_datasets
slevis-lmwg Sep 9, 2025
32a4310
Merge pull request #3204 from lifang0209/ctsm6_li2024
samsrabin Sep 9, 2025
30006c4
Merge tag 'alpha-ctsm5.4.CMIP7.10.ctsm5.3.071' into crujra-crop-inputs
samsrabin Sep 9, 2025
77f0580
Failed attempt to fix stream_fldfilename_cultivar_gdds logic.
samsrabin Sep 10, 2025
f28f74c
Fix stream_fldfilename_cultivar_gdds logic.
samsrabin Sep 10, 2025
70e89cc
Fix stream_fldfilename_cultivar_gdds logic???
samsrabin Sep 10, 2025
5e41f47
Revert failed attempts to fix stream_fldfilename_cultivar_gdds logic.
samsrabin Sep 10, 2025
e7fa6e5
cropcals_rx_adapt fallback to correct stream_fldfilename_cultivar_gdds.
samsrabin Sep 10, 2025
e69570a
Update Makefile/_multi.py to accommodate new fsurdat/landuse needs
slevis-lmwg Sep 10, 2025
86331ef
ClmBuildNamelist: Add lnd_tuning_mode to stream_fldfilename_cultivar_…
samsrabin Sep 10, 2025
4faa434
Merge tag 'alpha-ctsm5.4.CMIP7.10.ctsm5.3.071' into make_ctsm54_datasets
slevis-lmwg Sep 10, 2025
7d2e398
Merge pull request #3474 from samsrabin/crujra-crop-inputs
samsrabin Sep 11, 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
136c42a
Merge tag 'ctsm5.3.075' into upd_54branch_to_075
slevis-lmwg Sep 18, 2025
14cab8a
Add new expected failure for issue #3495
slevis-lmwg Sep 19, 2025
ffbdcb4
Merge pull request #3493 from slevis-lmwg/upd_54branch_to_075
slevis-lmwg Sep 19, 2025
70e778b
Merge tag 'alpha-ctsm5.4.CMIP7.11.ctsm5.3.075' into make_ctsm54_datasets
slevis-lmwg Sep 19, 2025
e66386b
Introduce cmip_era flag (= cmip6 or cmip7) to namelist_defaults
slevis-lmwg Sep 24, 2025
0f4808c
Introduce CLM_CMIP_ERA flag to env_run.xml (= cmip6 or cmip7)
slevis-lmwg Sep 24, 2025
a30efab
Remove newly introduced namelist_defaults_cmip_era.xml
slevis-lmwg Sep 26, 2025
f408835
Add cmip7 flag also for historical landuse files (f09, f19, ne30)
slevis-lmwg Sep 26, 2025
0cf3e80
Add the cmip_era flag to all fsurdat/landuse add_default calls
slevis-lmwg Sep 26, 2025
6101487
Rm previously expected failures requiring finidat with c13/c14 to PASS
slevis-lmwg Sep 30, 2025
3a0870f
Rm another expected failure that required finidat with c13/c14 to PASS
slevis-lmwg Sep 30, 2025
db3540d
Mention CLM_CMIP_ERA in namelist error message for easier debugging
slevis-lmwg Oct 1, 2025
3b15fbc
namelist_defaults updates for better error catching
slevis-lmwg Oct 1, 2025
1283fb7
Remove another expected failure documented in issue #1733
slevis-lmwg Oct 1, 2025
14f647d
Remove expected failure in MODEL_BUILD documented in issue #3182
slevis-lmwg Oct 1, 2025
6c8128a
Add details to CLM_CMIP_ERA documentation in env_run.xml
slevis-lmwg Oct 2, 2025
a812454
Add back the cmip6 flanduse defaults for f09, f19, ne30
slevis-lmwg Oct 2, 2025
968eb7b
Add back the cmip6 fsurdat default for f09 2000
slevis-lmwg Oct 2, 2025
d4af81e
Add another detail to the CLM_CMIP_ERA documentation in env_run.xml
slevis-lmwg Oct 2, 2025
7bf8c5b
Add same details to the cmip_era documentation in namelist_definition
slevis-lmwg Oct 2, 2025
edf26a7
Put back use_init_interp that I removed in 71f2db2
slevis-lmwg Oct 2, 2025
26d8088
Remove SSP test from expected fails
slevis-lmwg Oct 2, 2025
c429f5f
Changing build-namelist_test.pl; corresponding bug-fix in nml defaults
slevis-lmwg Oct 8, 2025
db26aaa
Fix 2 build-namelist tests that started failing in ctsm5.3.032
slevis-lmwg Oct 9, 2025
f16276d
Rename 2nd inventoryfileDNE test to useFATESLUH2fileDNE
slevis-lmwg Oct 9, 2025
8100fa8
Resolve build-namelist tests, though not all, yet
slevis-lmwg Oct 9, 2025
3beef40
Resolved remaining fails (except 2 expected ones) in build-namelist
slevis-lmwg Oct 9, 2025
807040d
Change from "if a equals b" to "if a contains b" where b are SSP cases
slevis-lmwg Oct 13, 2025
826cee4
Add LAI streams test to expected fails for now
slevis-lmwg Oct 13, 2025
2e271ca
Remove unnecessary change to namelist_definition_ctsm.xml
slevis-lmwg Oct 13, 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
4ff9e68
New and updated comments pertaining to CLM_CMIP_ERA
slevis-lmwg Oct 14, 2025
e19a51e
Merge pull request #3501 from slevis-lmwg/cmip_era_support
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
92ee1a1
Point to corrected raw lai file and corresp. soil color file
slevis-lmwg Oct 15, 2025
f1ea888
Correction to soilcolor file name
slevis-lmwg Oct 15, 2025
e64f426
Upd. to latest 1700-2023 & noanthro landuse files
slevis-lmwg Oct 16, 2025
bbc9e40
Add test back to expected failures (issue #1733)
slevis-lmwg Oct 16, 2025
6a5ecfe
Merge tag 'ctsm5.3.079' into upd_alpha54_to_079
slevis-lmwg Oct 16, 2025
37ae51e
Stop NOANTHRO from defaulting to cmip_era cmip6
slevis-lmwg Oct 17, 2025
f4f59ca
Merge branch 'make_ctsm54_datasets' into new_raw_lai_and_soilcolor
slevis-lmwg Oct 17, 2025
2cca29a
Merge pull request #3554 from slevis-lmwg/upd_alpha54_to_079
slevis-lmwg Oct 17, 2025
157d3ae
Merge branch 'alpha-ctsm5.4.CMIP7' into make_ctsm54_datasets
slevis-lmwg Oct 17, 2025
b9b9c73
Merge pull request #3482 from slevis-lmwg/make_ctsm54_datasets
slevis-lmwg Oct 17, 2025
eb4c385
Merge branch 'alpha-ctsm5.4.CMIP7' into new_raw_lai_and_soilcolor
slevis-lmwg Oct 17, 2025
5399e09
Change VR and ne120 year range from 1979-2030 to 1979-2023
slevis-lmwg Oct 17, 2025
ad3b2c9
Upd. to ccs_config_cesm1.0.61_add_domain_ne3np4.pg2_1 to gen. datasets
slevis-lmwg Oct 20, 2025
fb4306b
Add comments as recommended in code review
slevis-lmwg Oct 21, 2025
7e9c184
Merge pull request #3555 from slevis-lmwg/new_raw_lai_and_soilcolor
slevis-lmwg Oct 22, 2025
6c1cc2d
CTSM5.4 updates to default_data_[1850,2000].cfg & modify_smallville.sh
slevis-lmwg Oct 23, 2025
637c86b
Merge pull request #3562 from slevis-lmwg/make_all_subset
slevis-lmwg Oct 23, 2025
1a3fe3f
Merge tag 'ctsm5.3.082' into upd_alpha54_to_082
slevis-lmwg Oct 27, 2025
8e669a4
Merge pull request #3569 from slevis-lmwg/upd_alpha54_to_082
slevis-lmwg Oct 28, 2025
05baeec
Prevent IHist ne0np4 from ending up with SSP designation
slevis-lmwg Oct 28, 2025
a94b45f
Update fsurdat/landuse paths in namelist_defaults (WIP)
slevis-lmwg Oct 28, 2025
7fa5d7a
Merge tag 'alpha-ctsm5.4.CMIP7.15.ctsm5.3.082' into upd_nml_defaults_…
slevis-lmwg Oct 28, 2025
8325e76
Add/remove fsurdat/landuse paths according to the grids spreadsheet
slevis-lmwg Oct 29, 2025
a41b9c5
CTSM5.4 updates to finidata (not all tests pass so troubleshooting)
slevis-lmwg Oct 30, 2025
ad7251d
hgrid="10x15" needed cmip6/cmip7 distinction for tests to pass
slevis-lmwg Oct 30, 2025
9104e37
Add back use_init_interp for failing f09 test, ne30 test
slevis-lmwg Oct 31, 2025
db6c43f
Additions in prep for the next PR where we add tests for new grids
slevis-lmwg Oct 31, 2025
2f70dc3
Merge pull request #3576 from slevis-lmwg/upd_nml_defaults_ctsm54
slevis-lmwg Nov 6, 2025
a11cede
Add ctsm_sci tests for new grids (ctsm5.4)
slevis-lmwg Nov 6, 2025
6d702a2
namelist_defaults updates for ne120pg3 to pick up correct finidat
slevis-lmwg Nov 7, 2025
81f5dda
fixes #3594
wwieder Nov 10, 2025
cc4ba82
Add IHist test for the new ne3pg2 grid
slevis-lmwg Nov 10, 2025
69453b7
finidat update from code review, plus a typo correction
slevis-lmwg Nov 14, 2025
ff015ae
Merge pull request #3587 from slevis-lmwg/ctsm_sci_tests_for_new_grids
slevis-lmwg Nov 14, 2025
aae49a0
fsurdat validation tool
slevis-lmwg Nov 14, 2025
eca1eb0
Revised validation tool based on Erik's code review
slevis-lmwg Nov 18, 2025
a5b18cc
Merge pull request #3612 from slevis-lmwg/fsurdat_validation_tool
slevis-lmwg Nov 18, 2025
669a651
Update default CRU-JRA stream_fldfilename_cultivar_gdds.
samsrabin Nov 20, 2025
f03f383
Update default CRU-JRA stream_fldFileName_gdd20_baseline.
samsrabin Nov 20, 2025
8547e79
Update clm6 paramfile: omni02 crop params.
samsrabin Nov 20, 2025
cb95678
Use old stream_fldFileName_gdd20_baseline for GSWP3 tunings.
samsrabin Nov 20, 2025
368b3d0
CLMBuildNamelist: Account for lnd_tuning_mode in setting stream_fldFi…
samsrabin Nov 21, 2025
47c7e92
Merge pull request #3618 from samsrabin/crop-newcals-and-omni02
samsrabin Nov 22, 2025
409e589
Merge remote-tracking branch 'escomp/post-5.4' into NEON_v4
slevis-lmwg Nov 26, 2025
eb68400
Revert "Merge remote-tracking branch 'escomp/post-5.4' into NEON_v4"
slevis-lmwg Nov 26, 2025
37808da
Merge remote-tracking branch 'escomp/master' into NEON_v4
slevis-lmwg Nov 26, 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
2 changes: 1 addition & 1 deletion cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@

<entry id="NEONVERSION">
<type>char</type>
<valid_values>v1,v2,v3,latest</valid_values>
<valid_values>v1,v2,v3,v4,latest</valid_values>
<default_value>latest</default_value>
<group>run_component_ctsm</group>
<file>env_run.xml</file>
Expand Down
2 changes: 1 addition & 1 deletion python/ctsm/site_and_regional/tower_arg_parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def get_parser(args, description, valid_neon_sites, valid_plumber_sites):
dest="user_version",
required=False,
type=str,
choices=["v1", "v2", "v3"],
choices=["v1", "v2", "v3", "v4"],
)

parser.add_argument(
Expand Down
Loading