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

update to ctsm5.3.011 #97

Merged
merged 219 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
3868bdc
Document that fincl1 maps to 'h0' history file. And fexcl1.
johnpaulalex Jun 21, 2023
a5355ae
Merge tag 'ctsm5.1.dev133' into hist_doc_bc
ekluzek Aug 10, 2023
4edaa46
move from depricated shr_file to shr_log
jedwards4b Jun 26, 2024
915af95
add spellcheck in bld-nml-tester
mvdebolskiy Aug 8, 2024
85e3124
updating fates default parameter file to api 36.1
rgknox Aug 15, 2024
822618e
add test, add warning
mvdebolskiy Aug 15, 2024
e271432
add spellcheck in bld-nml-tester
mvdebolskiy Aug 8, 2024
1792237
Merge tag 'ctsm5.2.027' into merge-master-20240828
ekluzek Aug 29, 2024
e707519
Merge pull request #2733 from ekluzek/merge-master-20240828
ekluzek Aug 29, 2024
22ceaf9
Merge remote-tracking branch 'escomp/b4b-dev' into hs-uii-ssr
samsrabin Sep 13, 2024
e205e2e
Ignore warnings in Hillslope tests.
samsrabin Sep 13, 2024
149ffda
Merge pull request #6 from samsrabin/hs-uii-ssr
mvdebolskiy Sep 16, 2024
a1ee963
Merge pull request #2703 from mvdebolskiy/hs-uii
samsrabin Sep 17, 2024
d753457
Remove references to PTCLM/PTCLMmkdata.
samsrabin Sep 17, 2024
c26ac54
Use double-backticks instead of double-hyphens in one instance.
samsrabin Sep 17, 2024
fbce656
Fix comments on urban thermal variables
Sep 17, 2024
f25a251
Fix two hillslope error messages.
samsrabin Mar 22, 2024
b6dd9f9
Move hillslope variables from fsurdat to hillslope_file.
samsrabin Mar 22, 2024
a68ffdf
Merge pull request #2765 from olyson/urbthermalcomment
slevis-lmwg Sep 18, 2024
d6a2047
Move how-to-make-mesh.md to the User's Guide; give extension .rst.
samsrabin Sep 18, 2024
f84c5b7
how-to-make-mesh: Markdown to RestructuredText.
samsrabin Sep 18, 2024
2a6ed6d
Improve mesh_maker instructions.
samsrabin Sep 18, 2024
1b99435
Fix typo in mesh_plotter arg description.
samsrabin Sep 18, 2024
fc261d4
mesh_plotter now stops if output file exists w/o --overwrite given.
samsrabin Sep 18, 2024
627940a
Add --dpi option to mesh_plotter.
samsrabin Sep 18, 2024
7ad5fd0
More reasonable marker sizes in mesh_plotter.
samsrabin Sep 18, 2024
0eed033
Convert I1850 hillslope 5x5_amazon tests to I2000.
samsrabin Sep 19, 2024
08d0923
Add non-serial HillslopeC 5x5_amazon test to hillslope suite.
samsrabin Sep 19, 2024
7242a6b
Add issue reference to non-serial HillslopeC 5x5_amazon test.
samsrabin Sep 19, 2024
8361f8b
Fix HillslopeC test in expected fails list.
samsrabin Sep 19, 2024
edbef5f
Add mesh_plotter instructions.
samsrabin Sep 18, 2024
5fb68ac
UG: Fix path of example mksurfdata_esmf namelist.
samsrabin Sep 20, 2024
2d39418
Add double backticks in lots of places.
samsrabin Sep 20, 2024
ac01cb3
Add doc todo to replace missing figure.
samsrabin Sep 20, 2024
5c3ea51
Fix a title overline.
samsrabin Sep 20, 2024
6fca829
More formatting fixes.
samsrabin Sep 20, 2024
24354eb
Replace some :: with :.
samsrabin Sep 20, 2024
e368dd4
Formatting fixes in wrf-nesting.rst.
samsrabin Sep 20, 2024
3cf93a9
Add --no-center-coords option.
samsrabin Sep 19, 2024
06fdc64
Properly handle --outdir.
samsrabin Sep 20, 2024
0de1673
Add tests to test_advanced_sys_mesh_plotter.py.
samsrabin Sep 20, 2024
f0c9f31
Use os.path.join in test_advanced_sys_mesh_plotter.py.
samsrabin Sep 20, 2024
badbc50
Add dpi test to test_advanced_sys_mesh_plotter.py.
samsrabin Sep 20, 2024
6d3bf8c
Format with black.
samsrabin Sep 20, 2024
e725759
Add previous commit to .git-blame-ignore-revs.
samsrabin Sep 20, 2024
00b9f3a
Merge pull request #2772 from samsrabin/mesh-plotter-improvements
samsrabin Sep 23, 2024
318a312
Update namelist_defaults_clm4_5.xml references.
samsrabin Sep 24, 2024
260c3c9
namelist_defaults_|version|_tools.xml files no longer exist.
samsrabin Sep 24, 2024
5d2ebe1
Fix namelist XML refs in what-are-the-clm-tools.rst.
samsrabin Sep 24, 2024
9ed3cca
Specify path to create_newcase.
samsrabin Sep 24, 2024
f22f227
Add TODOs to update refs to queryDefaultNamelist.pl.
samsrabin Sep 24, 2024
8304414
Add TODOs to update refs to mksurfdata.pl.
samsrabin Sep 24, 2024
962a090
Fix compset and add TODO to "Running with historical CO2 forcing."
samsrabin Sep 24, 2024
8a31077
TODO added in "Running with irrigation".
samsrabin Sep 24, 2024
42ff69c
Add TODO about -bgc_spinup.
samsrabin Sep 24, 2024
2bf912f
Add TODOs about mkprocdata_map.
samsrabin Sep 24, 2024
6ac23b2
Add TODOs about domain files not being needed in nuopc.
samsrabin Sep 24, 2024
5e75f2e
Add TODO about updating "Observational Sites Datasets".
samsrabin Sep 24, 2024
79f50f4
Merge branch 'b4b-dev' into docs-fixes-202409
samsrabin Sep 24, 2024
38598da
Fix another namelist_definition_clm4_5.xml reference.
samsrabin Sep 24, 2024
a251582
More double-backticks in "Spinup of |version|-BGC-Crop".
samsrabin Sep 24, 2024
b5a82cc
Remove User's Guide section about running w/ transient hist CO2.
samsrabin Sep 24, 2024
edefa3c
Resolve a docs build warning.
samsrabin Sep 24, 2024
6c7ecf6
PPE change to sa_leaf
olyson Sep 25, 2024
a9cd52f
Error in Hillslope/shell_commands if running on grid w/o a hillslope_…
samsrabin Sep 20, 2024
d837838
Hillslope testmod: Add hillslope_file for 5x5_amazon.
samsrabin Sep 25, 2024
da386fe
Merge pull request #2770 from samsrabin/docs-fixes-202409
samsrabin Sep 26, 2024
12d9329
Merge tag 'ctsm5.2.029' into fates-api36.1
glemieux Sep 26, 2024
31a5cc7
Merge tag 'ctsm5.3.0' into merge-b4bdev-20240926
slevis-lmwg Sep 26, 2024
615224a
Updated number of tests
slevis-lmwg Sep 26, 2024
cb7e922
Don't manually set meshfile in Hillslope tests.
samsrabin Sep 26, 2024
ed5d17b
First draft ChangeLog/ChangeSum
slevis-lmwg Sep 26, 2024
830e675
Updated EXPECTED FAILUREs (I should have done this in ctsm5.3.0)
slevis-lmwg Sep 26, 2024
c393123
correct clm_demand option typo
glemieux Sep 27, 2024
e591a1a
Remove parallel 5x5_amazon test from expected fails.
samsrabin Sep 27, 2024
4f2129f
Rename 10x15 synthetic hillslope_file to include 10x15.
samsrabin Sep 27, 2024
ad0ab60
Add/edit comments about 5x5_amazon hillslope tests.
samsrabin Sep 27, 2024
061b1c9
Remove parallel 5x5_amazon hillslope test from aux_clm.
samsrabin Sep 27, 2024
792abd1
Adding one more EXPECTED FAILURE
slevis-lmwg Sep 27, 2024
e6d58ec
Merge pull request #2792 from slevis-lmwg/merge-b4bdev-20240926
slevis-lmwg Sep 27, 2024
eed2d73
Merge tag 'ctsm5.3.001' into merge-master-20240927
slevis-lmwg Sep 27, 2024
cb19c43
Merge pull request #2795 from slevis-lmwg/merge-master-20240927
slevis-lmwg Sep 27, 2024
adecc67
Revert "Merge tag 'ctsm5.3.001' into b4b-dev"
slevis-lmwg Sep 27, 2024
16cf4ac
Merge pull request #2796 from ESCOMP/revert-2795-merge-master-20240927
slevis-lmwg Sep 27, 2024
9604614
Merge tag 'ctsm5.3.002' into merge-master-20240927
slevis-lmwg Sep 27, 2024
a1d0ef4
Merge pull request #2797 from slevis-lmwg/merge-master-20240927
slevis-lmwg Sep 27, 2024
039626c
Fix clm-basic tests
slevis-lmwg Sep 27, 2024
70c9f8b
Updates for my fix to take effect correctly
slevis-lmwg Sep 28, 2024
698902d
Small important correction
slevis-lmwg Sep 28, 2024
0a06a62
Merge branch 'b4b-dev' into shr_file_to_shr_log
samsrabin Sep 30, 2024
bcbc462
Change testlist_clm ne30pg3_t061 tests to ne30pg3_t232
slevis-lmwg Sep 30, 2024
f312b8a
First commit for CESM3 tuning of the dust emission module by dmleung.…
dmleung Sep 30, 2024
20b81c1
Merge branch 'b4b-dev' into fix_clm-basic_tests
slevis-lmwg Sep 30, 2024
f88d050
Merge pull request #2798 from slevis-lmwg/fix_clm-basic_tests
slevis-lmwg Sep 30, 2024
d3d4e2e
Allocate elevclass_o before use in mkglcmecMod.F90
slevis-lmwg Sep 30, 2024
f40ee1a
Change testlist_clm C96_t061 test to C96_t232
slevis-lmwg Sep 30, 2024
b15640f
Remove elevclass_o altogether because it is NOT used
slevis-lmwg Oct 1, 2024
191a399
dmleung deleted a few unused parameters and variables. 30 Sep 2024
dmleung Oct 1, 2024
efbeafc
Revert change to C96 test; will do later, when ccs_config gets updated
slevis-lmwg Oct 1, 2024
40fc188
Merge pull request #2799 from slevis-lmwg/change_t061_to_t232
slevis-lmwg Oct 1, 2024
62ca130
Merge branch 'b4b-dev' into alloc_elevclass_o
slevis-lmwg Oct 1, 2024
79811dd
Add domain check for hillslope file.
samsrabin Sep 30, 2024
ea9228c
Update 10x15 hillslope_file (now has LATIXY/LONGXY).
samsrabin Oct 1, 2024
4b032be
Improve use_init_interp+use_hillslope namelist warning.
samsrabin Oct 1, 2024
3bc5eed
Merge tag 'ctsm5.3.002' into hillslopes-off-fsurdat
samsrabin Oct 1, 2024
ca4caa7
Merge pull request #2804 from slevis-lmwg/alloc_elevclass_o
slevis-lmwg Oct 1, 2024
5c74ff4
Call domain_clean() at end of check_domain_attributes().
samsrabin Oct 1, 2024
1a93690
Remove outdated comment/TODO.
samsrabin Oct 1, 2024
5e71b7d
Rename surfdata_domain to inputdata_domain.
samsrabin Oct 1, 2024
c2c99dd
Merge branch 'fix-namelist-tester' of github.com:mvdebolskiy/CTSM int…
ekluzek Oct 1, 2024
5173018
Merge remote-tracking branch 'escomp/b4b-dev' into fix-namelist-tester
ekluzek Oct 1, 2024
3295adb
Correct the name of the hash to use in the checks that hash values ar…
ekluzek Oct 1, 2024
98e42fb
Merge pull request #2678 from mvdebolskiy/fix-namelist-tester
ekluzek Oct 1, 2024
6c35216
dmleung changed the values of the tuning parameters and added a new t…
dmleung Oct 1, 2024
f2f7535
add shell call to generate fates hydro parameter file on the fly
glemieux Oct 1, 2024
52e5801
dmleung renamed the tuning parameter for Okin's vegetation drag parti…
dmleung Oct 1, 2024
97d1657
fix typo in fates hydro user_nl_clm
glemieux Oct 1, 2024
52389c0
correct call typo to clm_demand for fateslanduse test mod
glemieux Oct 2, 2024
69b815b
update default fates parameter files
glemieux Oct 2, 2024
2639750
Merge tag 'ctsm5.3.002' into fates-api36.1
glemieux Oct 2, 2024
4e0197b
update the gitmodules tag for fates
glemieux Oct 2, 2024
1f851c4
Getting a new set of tuning parameters for dust. dmleung 2 Oct 2024
dmleung Oct 3, 2024
65d26e6
add expected failure for FatesColdLandUse test mod
glemieux Oct 3, 2024
1045e1b
add new changelog entry
glemieux Oct 3, 2024
9abbb70
minor changelog update
glemieux Oct 3, 2024
b12f6ff
update filename
glemieux Oct 3, 2024
99124de
Merge branch 'b4b-dev' into shr_file_to_shr_log-ssr
samsrabin Oct 4, 2024
b9fde41
update fates tag to api36.1
glemieux Oct 4, 2024
c3ddc48
update testing results for ctsm5.3.003
glemieux Oct 7, 2024
29f9ac8
update changelog and changesum date/time for ctsm5.3.003
glemieux Oct 7, 2024
f80f4c4
Merge pull request #2700 from rgknox/fates-api36.1
samsrabin Oct 7, 2024
1fbe88a
Revert this change as it changed answers for SMS_Ln9.ne30pg2_ne30pg2_…
ekluzek Oct 7, 2024
8819fdf
Merge branch 'dustemis_tune4cesm3' of github.com:dmleung/CTSM into du…
ekluzek Oct 7, 2024
3f5aa0f
Bump up wallclock time for one test.
samsrabin Oct 7, 2024
f2c5d37
Merge tag 'ctsm5.3.003' into hillslopes-off-fsurdat
samsrabin Oct 7, 2024
3ec9215
Remove include_user_mods from matrixcnOn testmod.
samsrabin Oct 7, 2024
7964509
Merge branch 'shr_file_to_shr_log-ssr' into shr_file_to_shr_log
samsrabin Oct 8, 2024
ae6b188
Change a test wallclock time to ensure it's what we want.
samsrabin Oct 8, 2024
f95d192
Merge pull request #2434 from samsrabin/hillslopes-off-fsurdat
samsrabin Oct 8, 2024
6ae3719
Update ChangeLog and ChangeSum.
samsrabin Oct 8, 2024
4c9631b
Make dust_moist_fact different for Leung and Zender, even though both…
ekluzek Oct 8, 2024
c98600b
Merge pull request #2820 from samsrabin/hillslopes-off-fsurdat
samsrabin Oct 8, 2024
146dba4
Fix issue #2793
olyson Oct 2, 2024
cbea138
Merge pull request #2627 from jedwards4b/shr_file_to_shr_log
samsrabin Oct 8, 2024
86fbf18
Merge pull request #2806 from olyson/eflxbuild
olyson Oct 8, 2024
ac2aec1
Merge tag 'ctsm5.3.004' into dustemis_tune4cesm3
ekluzek Oct 8, 2024
c1fe258
Clm60 finidat updates for ne30, f09, f19 grids
slevis-lmwg Oct 8, 2024
058320d
Fix hillslope with use_init_interp warning test, by specifying the hi…
ekluzek Oct 9, 2024
0814274
ne30 updates in response to Keith Oleson's review
slevis-lmwg Oct 9, 2024
e47ffab
f19 updates for test to pick up the correct finidat
slevis-lmwg Oct 9, 2024
10ff404
Add more expected fails
ekluzek Oct 10, 2024
af587a0
Merge commit '10ff40411' into dustemis_tune4cesm3
ekluzek Oct 10, 2024
8777879
Update change files
ekluzek Oct 10, 2024
899c32c
Merge pull request #2803 from dmleung/dustemis_tune4cesm3
ekluzek Oct 10, 2024
7f35823
Merge remote-tracking branch 'escomp/master' into ne30_f09_f19_IC
slevis-lmwg Oct 10, 2024
3e9f02a
Merge tag 'ctsm5.3.005' into merge-b4bdev-20241010
samsrabin Oct 10, 2024
33c8d55
Updates after Erik's reviewr; ne30 1979 does not work, yet
slevis-lmwg Oct 10, 2024
ab9bdf9
Draft ChangeLog/Sum
slevis-lmwg Oct 10, 2024
cfcd041
Update ChangeLog/ChangeSum.
samsrabin Oct 11, 2024
b330990
Merge pull request #2829 from samsrabin/merge-b4bdev-20241010
samsrabin Oct 11, 2024
bb97fb3
Updates from review with Erik and subsequent testing
slevis-lmwg Oct 11, 2024
2c078bb
Merge remote-tracking branch 'escomp/master' into ne30_f09_f19_IC
slevis-lmwg Oct 11, 2024
38e6fb1
Correct mask for ne30pg3 1979 finidat file
ekluzek Oct 11, 2024
7874521
Remove 2003 finidat settings for clm5_1/clm6_0 so will use 2000 files…
ekluzek Oct 12, 2024
29023fb
Updated ChangeLog/Sum
slevis-lmwg Oct 13, 2024
941ec71
Remove redundant lines
slevis-lmwg Oct 13, 2024
5f9d597
Add matrixcn test suite.
samsrabin Oct 14, 2024
4797fd2
Final update to ChangeLog
slevis-lmwg Oct 14, 2024
6d8dad8
Merge pull request #2821 from slevis-lmwg/ne30_f09_f19_IC
slevis-lmwg Oct 14, 2024
0464237
Merge remote-tracking branch 'escomp/master' into saleaf
slevis-lmwg Oct 14, 2024
9f4844c
Draft ChangeLog/Sum
slevis-lmwg Oct 14, 2024
77fdb8d
Updated ChangeLog from Keith Oleson's review
slevis-lmwg Oct 14, 2024
ea0dadd
Final ChangeLog
slevis-lmwg Oct 14, 2024
f726adb
Merge pull request #2788 from olyson/saleaf
slevis-lmwg Oct 14, 2024
207364f
Merge tag 'ctsm5.3.008' into matrixcnon-no-include
samsrabin Oct 15, 2024
b846e2b
Roll back change of one cnmatrix test length.
samsrabin Oct 15, 2024
82a0952
Update ChangeLog and ChangeSum.
samsrabin Oct 15, 2024
26b9aa7
Merge pull request #2815 from samsrabin/matrixcnon-no-include
samsrabin Oct 15, 2024
694333f
Transfer the following parameters from namelist to parameter file:
olyson Oct 20, 2024
be134d8
Merge tag 'ctsm5.3.009' into merge-master-20241021
samsrabin Oct 21, 2024
9f44365
Merge pull request #2842 from samsrabin/merge-master-20241021
samsrabin Oct 21, 2024
77b8e80
Make jmaxb0, wc2wjb0, r_mort pft-dimensioned
olyson Oct 22, 2024
b7121a6
ncd_io not needed after all
olyson Oct 22, 2024
3f4936c
Other variables not needed after all
olyson Oct 22, 2024
bc3d518
Consistent naming of units
olyson Oct 22, 2024
e5100a4
New versions of specialized parameter files
olyson Oct 23, 2024
28d552e
Reinstate SMS_Lm1.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-clm60_…
olyson Oct 24, 2024
f91cd8a
Merge branch 'b4b-dev' into b4b-dev_PPE2830-2831
olyson Oct 24, 2024
1571076
Move read of jmaxb0,jmaxb1,wc2wjb0 from pftcon to LunaMod and r_mort …
olyson Oct 26, 2024
0fd1a04
Final paths for parameter files
olyson Oct 27, 2024
f0566a6
Merge pull request #2845 from olyson/b4b-dev_PPE2830-2831
olyson Oct 28, 2024
152f5d6
Remove/replace refs to DATM_C*_YR_* variables
slevis-lmwg Oct 30, 2024
f2a8ce0
Remove some more DATM_C..._YR_...
slevis-lmwg Oct 30, 2024
c697c76
Remove additional DATM_C..._YR_...
slevis-lmwg Oct 30, 2024
862739b
Replace outdated DATM_CPL_CASE with DATM_CPLHIST_CASE
slevis-lmwg Oct 30, 2024
16d83c1
Add warning box to MOAR User's Guide page.
samsrabin Nov 1, 2024
33607a0
Merge pull request #2852 from slevis-lmwg/rm_refs_to_datm_vars
slevis-lmwg Nov 6, 2024
b32c775
Merge branch 'b4b-dev' into hist_doc_bc
ekluzek Nov 6, 2024
b50d65b
Merge pull request #2866 from johnpaulalex/hist_doc_bc
ekluzek Nov 7, 2024
bd85656
build-namelist_test: Ensure cold starts w/ finidat are handled properly.
samsrabin Nov 8, 2024
f8f3a6f
Ignore finidat for cold-start FATES runs.
samsrabin Nov 8, 2024
33fd95d
Don't allow users to supply finidat for cold-start non-FATES runs.
samsrabin Nov 8, 2024
000b70d
adding izumi nag fails
adrifoster Nov 9, 2024
bbe061d
changelog
adrifoster Nov 9, 2024
e07c66a
Merge pull request #2872 from adrifoster/merge-b4bdev-20241108
adrifoster Nov 9, 2024
eee49a6
Merge tag 'ctsm5.3.010' into fix-fates-cold-finidat
samsrabin Nov 11, 2024
c60fe19
Add some tests to expected fail list.
samsrabin Nov 12, 2024
ebcd4fb
Update ChangeLog and ChangeSum.
samsrabin Nov 12, 2024
931b425
Merge pull request #2870 from samsrabin/fix-fates-cold-finidat
samsrabin Nov 12, 2024
c24b9f0
Merge tag 'ctsm5.3.011' into feature/update_to_ctsm5.3.011
mvertens Nov 15, 2024
bd3a2e8
updated cime
mvertens Nov 15, 2024
06f50df
updated ccs_config
mvertens Nov 15, 2024
433028e
updated cime
mvertens Nov 17, 2024
13f8ff9
udpated .gitmodules
mvertens Nov 17, 2024
a76706f
updated buildnml to ctsm5.3.011
mvertens Nov 17, 2024
401d758
updated ccs_config
mvertens Nov 17, 2024
2b35558
updated .gitmodules
mvertens Nov 17, 2024
cbe6f93
update cime and submodules to be consistent with cime6.1
mvdebolskiy Nov 18, 2024
89e8406
updated cime submodule
mvertens Nov 18, 2024
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
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ aa04d1f7d86cc2503b98b7e2b2d84dbfff6c316b
1a49e547ba3c48fa483f9ae81a8f05adcd6b888c
045d90f1d80f713eb3ae0ac58f6c2352937f1eb0
753fda3ff0147837231a73c9c728dd9ce47b5997
f112ba0bbf96a61d5a4d354dc0dcbd8b0c68145c
24 changes: 12 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[submodule "fates"]
path = src/fates
url = https://github.com/NGEET/fates
fxtag = sci.1.78.2_api.36.0.0
fxtag = sci.1.78.3_api.36.1.0
fxrequired = AlwaysRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NCAR/fates-release
Expand Down Expand Up @@ -60,47 +60,47 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
[submodule "mizuRoute"]
path = components/mizuRoute
url = https://github.com/ESCOMP/mizuRoute
fxtag = cesm-coupling.n02_v2.1.2
fxtag = cesm-coupling.n02_v2.1.3
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute

