Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
26e55b8
Rename clm specific names to slim
ekluzek Mar 9, 2022
92e7428
Change clm in many filenames to slim and in compsets
ekluzek Mar 9, 2022
7d3c3e3
More changing to slim component name
ekluzek Mar 9, 2022
8cd128c
Change head files to slim componenent name
ekluzek Mar 9, 2022
16f6ee7
Remove the complete bld subdirectory as we can replace it with a pyth…
ekluzek Mar 9, 2022
8110680
Point to branch version of cime that recognizes SLIM
ekluzek Mar 9, 2022
ab6fc09
Initial add of namelist definition files
ekluzek Mar 9, 2022
43e735d
Version I can run xmllint on
ekluzek Mar 18, 2022
3a85ee9
Update to python3
ekluzek Mar 18, 2022
4f06704
Initial version of buildnml, not complete, but does compile
ekluzek Mar 25, 2022
2db978a
Fix syntax error that xmllint showed
ekluzek Mar 25, 2022
acfae2c
Get XSL style sheet to basically work (still doesn't have sections)
ekluzek Mar 25, 2022
a3a0768
Complete the namelist definition first draft
ekluzek Mar 25, 2022
f0c4855
Change some of the SLIM settings
ekluzek Mar 25, 2022
155cd06
Remove character size
ekluzek Mar 26, 2022
5286138
Something that roughly works
ekluzek Mar 26, 2022
30b5620
Add a directory to test the buildnml in
ekluzek Mar 26, 2022
cc26b19
Basic functioning namelist, still needs dtime to be set, and error ch…
ekluzek Mar 27, 2022
94498c8
Add some buildnml test output file and directory to git ignore file
ekluzek Mar 27, 2022
f265bd3
Remove CO2 settings as SLIM doesn't use it
ekluzek Mar 28, 2022
d04e144
Use new cime_config python library naming convention so that we can h…
ekluzek Apr 1, 2022
9796f53
Use new cime_config python library naming convention so that we can h…
ekluzek Apr 1, 2022
aaa7010
Add rundir setting and remove checks from slim_cime.py since it's alr…
ekluzek Apr 1, 2022
154080a
Get the logger working
ekluzek Apr 15, 2022
0233837
Ignore the run directory in the namelist test directory
ekluzek Apr 15, 2022
3729a11
Add new check subroutines for categories
ekluzek Apr 15, 2022
4e6391f
Add setup for dtime
ekluzek Apr 15, 2022
542ccdb
Add check that mll_surdat is set as it is required
ekluzek Apr 15, 2022
f69c75f
Check that hist_mfilt is at least 1
ekluzek Apr 15, 2022
d51ff2b
Put it in the wrong subroutine
ekluzek Apr 15, 2022
4588e65
If finidat is not UNSET and cold start_type abort with error, this gi…
ekluzek Apr 15, 2022
712a527
Run through black
ekluzek Apr 16, 2022
4df24c8
Renaming to new cesm convention
ekluzek May 9, 2022
910822c
Merge remote-tracking branch 'escomp/cesm2_1_slim' into slim_in_cime
ekluzek Jul 29, 2022
ef6f1f9
Correct name of python directory for buildnml source
ekluzek Jul 29, 2022
7cd3140
Black reformat
ekluzek Jul 29, 2022
ada0f9a
Add python conda environment files to setup conda environments in ord…
ekluzek Jul 29, 2022
3cf6da0
Some pylint formatting changes
ekluzek Aug 5, 2022
e8ff096
Update pylint configuration file to the current CTSM one
ekluzek Aug 5, 2022
4258655
Run black on slim files, have black check run over both directories
ekluzek Aug 6, 2022
ed6ef89
Handle some pylint issues
ekluzek Aug 11, 2022
c4a826f
Add an import hook so that the CIME python files can be run in pylint
ekluzek Aug 11, 2022
8f8f6b7
Run through black
ekluzek Aug 11, 2022
053d2f6
Add unit tests for path_utils from CTSM
ekluzek Aug 12, 2022
a2528bd
Black and pylint update
ekluzek Aug 12, 2022
f78168c
Add a method to path_to_slim_cime_py_root
ekluzek Aug 14, 2022
eed0a53
Add add_slim_cime_pylib_to_path and start of unit-tester for buildnml
ekluzek Aug 14, 2022
bfd1489
Set logging levels and use slim methods to get python paths for codes…
ekluzek Aug 17, 2022
f8d7eb8
Work on unit test for buildnml get it actually working for one subrou…
ekluzek Aug 17, 2022
20e7ac7
Add a test for check_nml_general
ekluzek Aug 18, 2022
6aac817
Remove clump_pproc as threading is not setup
ekluzek Aug 19, 2022
ecf4723
Add tests for the check_nml_data method
ekluzek Aug 30, 2022
b894273
Add startup as option to slim_start_type to require an finidat file t…
ekluzek Aug 31, 2022
b3a81e9
Add some more checks for initial_conditions for branch and hybrid cases
ekluzek Aug 31, 2022
912f628
Initial add of sys test for buildnml
ekluzek Aug 31, 2022
0ce350e
Set resolution for system test to f19 so that the test will run
ekluzek Sep 1, 2022
364996f
Change directory to testdir and out after done, and add checks that t…
ekluzek Sep 1, 2022
0258be3
Add checks for hybrid and branch startup and also make sure that fini…
ekluzek Sep 2, 2022
f9f3ed1
Some black and lint changes, also add a run_black target to the Makef…
ekluzek Sep 2, 2022
23be63c
Loop over each scenario types
ekluzek Sep 2, 2022
4f90580
black and lint formatting changes, as well as adding a start_type sys…
ekluzek Sep 4, 2022
70ac05a
If finidat is UNSET it should be changed to blank, check for default …
ekluzek Sep 4, 2022
582fb07
Get more run_type testing working and run_type options themselves
ekluzek Sep 4, 2022
9c2dc1a
Work on nrevsn and finidat for different run types, also change tests…
ekluzek Sep 10, 2022
d817412
Work on nrevsn and finidat for different run types, also change tests…
ekluzek Sep 10, 2022
3b13b58
Finally get pylint to pass, so now all tests under python directory pass
ekluzek Sep 10, 2022
8a964ad
Make SLIM_START_TYPE to be cold, any, or required and correct SLIM_SC…
ekluzek Sep 11, 2022
116d7ff
Make SLIM_START_TYPE to be cold, any, or required and correct SLIM_SC…
ekluzek Sep 11, 2022
5eba6b4
Add a test that fails that does a hybrid ref-case but overrides it fo…
ekluzek Sep 11, 2022
0a39853
Remove SLIM_FORCE_COLDSTART
ekluzek Sep 12, 2022
a77db13
Move setting of IC file for hybrid/branch starts to inside the initia…
ekluzek Sep 12, 2022
d61a2fe
Remove SLIM_NAMELIST_OPTS as it shouldn't be used
ekluzek Sep 13, 2022
18e4461
Add a 1-deg 2000 dataset and check for it and make sure if asking for…
ekluzek Sep 15, 2022
cd67b18
Add some namelist history setting checks
ekluzek Sep 16, 2022
ccbf02a
Add some failing tests for history options
ekluzek Sep 16, 2022
4afe424
Check for validity of fincl/fexcl fieldnames, make fincl1 and fexcl1 …
ekluzek Sep 16, 2022
f396f19
Fix regular expression
ekluzek Sep 23, 2022
d98ed44
Get history namelist checks working all buildnml unit and sys test no…
ekluzek Sep 25, 2022
20537b4
Add a new sys test that duplicates the test-mod
ekluzek Sep 25, 2022
63ebcf9
Run through black and shorten long lines so pylint passes as well
ekluzek Sep 25, 2022
2f80529
Remove hist_type1d_pertape and hist_dov2xy as there is no reason for …
ekluzek Sep 25, 2022
0f6fa56
Add some checks for use_init_interp some of which fail
ekluzek Sep 25, 2022
0d0d9fb
Get unit test working for setting use_init_interp to true for a cold …
ekluzek Sep 25, 2022
2a50d63
Get unit test working for setting use_init_interp to true for a cold …
ekluzek Sep 25, 2022
bf700af
Add check for use_init_interp and branch run_type
ekluzek Sep 25, 2022
abf13e2
Add check that finidat_interp_dest can only be set if use_init_interp…
ekluzek Sep 25, 2022
52f677f
Add some tests for dtime check
ekluzek Sep 25, 2022
0835774
Add dtime check for invalid calendars
ekluzek Sep 25, 2022
031c571
Add test for bad ncpl base period
ekluzek Sep 25, 2022
228b9c7
Add a check for dividing by number of coupling time steps that doesn'…
ekluzek Sep 25, 2022
ebc70f7
Run through black and get lint to work
ekluzek Sep 25, 2022
7849bf3
Add check for dtime being either too long or too short
ekluzek Sep 25, 2022
116b573
Add check for dtime too short or too long
ekluzek Sep 25, 2022
efa9123
Add use_noio namelist item to turn off all history output
ekluzek Sep 26, 2022
90bc9ba
Add some checks for use_noio
ekluzek Sep 26, 2022
1af29bb
Make sure no other history options are set when use_noio is on (excep…
ekluzek Sep 27, 2022
4c869f0
Change CLM XML config options to new SLIM config option names
ekluzek Sep 27, 2022
26424b6
Add hash for cime branch
ekluzek Sep 27, 2022
d72cd3c
Systematically go through all compset names and make sure they are co…
ekluzek Sep 28, 2022
bd4baba
Remove RTM from the externals
ekluzek Sep 28, 2022
22315b0
Remove RTM from compsets and make all compsets use RsGs in that order
ekluzek Sep 28, 2022
aa7ff80
Fix compsets in test list
ekluzek Sep 28, 2022
e3a3944
Description needs ? option which means 0 or 1 attribute, right now th…
ekluzek Sep 28, 2022
631d0be
Work with logger options to buildnml, remove print statements, use di…
ekluzek Sep 28, 2022
50b95a6
Remove logger level options as no arguments are sent to buildnml
ekluzek Sep 28, 2022
be3839e
Append to the Filepath paths that are needed now, but won't long term
ekluzek Oct 5, 2022
88f81c6
Merge remote-tracking branch 'escomp/cesm2_1_slim' into slim_in_cime
ekluzek Oct 5, 2022
15594be
Point to the hash rather than the branch
ekluzek Oct 5, 2022
3c6e5d1
Library name needs to be generic rather than specific, so that the li…
ekluzek Oct 6, 2022
87adec0
Don't abort when you can't find the namelist
ekluzek Oct 7, 2022
97ac23c
Temporarily add in clm_inparm and move fatmlndfrc to it, until it can…
ekluzek Oct 7, 2022
086f6ff
Set some needed default values
ekluzek Oct 7, 2022
2582932
fsurdat is still required in clm_inparm
ekluzek Oct 7, 2022
c7ca76d
Set the default values as they are not needed for glacier behavior
ekluzek Oct 7, 2022
3c849cc
paramfile is currently required
ekluzek Oct 7, 2022
d379336
Set create_crop_landunit to true which is the default case
ekluzek Oct 7, 2022
9b56470
Make sure SLIM_SCENARIO is set, and remove the UNSET option for it, f…
ekluzek Oct 9, 2022
eefc20b
Add readnml_datasets subroutine to mml_main that reads in slim specif…
ekluzek Oct 9, 2022
d051e37
Add readnml_datasets subroutine to mml_main that reads in slim specif…
ekluzek Oct 9, 2022
264177b
Move the write for the namelist for mml_surdat and fatmlndfrc to the …
ekluzek Oct 10, 2022
627fa45
Remove fatmlndfrc_new and only have one version of fatmlndfrc
ekluzek Oct 10, 2022
8a76392
Add a history reading namelist and a slim_physics reading namelist an…
ekluzek Oct 11, 2022
f62a65a
Add back in some namelist items that may be added in later, or could …
ekluzek Oct 11, 2022
43378ce
Set value of new namelist items added back in
ekluzek Oct 11, 2022
31e8e45
Add read of slim_perf namelist
ekluzek Oct 12, 2022
9f6a21d
Abort if the finidat_consistency_checks wasn't found
ekluzek Oct 12, 2022
781cbc3
Require the clm_initinterp_inparm namelist
ekluzek Oct 12, 2022
7007cad
Add user_defined SLIM_SCENARIO to make it more obvious how to set you…
ekluzek Oct 31, 2022
afe0fcd
Merge remote-tracking branch 'escomp/cesm2_1_slim' into slim_in_cime
ekluzek Oct 31, 2022
1d18fdb
Merge remote-tracking branch 'escomp/cesm2_1_slim' into slim_in_cime
ekluzek Dec 14, 2022
76a5ca3
Run through black
ekluzek Dec 14, 2022
d3410c0
When getting variables from the namelist make the variable name is an…
ekluzek Dec 14, 2022
69131d5
Run black and fix pylint
ekluzek Dec 14, 2022
d878726
Change compsets to follow the new CAM naming convention as well as po…
ekluzek Dec 15, 2022
f259401
Remove some variables so that it will compile
ekluzek Dec 15, 2022
4a1fd90
Remove nsegspc from the clm_inparm namelist, should just be in the sl…
ekluzek Dec 15, 2022
5b7b9d8
Remove paramfile and use_cn as @slevisconsulting was able to remove t…
ekluzek Dec 15, 2022
4b72a30
Hardwire glacier behavior to the default value
ekluzek Dec 15, 2022
b73f565
Remove shell_commands as the CLM_CO2 setting is not needed any more
ekluzek Dec 15, 2022
92ebc85
Change CLM_FORCE_COLDSTART=on to SLIM_START_TYPE cold
ekluzek Dec 15, 2022
d5ef29e
Fix compset and testmod names in testlist
ekluzek Dec 15, 2022
a620432
Fix some more tests
ekluzek Dec 15, 2022
fb04ba4
Fix some more tests
ekluzek Dec 15, 2022
3ab5aa7
gnu compiler required character strings to be of the same length
ekluzek Dec 15, 2022
219f013
Correct compset names for expected fails
ekluzek Dec 15, 2022
8553b99
Add shr_assert to check dimension bounds
ekluzek Dec 15, 2022
dc2e4c6
The current nsegspc default is 35 rather than 20
ekluzek Dec 15, 2022
36c6e52
Add message if use_noio is set
ekluzek Dec 16, 2022
c59aa61
Add back the writing and error checking on the startup type, and die …
ekluzek Dec 16, 2022
f8b2b41
Add back co2_type to the namelist as still needed for HIST_CAM compsets
ekluzek Dec 16, 2022
53b4853
Add co2_ppmv set to a constant 999.99 value, this is needed for one b…
ekluzek Dec 16, 2022
17c5bc9
Change the testing grids from the old form of f19_g16 to the new form…
ekluzek Dec 16, 2022
8773ebd
Add some write to show why the SHR_ASSERT might be failing
ekluzek Dec 17, 2022
ab435db
Correct so the writes only happen if DEBUG==TRUE
ekluzek Dec 17, 2022
baa4ef5
Correct some of the expected fail testnames
ekluzek Dec 17, 2022
3ab5932
Merge remote-tracking branch 'escomp/cesm2_1_slim' into slim_in_cime
ekluzek Mar 17, 2023
0d0fb80
Remove the namelist variables that have been removed by @slevisconsul…
ekluzek Mar 17, 2023
01dbc65
Remove fsurdat that is no longer there, unit test now works
ekluzek Mar 17, 2023
2762750
Set COMPSET and remove clm_* namelist groups no longer needed, systes…
ekluzek Mar 17, 2023
99a0183
Merge remote-tracking branch 'escomp/cesm2_1_slim' into slim_in_cime
ekluzek Apr 13, 2023
1b6e1d0
Make sure all user_nl_clm files are renameed to user_nl_slim
ekluzek Apr 13, 2023
63d414b
Fix the conflicts that got commited
ekluzek Apr 13, 2023
864bfdd
Run build scripts through black
ekluzek Apr 13, 2023
86cb09d
Remove nlevsno and override_nsrest namelist items as now gone
ekluzek Apr 13, 2023
aaea467
Remove old CLM XML variables
ekluzek Apr 13, 2023
1a8d13f
Just have check_finidat_year_consistency in the finidat check namelist
ekluzek Apr 14, 2023
0b77533
Switch out instances of clm2 for slim which is important for archivin…
ekluzek Apr 14, 2023
5fe6c10
Update mml_surdat dataset for f09
ekluzek Apr 14, 2023
84a56f6
Remove the user-mod directories and put it all in the namelist_defini…
ekluzek Apr 14, 2023
159ecad
Add two fail tests to expected fail, that will fix in the next tag
ekluzek Apr 14, 2023
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
10 changes: 5 additions & 5 deletions .config_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<entry_id>

<!-- This is the same as the default entry in
cime/config/cesm/config_files.xml except for the value for clm:
In a standalone clm checkout, COMP_ROOT_DIR_LND is $SRCROOT
rather than $SRCROOT/components/clm.
cime/config/cesm/config_files.xml except for the value for slim:
In a standalone slim checkout, COMP_ROOT_DIR_LND is $SRCROOT
rather than $SRCROOT/components/slim.

However, because of the way overrides are handled, we need to
re-specify the full information here rather than just overriding
the value for clm.
the value for slim.
-->
<entry id="COMP_ROOT_DIR_LND">
<type>char</type>
<default_value>unset</default_value>
<values>
<value component="clm" >$SRCROOT</value>
<value component="slim" >$SRCROOT</value>
<value component="dlnd" >$CIMEROOT/src/components/data_comps/dlnd</value>
<value component="slnd" >$CIMEROOT/src/components/stub_comps/slnd</value>
<value component="xlnd" >$CIMEROOT/src/components/xcpl_comps/xlnd</value>
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@ core.*
*.gz
*.log !run.log
*.pyc

# buildnml testing
cime_config/buildnml_test/run
cime_config/buildnml_test/Buildconf
cime_config/buildnml_test/buildnml.log
8 changes: 3 additions & 5 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@ Important files in main directories:
=============================================================================================

Externals.cfg --------------- File for management of the main high level externals
Externals_CLM.cfg ----------- File for management of the CLM specific externals (i.e. FATES)

bld/configure --------------- Script to prepare CLM to be built.
Externals_SLIM.cfg ---------- File for management of the SLIM specific externals (if any)

=============================================================================================
QUICKSTART: using the CPL7 scripts:
=============================================================================================

cd cime/scripts
./create_newcase # get help on how to run create_newcase
./create_newcase --case testI --res f19_g16 --compset I2000Clm50BgcCrop --mach cheyenne
./create_newcase --case testI --res f19_g17 --compset I2000SlimRsGs --mach cheyenne
# create new "I" case for cheyenne_intel at 1.9x2.5_gx1v7 res
# "I2000Clm50BgcCrop" case is clm5_0 active, datm8, and inactive ice/ocn
# "I2000SlimRsGs" case is SLIM active, datm8, and inactive ice/ocn/glc/rof
cd testI
./case.setup # create the $CASE.run file
./case.build # build model and create namelists
Expand Down
1 change: 0 additions & 1 deletion bld/CESM_cppdefs

This file was deleted.

1,805 changes: 0 additions & 1,805 deletions bld/CLMBuildNamelist.pm

This file was deleted.

8 changes: 0 additions & 8 deletions bld/Filepath

This file was deleted.

23 changes: 0 additions & 23 deletions bld/build-namelist

This file was deleted.

29 changes: 0 additions & 29 deletions bld/config_cache.xml

This file was deleted.

196 changes: 0 additions & 196 deletions bld/config_files/clm_phys_vers.pm

This file was deleted.

7 changes: 0 additions & 7 deletions bld/config_files/config_defaults.xml

This file was deleted.

72 changes: 0 additions & 72 deletions bld/config_files/config_definition.xsl

This file was deleted.

Loading