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.

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

ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability for warm starts in PTS mode #2835

Merged
Changes from 33 commits
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
bdf6b32
Changes to remove 0th timestep
olyson Jun 1, 2023
e15789d
Delete unused hist_add_subscript method (no references in the CTSM repo)
johnpaulalex Jun 14, 2023
ecdddf3
Remove data only used by hist_add_subscript
johnpaulalex Jun 21, 2023
b85efc1
Doc that masterlist's actflag is only set for primary history tape in…
johnpaulalex Jun 21, 2023
a9eb1e7
Changes for lilac
olyson Jul 25, 2023
b8be204
Remove do while loop and dosend variable.
olyson Jul 25, 2023
7f38c07
Fix unit tests for nstep starting at 1 instead of 0
billsacks Jul 25, 2023
55184f4
Merge pull request #1 from billsacks/zerothtstep
olyson Jul 26, 2023
750ed1d
Cleanup.
olyson Jul 27, 2023
198ac31
Merge branch 'zerothtstep' of https://github.com/olyson/ctsm into zer…
olyson Jul 27, 2023
caa384b
Remove comment.
olyson Aug 1, 2023
0dfd901
Remove BACKWARD COMPATIBILITY comment.
olyson Aug 3, 2023
a3a25a5
Merge branch 'master' into remove_unused
ekluzek Aug 10, 2023
d5b007f
Merge tag 'ctsm5.1.dev147' into zerothtstep
olyson Nov 1, 2023
c9c89a8
Correct a comment.
samsrabin Nov 1, 2023
d059220
Print error()s to console, not just log file.
samsrabin Nov 1, 2023
b311d1d
Rearrange search for h2 files in import_and_process_1yr().
samsrabin Nov 1, 2023
fa843e5
Fix h2 file patterns in import_and_process_1yr().
samsrabin Nov 1, 2023
11b6042
Merge pull request #2 from samsrabin/zerothtstep-fix-RXCROPMATURITY
olyson Nov 2, 2023
c0bf3a1
BNF usermods
wwieder Mar 18, 2024
258792e
If avgflag /= 'I', time_bounds is present and time = mid of time_bounds
slevis-lmwg Mar 28, 2024
89e9f32
Update WhatsNewInCTSM5.3.md
samsrabin Sep 25, 2024
9f07cf9
add timestamps to rpointer files
jedwards4b Sep 26, 2024
887ceb8
Merge tag 'ctsm5.3.0' into add_timestamp_to_rpointers
jedwards4b Sep 27, 2024
cddf7e7
Merge tag 'ctsm5.3.002' into add_timestamp_to_rpointers
jedwards4b Sep 30, 2024
d6bbcc2
Update namelist_defaults with ne3np4 fsurdat/landuse files
slevis-lmwg Oct 16, 2024
d48575b
Add ne3np4 fsurdat/landuse generation to Makefile
slevis-lmwg Oct 16, 2024
8002a9d
Small important correction to namelist_defaults_ctsm.xml
slevis-lmwg Oct 16, 2024
8f6905c
Add build-namelist tests for ne3np4 same as existing ne3np4.pg3
slevis-lmwg Oct 16, 2024
718bd41
reverse initialization of alarm_stop and alarm_restart
jedwards4b Oct 17, 2024
020db62
Merge commit '258792e9c2ecf34d5e7dd58b556b34330edd0884' into hist_tim…
slevis-lmwg Oct 17, 2024
1e81456
Remove a comment unrelated to these modifications
slevis-lmwg Oct 17, 2024
23bb341
Update namelist_defaults with ne3np4 fsurdat/landuse files
slevis-lmwg Oct 16, 2024
7254256
Add ne3np4 fsurdat/landuse generation to Makefile
slevis-lmwg Oct 16, 2024
99dd05a
Small important correction to namelist_defaults_ctsm.xml
slevis-lmwg Oct 16, 2024
68eec54
Add build-namelist tests for ne3np4 same as existing ne3np4.pg3
slevis-lmwg Oct 16, 2024
f1f3be7
Change ptsRLA and ptsRLO tests to ne3 in testlist_clm.xml
slevis-lmwg Oct 23, 2024
f37d0b5
Merge remote-tracking branch 'slevis-lmwg/ne3np4_to_defaults_and_make…
slevis-lmwg Oct 23, 2024
981c1b0
Updating the ptsRLA and ptsRLO tests to the correct ne3 grid
slevis-lmwg Oct 23, 2024
8dc7355
Merge branch 'cesm3_0_beta04_changes' into ne3np4_to_defaults_and_mak…
slevis-lmwg Oct 24, 2024
3f6ee73
Merge master into BNF_v2
wwieder Oct 31, 2024
87afe5c
updates for ne3np4 scam
jtruesdal Nov 4, 2024
e381e9d
alternative nfix temperature cost function
wwieder Nov 7, 2024
a389e6d
Merge branch 'cesm3_0_beta04_changes' into ne3np4_to_defaults_and_mak…
slevis-lmwg Nov 8, 2024
268ad5a
Merge tag 'ctsm5.3.010' into zerothtstep
slevis-lmwg Nov 12, 2024
d07fd9d
Removed comments with prefix !KO
slevis-lmwg Nov 12, 2024
0f54bc2
Merge tag 'ctsm5.3.011' into zerothtstep
slevis-lmwg Nov 12, 2024
a4b9dcf
Update docstring of is_first_step function
slevis-lmwg Nov 12, 2024
88d5b0f
cleanup and print errors
wwieder Nov 12, 2024
4d0ac48
New update of function's docstring
slevis-lmwg Nov 12, 2024
e578ae7
Fix typo in comment
slevis-lmwg Nov 12, 2024
bd51b8c
Correct a variable name that came in with a merge conflict
slevis-lmwg Nov 12, 2024
ac08121
remove print statements
wwieder Nov 12, 2024
e87b119
Correct another error that came in with a merge conflict
slevis-lmwg Nov 13, 2024
18acd55
Merge remote-tracking branch 'escomp/master' into hist_time_mid_of_ti…
slevis-lmwg Nov 13, 2024
c42cd12
Update .gitmodules to the mosart/rtm tags corresponding to this ctsm
slevis-lmwg Nov 13, 2024
71fbe09
cropcal_module.py import_output(): Handle "instantaneous files."
samsrabin Nov 14, 2024
dedd134
removing BNF usermod_dirs
wwieder Nov 15, 2024
f125b60
Merge branch 'master' into BNF_v2
wwieder Nov 15, 2024
a51816e
Reformat with black.
samsrabin Nov 15, 2024
3220dbb
Add previous commit to .git-blame-ignore-revs.
samsrabin Nov 15, 2024
f147be3
Revert "fix typo in fates hydro user_nl_clm"
glemieux Nov 15, 2024
ea475c1
Revert "add shell call to generate fates hydro parameter file on the …
glemieux Nov 15, 2024
760eb96
Merge pull request #16 from samsrabin/ctsm_hist_time_mid_of_time_boun…
slevis-lmwg Nov 15, 2024
ea91981
Draft ChangeLog/ChangeSum
slevis-lmwg Nov 15, 2024
c7e1366
Revert change I brought in with the conflicts
slevis-lmwg Nov 15, 2024
f85104b
Merge branch 'hist_time_mid_of_time_bounds' into zerothtstep
slevis-lmwg Nov 15, 2024
5148dbc
Update .gitmodules to the mosart/rtm tags corresponding to this ctsm
slevis-lmwg Nov 15, 2024
dc295f7
Correct variable name that came in with the conflicts
slevis-lmwg Nov 15, 2024
ac5a615
update fates tag to sci.1.80.1_api.37.0.0
glemieux Nov 18, 2024
67117da
Update parameter files with the new nfix fields on them
ekluzek Nov 19, 2024
9d9337b
fix (namelist): Change paramfiles to name without nfix in the name, a…
ekluzek Nov 19, 2024
eeedbc6
Change "if instantaneous" statement with more appropriate conditional
slevis-lmwg Nov 22, 2024
1d5f4f2
Merge tag 'ctsm5.3.013' into merge-master-20241126
ekluzek Nov 26, 2024
7417668
Merge pull request #2894 from ekluzek/merge-master-20241126
ekluzek Nov 26, 2024
1d824b8
Merge pull request #2888 from ESCOMP/cesm3_0_beta04_changes
ekluzek Dec 3, 2024
45fb774
Merge branch 'master' into add_timestamp_to_rpointers
ekluzek Dec 4, 2024
de9bcc0
update(submodules): Bring in cdeps1.0.57 that has a change for cplhis…
ekluzek Dec 4, 2024
c416479
Update direcotries for submodule update
ekluzek Dec 4, 2024
7df2c84
Update cam7 tuning to use the radsw of -1 and nextsw_cday to be the c…
ekluzek Dec 4, 2024
46015e9
ctsm warm_start mods
jtruesdal Dec 4, 2024
ee5261a
This is my understanding of the submodules that need to be used with …
ekluzek Dec 5, 2024
277384b
Another cime submodule update regarding rpointer things
ekluzek Dec 5, 2024
a5506fc
First stab at the submodules needed for the rpointer changes, this do…
ekluzek Dec 5, 2024
5d8a23d
Update to latest cime with a new rpointer fix
ekluzek Dec 5, 2024
63fef2f
Merge branch 'add_timestamp_to_rpointers' into cesm3_0_beta05_submodules
ekluzek Dec 5, 2024
66b680d
Fix a syntax error that nag caught
ekluzek Dec 6, 2024
da2c5d9
Merge remote-tracking branch 'escomp/b4b-dev' into BNF_v2
slevis-lmwg Dec 6, 2024
80a32ba
Move nfix_method from a hardwired variable to the namelist
slevis-lmwg Dec 6, 2024
9a96642
Update cmeps, cime, share submodules to fix some testing issues
ekluzek Dec 9, 2024
bd06342
Update cmeps, cime, share submodules to fix some testing issues
ekluzek Dec 9, 2024
35dcfb4
Change tagname for share tag
ekluzek Dec 10, 2024
f2f1039
Move usermods_dirs under a clm subdirectory due to a change in cime i…
ekluzek Dec 11, 2024
3341540
Add the clm directory when the usermods_Dirs directory is referenced
ekluzek Dec 11, 2024
ae9986f
More change of usermods dirs to be under the clm subdir
ekluzek Dec 11, 2024
6e5b1b8
Correct path to NEON/PLUMBER2 user_mods_dirs
ekluzek Dec 11, 2024
acd2266
More usermods_dir corrections
ekluzek Dec 11, 2024
bb6a896
Fix some tests with bad test lengths, they all should have been 765 days
ekluzek Dec 12, 2024
df1d73a
update cmeps to fix TESTCASE issue
jedwards4b Dec 13, 2024
df66636
Point to cmeps tag
ekluzek Dec 13, 2024
7413167
update fates tag to sci.1.80.4_api.37.0.0
glemieux Dec 13, 2024
9b0be80
Add if statement to CLMBuildNamelist for correct trigger of error
slevis-lmwg Dec 13, 2024
277f6a2
Update cime and cmeps
ekluzek Dec 16, 2024
20c3709
Add comments on arguments and add error checking for data being sent …
ekluzek Dec 16, 2024
14aad99
Merge branch 'add_timestamp_to_rpointers' of github.com:jedwards4b/CT…
ekluzek Dec 16, 2024
2db5c6a
Merge pull request #2869 from wwieder/BNF_v2
slevis-lmwg Dec 16, 2024
c0bca6b
Merge remote-tracking branch 'jedwards4b/add_timestamp_to_rpointers' …
ekluzek Dec 17, 2024
dd534e8
Update for cdeps
ekluzek Dec 17, 2024
f50e930
Update cdeps which solves the ERP issues on Izumi
ekluzek Dec 17, 2024
bd535c7
Run black
ekluzek Dec 17, 2024
f0bda7e
Add black reformat to git-blame-ignore
ekluzek Dec 17, 2024
73e44fd
Merge branch 'add_timestamp_to_rpointers' of github.com:jedwards4b/CT…
ekluzek Dec 17, 2024
5347b48
Update share to bring in needed updates for nuopc_shr_methods.F90 whi…
ekluzek Dec 17, 2024
e55a154
Correct test
ekluzek Dec 18, 2024
d5991c0
Start changelog
ekluzek Dec 18, 2024
de84a0d
Update expected fails
ekluzek Dec 18, 2024
4f59c76
Finish Change log
ekluzek Dec 18, 2024
4781b41
Merge pull request #2900 from ekluzek/update_cdeps_with_cam7_nextsw_c…
ekluzek Dec 18, 2024
d81356d
Merge ctsm5.3.015 in
ekluzek Dec 18, 2024
e2c1ae3
Update expected fails
ekluzek Dec 19, 2024
5880267
Start the change files
ekluzek Dec 19, 2024
8148ff3
Add expected fails for the mpi-serial tests since they are failing fo…
ekluzek Dec 19, 2024
48e5e16
Add SSP tests to expected fails
ekluzek Dec 19, 2024
b14d39d
Final Change files
ekluzek Dec 19, 2024
f437651
Merge pull request #2757 from jedwards4b/add_timestamp_to_rpointers
ekluzek Dec 19, 2024
e562c52
Merge tag 'ctsm5.3.016' into merge-b4bdev-20241220
slevis-lmwg Dec 20, 2024
d420b69
Update paramfiles for ciso_cwd_hr and cn30 testmods
slevis-lmwg Dec 20, 2024
49490c7
Updated ChangeLog/ChangeSum
slevis-lmwg Dec 20, 2024
20a8772
Merge tag 'ctsm5.3.016' into cesm3_0_beta05_submodules
ekluzek Dec 21, 2024
e06a33c
Update to latest from cesm3_0_alpha05c planned tags page, the cime up…
ekluzek Dec 21, 2024
fe0ec28
Code review responces, timemgr_restart is NO longer done instead of t…
ekluzek Dec 21, 2024
3b8c132
Add comments about the ordering of the stop and restart alarms
ekluzek Dec 21, 2024
f30e9f2
Remove obsolete clm5_1 entry
slevis-lmwg Dec 23, 2024
5e27db7
Error-check clean-up from Erik's code review
slevis-lmwg Dec 23, 2024
83e27f7
Move nfix_t* param-read from pftconMod (public) to CNFUNMod (local)
slevis-lmwg Dec 23, 2024
c3d9ecc
Move namelist read for nfix_method to CNFUNMod based on Erik's review
slevis-lmwg Dec 24, 2024
a73a961
Simplify equation based on Erik's review
slevis-lmwg Dec 24, 2024
b603c68
Final ChangeLog/ChangeSum
slevis-lmwg Dec 24, 2024
6cf9dde
Merge pull request #2917 from slevis-lmwg/merge-b4bdev-20241220
slevis-lmwg Dec 30, 2024
f10b014
Merge tag 'branch_tags/tmp-241219.n01.ctsm5.3.016' into merge-master-…
slevis-lmwg Dec 30, 2024
d4855ca
Merge pull request #2918 from slevis-lmwg/merge-master-20241230
slevis-lmwg Dec 30, 2024
8f15029
Merge tag 'ctsm5.3.016' into test-update-fateshydro
glemieux Jan 2, 2025
6142b68
Merge remote-tracking branch 'escomp/tmp-241219' into test-update-fat…
glemieux Jan 2, 2025
6603ed2
add PVT test issue #2919 to expected failures
glemieux Jan 2, 2025
f6bf737
Update submodules to latest slated for the cesm3_0_beta05 tag
ekluzek Jan 4, 2025
1a7b773
Merge branch 'b4b-dev' into cesm3_0_beta05_submodules
ekluzek Jan 4, 2025
cbe6109
Back up mosart and rtm, so it doesn't bring in answer changes
ekluzek Jan 5, 2025
2fbbae4
Merge branch 'cesm3_0_beta05_submodules' of github.com:ekluzek/CTSM i…
ekluzek Jan 5, 2025
adebf76
Update cime with a fix for SSP issues
ekluzek Jan 6, 2025
730bebe
Changes to get the LILACSMOKE test to work. Pass current time down to…
ekluzek Jan 6, 2025
1c81c98
Bug fix for izumi nag tests to pass
slevis-lmwg Jan 7, 2025
193f844
Bug fix for izumi nag tests to pass
slevis-lmwg Jan 7, 2025
c67acd5
update changelog
glemieux Jan 7, 2025
d59162c
Merge pull request #2926 from slevis-lmwg/fix_izumi_nag_in_b4bdev
ekluzek Jan 7, 2025
136970d
Update change files to point to the tags of the two tmp branch tags t…
ekluzek Jan 7, 2025
3196de7
Merge commit '136970d9f' into test-update-fateshydro
ekluzek Jan 7, 2025
e58aab5
Update timestamp in change files
ekluzek Jan 8, 2025
dccdac5
Merge pull request #2882 from glemieux/test-update-fateshydro
ekluzek Jan 8, 2025
02c8cc4
Merge remote-tracking branch 'escomp/tmp-241219' into fix_izumi_nag_t…
slevis-lmwg Jan 8, 2025
e97f9d4
Add flexCN_FUN_BNF test and corresponding testmods
slevis-lmwg Jan 8, 2025
126e026
Correct the phase_name for an expected failure
slevis-lmwg Jan 8, 2025
f1d1feb
Updated ChangeLog/ChangeSum
slevis-lmwg Jan 9, 2025
a322e75
Fix the mizuRoute tag, and bring in one more cime update for SRCROOT …
ekluzek Jan 9, 2025
b78e56a
Merge branch 'cesm3_0_beta05_submodules' of github.com:ekluzek/CTSM i…
ekluzek Jan 9, 2025
d19a679
Add submodule directory updates
ekluzek Jan 9, 2025
1224d97
Merge remote-tracking branch 'escomp/b4b-dev' into cesm3_0_beta05_sub…
ekluzek Jan 9, 2025
bcd684b
Finalize ChangeLog
slevis-lmwg Jan 9, 2025
caf8af9
Merge pull request #2925 from slevis-lmwg/fix_izumi_nag_tests
slevis-lmwg Jan 9, 2025
2d8f71d
Update ChangeSum
slevis-lmwg Jan 9, 2025
c12709b
Update ChageLog
slevis-lmwg Jan 9, 2025
5c2bc3f
Small update to ChangeLog
slevis-lmwg Jan 9, 2025
203db12
Merge pull request #2928 from slevis-lmwg/tmp-241219
slevis-lmwg Jan 9, 2025
ffeb713
Merge tag 'ctsm5.3.017' into hist_time_mid_of_time_bounds
slevis-lmwg Jan 9, 2025
332f7c1
Update to mosart1.1.06 and rtm1_0_84
slevis-lmwg Jan 10, 2025
5d87682
Update ChangeLog/Sum
slevis-lmwg Jan 10, 2025
3ffe654
Finalize ChangeLog
slevis-lmwg Jan 11, 2025
fb89f33
Merge pull request #2838 from slevis-lmwg/hist_time_mid_of_time_bounds
slevis-lmwg Jan 11, 2025
8b2f216
Merge remote-tracking branch 'escomp/master' into zerothtstep
slevis-lmwg Jan 11, 2025
36d95e0
bug fix for scam clm warmstart - SCT cam6_prep now produces BFB resul…
jtruesdal Jan 11, 2025
b867a3e
Merge tag 'ctsm5.3.017' into b4b-dev
ekluzek Jan 13, 2025
9c4d3dc
Merge pull request #2931 from ekluzek/update_to_17
ekluzek Jan 13, 2025
7b88335
Merge remote-tracking branch 'escomp/b4b-dev' into cesm3_0_beta05_sub…
ekluzek Jan 13, 2025
f3a1dc6
call advance_timestep if startup or hybrid, not branch or continue
slevis-lmwg Jan 13, 2025
680833a
Merge pull request #2912 from ekluzek/cesm3_0_beta05_submodules
ekluzek Jan 14, 2025
b66e1e9
Draft ChangeLog/Sum files
slevis-lmwg Jan 14, 2025
8d198cf
Update ChangeLog
slevis-lmwg Jan 14, 2025
71e56b9
Update ChangeLog
slevis-lmwg Jan 14, 2025
2f6b129
Merge pull request #2084 from olyson/zerothtstep
slevis-lmwg Jan 14, 2025
24660a7
Merge branch 'b4b-dev' into remove_unused
ekluzek Jan 15, 2025
0d44483
Merge remote-tracking branch 'escomp/b4b-dev' into remove_unused
ekluzek Jan 15, 2025
6fddf3c
Merge pull request #2022 from johnpaulalex/remove_unused
ekluzek Jan 15, 2025
de32263
Merge remote-tracking branch 'escomp/b4b-dev' into hist_doc_master
ekluzek Jan 15, 2025
2dca24c
Merge pull request #2035 from johnpaulalex/hist_doc_master
ekluzek Jan 16, 2025
6e2f046
Merge pull request #2789 from samsrabin/update-ctsm53-release-notes
ekluzek Jan 16, 2025
0b74069
Remove expected build failures related to mpi-serial (issue 2916)
samsrabin Jan 16, 2025
598b546
Add aux_clm_mpi_serial test suite.
samsrabin Jan 16, 2025
d93f8a8
Add an expected failure due to ESCOMP/CTSM#2913.
samsrabin Jan 16, 2025
0ec2493
Merge pull request #2937 from samsrabin/mpi-serial-test-tweaks
samsrabin Jan 16, 2025
6d1a0e0
[BROKEN] Merge tag 'ctsm5.3.019' into merge-b4bdev-20250116
samsrabin Jan 16, 2025
c9e2ca8
Fix conflicts in lilac/lnd_comp_esmf.F90 with 019 version.
samsrabin Jan 16, 2025
031407c
lilac/lnd_comp_esmf.F90: Switch stop/restart alarm order.
samsrabin Jan 16, 2025
6194751
Update MOSART and RTM to fix nag build error.
samsrabin Jan 16, 2025
b427fc9
Remove two expected failures due to issue ESCOMP/CTSM#2914.
samsrabin Jan 17, 2025
bf65082
Remove an expected failure due to ESCOMP/CTSM#2905.
samsrabin Jan 17, 2025
bc03504
Remove failures expected due to ESCOMP/CTSM#2454.
samsrabin Jan 17, 2025
ff2ac19
Update ChangeLog/ChangeSum.
samsrabin Jan 17, 2025
a4aa4ec
Merge pull request #2938 from samsrabin/merge-b4bdev-20250116
samsrabin Jan 17, 2025
b8e71e5
Merge tag 'ctsm5.3.020' into merge-master-20250116
samsrabin Jan 17, 2025
ec0986b
Merge pull request #2939 from samsrabin/merge-master-20250116
samsrabin Jan 17, 2025
1e43d01
Merge pull request #17 from jtruesdal/ctsm_warmstart
slevis-lmwg Jan 23, 2025
d013bf7
Merge remote-tracking branch 'escomp/master' into ne3np4_to_defaults_…
slevis-lmwg Jan 23, 2025
6cf536b
Replace comment explaining `allow_scm` with the correct one
slevis-lmwg Jan 24, 2025
af8cd54
Improve `allow_scm` comment further
slevis-lmwg Jan 24, 2025
5f8d812
Add comment explaining the read_noscm flag
slevis-lmwg Jan 24, 2025
52d77cc
Merge remote-tracking branch 'escomp/cesm3_0_beta04_changes' into ne3…
slevis-lmwg Feb 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -52,3 +52,4 @@ aa04d1f7d86cc2503b98b7e2b2d84dbfff6c316b
045d90f1d80f713eb3ae0ac58f6c2352937f1eb0
753fda3ff0147837231a73c9c728dd9ce47b5997
f112ba0bbf96a61d5a4d354dc0dcbd8b0c68145c
bd535c710db78420b8e8b9d71d88d8339e899c59
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -76,23 +76,23 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.37
fxtag = cime6.1.49
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.0.16
fxtag = cmeps1.0.32
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.57
fxtag = cdeps1.0.61
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
@@ -126,9 +126,9 @@ cime_config/config_tests.xml ----- Define CTSM specific tests
cime_config/config_pes.xml ------- Define Processor layouts for various CTSM grids and compsets
cime_config/testdefs ------------- Directory for specification of CTSM testing
cime_config/testdefs/ExpectedTestFails.xml -- List of tests that are expected to fail
cime_config/usermods_dirs -------- Directories of sets of user-modification subdirs
cime_config/usermods_dirs/clm ---- Directories of sets of user-modification subdirs
(These are directories that add specific user modifications to
simulations created using "cime/scripts/create_newcase --user-mods-dir".)
simulations created using "cime/scripts/create_newcase --user-mods-dir clm/*)