[submodule "ccs_config"]
path = ccs_config
url = https://github.com/NorESMhub/ccs_config_noresm.git
fxtag = ccs_config_noresm0.0.33
fxtag = ccs_config_noresm0.0.38
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.0.246
url = https://github.com/NorESMhub/cime
fxtag = cime6.1.28_noresm_v0
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 = cmeps0.14.77
url = https://github.com/NorESMhub/CMEPS.git
fxtag = cmeps1.0.20_noresm_v0
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.48
fxtag = cdeps1.0.53
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

[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.0.19
url = https://github.com/NorESMhub/NorESM_share
fxtag = share1.1.2_noresm_v0
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
Expand All @@ -116,7 +116,7 @@ fxDONOTUSEurl = https://github.com/MCSclimate/MCT
[submodule "parallelio"]
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
fxtag = pio2_6_2
fxtag = pio2_6_3
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
Expand Down
31 changes: 12 additions & 19 deletions bld/CLMBuildNamelist.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2588,12 +2588,9 @@ sub setup_logic_initial_conditions {
my $finidat = $nl->get_value($var);
$nl_flags->{'excess_ice_on_finidat'} = "unknown";
if ( $nl_flags->{'clm_start_type'} =~ /cold/ ) {
if (defined $finidat ) {
$log->warning("setting $var (either explicitly in your user_nl_clm or by doing a hybrid or branch RUN_TYPE)\n is incomptable with using a cold start" .
if (defined $finidat && !&value_is_true(($nl->get_value('use_fates')))) {
$log->fatal_error("setting $var (either explicitly in your user_nl_clm or by doing a hybrid or branch RUN_TYPE)\n is incompatible with using a cold start" .
" (by setting CLM_FORCE_COLDSTART=on)." );
$log->warning("Overridding input $var file with one specifying that this is a cold start from arbitrary initial conditions." );
my $group = $definition->get_group_name($var);
$nl->set_variable_value($group, $var, "' '" );
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
$var, 'val'=>"' '", 'no_abspath'=>1);
Expand Down Expand Up @@ -2756,6 +2753,12 @@ SIMYR: foreach my $sim_yr ( @sim_years ) {
$log->fatal_error("$useinitvar is being set for you but a $var was not found, so $useinitvar, init_interp_attributes, and finidat must not be set correctly for this configuration in the namelist_default file" );
}
}

# this check has to be here and not earlier since use_init_interp is set here and hillslope is already set above in setup_logic_hillslope
if ( &value_is_true($nl->get_value($useinitvar)) && value_is_true($nl->get_value("use_hillslope")) ) {
$log->warning("WARNING: You have set use_hillslope while $useinitvar is TRUE.\n This means all hillslope columns in a gridcell will read identical values from initial conditions, even if the initial conditions (finidat) file has hillslope information. If you are sure you want this behaviour, add -ignore_warnings to CLM_BLDNML_OPTS.")
}

} # end initial conditions

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -3596,17 +3599,6 @@ sub setup_logic_luna {
if ( &value_is_true($nl->get_value('lnc_opt') ) && not &value_is_true( $nl_flags->{'use_cn'}) ) {
$log->fatal_error("Cannot turn lnc_opt to true when bgc=sp" );
}
my $var = "jmaxb1";
if ( &value_is_true( $nl_flags->{'use_luna'} ) ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var,
'use_luna'=>$nl_flags->{'use_luna'} );
}
my $val = $nl->get_value($var);
if ( ! &value_is_true( $nl_flags->{'use_luna'} ) ) {
if ( defined($val) ) {
$log->fatal_error("Cannot set $var when use_luna is NOT on" );
}
}
}

#-------------------------------------------------------------------------------
Expand All @@ -3630,6 +3622,10 @@ sub setup_logic_hillslope {
if ( (! &value_is_true($use_hillslope)) && &value_is_true($use_hillslope_routing) ) {
$log->fatal_error("Cannot turn on use_hillslope_routing when use_hillslope is off\n" );
}
my $hillslope_file = $nl->get_value('hillslope_file');
if ( &value_is_true($use_hillslope) && ( ! defined($hillslope_file) ) ) {
$log->fatal_error("You must provide hillslope_file if use_hillslope is .true.\n" );
}
}

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -4516,8 +4512,6 @@ sub setup_logic_canopyhydrology {
#
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;

add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'interception_fraction' );
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'maximum_leaf_wetted_fraction' );
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_clm5_fpi' );
}

Expand All @@ -4536,7 +4530,6 @@ sub setup_logic_snowpack {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'wind_dependent_snow_density');
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'snow_overburden_compaction_method');
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'lotmp_snowdensity_method');
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'upplim_destruct_metamorph');
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow');
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow_glc');
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow_glc_ela');
Expand Down
Loading
Loading