tools/mksurfdata_esmf --------- Directory to build program to create surface dataset
at any resolution.
4 changes: 2 additions & 2 deletions bld/unit_testers/build-namelist_test.pl
Original file line number Diff line number Diff line change
@@ -368,7 +368,7 @@ sub cat_and_create_namelistinfile {
my $phys = "clm6_0";
$mode = "-phys $phys";
&make_config_cache($phys);
my $neondir = "../../cime_config/usermods_dirs/NEON";
my $neondir = "../../cime_config/usermods_dirs/clm/NEON";
foreach my $site ( "ABBY", "BLAN", "CPER", "DEJU", "GRSM", "HEAL", "KONA", "LENO", "NIWO",
"ONAQ", "PUUM", "SERC", "SRER", "TALL", "TREE", "WOOD", "BARR", "BONA",
"DCFS", "DELA", "GUAN", "JERC", "KONZ", "MLBS", "NOGP", "ORNL", "RMNP",
@@ -421,7 +421,7 @@ sub cat_and_create_namelistinfile {
my $phys = "clm6_0";
$mode = "-phys $phys";
&make_config_cache($phys);
my $plumdir = "../../cime_config/usermods_dirs/PLUMBER2";
my $plumdir = "../../cime_config/usermods_dirs/clm/PLUMBER2";
foreach my $site (
"AR-SLu", "AU-Emr", "AU-TTE", "CA-NS1", "CA-SF3", "CN-HaM", "DE-Obe", "ES-ES1", "FR-Gri", "IE-Dri", "IT-LMa", "IT-SRo", "RU-Fyo", "US-Aud", "US-Ho1", "US-Ne2", "US-Syv", "ZM-Mon",
"AT-Neu", "AU-Gin", "AU-Tum", "CA-NS2", "CH-Cha", "CN-Qia", "DE-Seh", "ES-ES2", "FR-Hes", "IT-Amp", "IT-Mal", "JP-SMF", "RU-Zot", "US-Bar", "US-KS2", "US-Ne3", "US-Ton",
18 changes: 9 additions & 9 deletions cime_config/config_component.xml
Original file line number Diff line number Diff line change
@@ -355,15 +355,15 @@
<valid_values></valid_values>
<default_value></default_value>
<values match="last">
<value compset="_CLM60%[^_]*FATES-SP[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/fates_sp</value>
<value compset="_CLM50%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_deck</value>
<value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_nociso_deck</value>
<value compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_deck</value>
<value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_nociso_deck</value>
<value compset="_CLM60%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_deck</value>
<value grid="l%1.9x2.5" compset="_CLM60%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_nociso_deck</value>
<value compset="_CLM60%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_deck</value>
<value grid="l%1.9x2.5" compset="_CLM60%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_nociso_deck</value>
<value compset="_CLM60%[^_]*FATES-SP[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/fates_sp</value>
<value compset="_CLM50%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_deck</value>
<value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_nociso_deck</value>
<value compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_waccm_deck</value>
<value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_waccm_nociso_deck</value>
<value compset="_CLM60%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_deck</value>
<value grid="l%1.9x2.5" compset="_CLM60%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_nociso_deck</value>
<value compset="_CLM60%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_waccm_deck</value>
<value grid="l%1.9x2.5" compset="_CLM60%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_waccm_nociso_deck</value>
</values>
<group>run_component_ctsm</group>
<file>env_case.xml</file>
240 changes: 235 additions & 5 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
@@ -84,21 +84,21 @@
</phase>
</test>

<test name="ERP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<test name="ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
<issue>#2619</issue>
<comment>This failure relates to the following REP failure.</comment>
</phase>
</test>
<test name="REP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<test name="REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="COMPARE_base_rep2">
<status>FAIL</status>
<issue>#2619</issue>
<comment>This failure relates to the preceding ERP failure.</comment>
</phase>
</test>
<test name="REP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<test name="REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
<issue>#2619</issue>
@@ -114,7 +114,7 @@
</test>

<test name="SMS_D.f10_f10_mg37.I2000Clm60BgcCrop.derecho_nvhpc.clm-crop">
<phase name="RUN">
<phase name="BUILD">
<status>FAIL</status>
<issue>#1733</issue>
</phase>
@@ -127,6 +127,27 @@
</phase>
</test>

<test name="ERP_P64x2_Ld765.f10_f10_mg37.I2000Clm60BgcCrop.derecho_intel.clm-monthly">
<phase name="RUN">
<status>FAIL</status>
<issue>#2914</issue>
</phase>
</test>

<test name="ERS_P128x1_Ld765.f10_f10_mg37.I2000Clm60Fates.derecho_intel.clm-FatesColdNoComp">
<phase name="RUN">
<status>FAIL</status>
<issue>#2914</issue>
</phase>
</test>

<test name="LILACSMOKE_D_Ld2.f10_f10_mg37.I2000Ctsm50NwpSpAsRs.derecho_intel.clm-lilac">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>#2905</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-NEON-MOAB--clm-PRISM">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
@@ -144,7 +165,28 @@
<issue>#2913</issue>
</phase>
</test>


<test name="SSP_D_Ld10.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-rtmColdSSP">
<phase name="RUN">
<status>FAIL</status>
<issue>#2913</issue>
</phase>
</test>

<test name="SSP_D_Ld4.f10_f10_mg37.I1850Clm50BgcCrop.derecho_intel.clm-ciso_rtmColdSSP">
<phase name="RUN">
<status>FAIL</status>
<issue>#2913</issue>
</phase>
</test>

<test name="SSP_Ld10.f10_f10_mg37.I1850Clm50Bgc.derecho_gnu.clm-rtmColdSSP">
<phase name="RUN">
<status>FAIL</status>
<issue>#2913</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV--clm-matrixcnOn">
<phase name="RUN">
<status>FAIL</status>
@@ -163,6 +205,194 @@
</phase>
</test>


<!--- Izumi mpi-serial tests failing for me -->

<test name='ERS_D_Ld5_Mmpi-serial.1x1_vancouverCAN.I1PtClm50SpRs.izumi_nag.clm-CLM1PTStartDate' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_D_Ld7_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropRs.izumi_intel.clm-decStart1851_noinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_D_Mmpi-serial_Ld5.1x1_brazil.I2000Clm50FatesRs.izumi_nag.clm-FatesCold' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld1200_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_gnu.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld1600_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld600_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly20_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly20_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial--clm-matrixcnOn' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly3_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_gnu.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly5_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-ciso_monthly' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly5_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-ciso_monthly--clm-matrixcnOn' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_intel.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_intel.clm-cropMonthOutput--clm-matrixcnOn_ignore_warnings' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsRLA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsROA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_nag.clm-ptsRLA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm45BgcCropQianRs.izumi_intel.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Mmpi-serial_Ld5.5x5_amazon.I2000Clm60FatesRs.izumi_nag.clm-FatesCold' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60SpRs.izumi_nag.clm-default--clm-NEON-TOOL' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ld5_Mmpi-serial.1x1_brazil.IHistClm60Bgc.izumi_gnu.clm-mimics' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ly3_Mmpi-serial.1x1_numaIA.I2000Clm50BgcDvCropQianRs.izumi_gnu.clm-ignor_warn_cropMonthOutputColdStart' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ly5_Mmpi-serial.1x1_brazil.IHistClm50BgcQianRs.izumi_intel.clm-newton_krylov_spinup' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ly5_Mmpi-serial.1x1_smallvilleIA.IHistClm60BgcCropQianRs.izumi_gnu.clm-gregorian_cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>

<!-- End of Izumi mpi-serial tests failing -->

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_gnu.clm-FatesPRISM--clm-NEON-FATES-YELL">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
4 changes: 2 additions & 2 deletions cime_config/testdefs/testlist_clm.xml
Original file line number Diff line number Diff line change
@@ -1524,7 +1524,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERP_P64x2_Ld762" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/monthly">
<test name="ERP_P64x2_Ld765" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/monthly">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
</machines>
@@ -2412,7 +2412,7 @@
</options>
</test>

<test name="ERS_P128x1_Ld762" grid="f10_f10_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
<test name="ERS_P128x1_Ld765" grid="f10_f10_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
<machines>
<!-- no izumi tests since this has a pe layout specific for derecho -->
<machine name="derecho" compiler="intel" category="aux_clm"/>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
../monthly
../../../../usermods_dirs/output_sp_exice
../../../../usermods_dirs/clm/output_sp_exice
Loading