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 Externals.cfg to cesm2_3_beta17 and remove mct #2539

Merged
merged 46 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
cf1a297
Update Externals.cfg to cesm2_3_beta17
slevis-lmwg May 9, 2024
2aa76c4
Remove mct from Externals.cfg
slevis-lmwg May 9, 2024
ccce061
Remove cpl7 from Externals.cfg
slevis-lmwg May 9, 2024
4861125
Remove MCT from README and .config_files.xml
slevis-lmwg May 10, 2024
db147cd
Remove MCT from CLMBuildNamelist.pm
slevis-lmwg May 10, 2024
68d46b6
Remove MCT from build-namelist_test.pl
slevis-lmwg May 10, 2024
f3386bc
Remove MCT from config_definition_ctsm.xml
slevis-lmwg May 10, 2024
dc70323
Remove MCT from ExpectedTestFails.xml and update README.NUOPC_driver.md
slevis-lmwg May 10, 2024
629961c
Remove reference to MCT in fsurdat_modifier.py
slevis-lmwg May 10, 2024
fb5b631
Remove src/unit_test_stubs/csm_share/CMakeLists.txt
slevis-lmwg May 10, 2024
3d1ab9b
Remove MCT from test_driver.sh
slevis-lmwg May 10, 2024
371f093
Remove the src/cpl/mct directory
slevis-lmwg May 10, 2024
788f499
Remove a couple more references to MCT
slevis-lmwg May 10, 2024
cc0e04d
Update ntests in build-namelist_test.pl
slevis-lmwg May 10, 2024
4715afe
Bring back src/unit_test_stubs/csm_share/CMakeLists.txt for FUNIT test
slevis-lmwg May 15, 2024
39dc01e
Revert "Remove the src/cpl/mct directory"
slevis-lmwg May 16, 2024
7c295b8
Remove test/tools/test_driver.sh, unrelated to this PR, good to clean up
slevis-lmwg May 16, 2024
0a08723
Fix for issue #2546
slevis-lmwg May 16, 2024
e454451
Add izumi nag debug tests to ExpectedTestFails as per ESCOMP/CMEPS#460
slevis-lmwg May 17, 2024
7008575
Merge tag 'ctsm5.2.005' into upd_externals_to_beta17
slevis-lmwg May 17, 2024
9397431
First draft ChangeLog/ChangeSum
slevis-lmwg May 17, 2024
6b460a2
Update ntests in build-namelist_test.pl
slevis-lmwg May 18, 2024
7072f7a
Resolve the mizuRoute issue
ekluzek May 20, 2024
ff4d35f
Remove set_glc2lnd_fields_mct (not tested, yet)
slevis-lmwg May 21, 2024
4d62578
Remove /src/cpl/mct again; I was right the first time
slevis-lmwg May 21, 2024
4cbc00d
Remove another mct comment
slevis-lmwg May 21, 2024
854ff9d
Remove cime_config/testdefs/testmods_dirs/clm/nuopc_cap_bfb directory
slevis-lmwg May 21, 2024
6b6ea52
Remove mention of mct in README.NUOPC_driver.md
slevis-lmwg May 21, 2024
40367c5
Remove an expected failure the mentions mct in ExpectedTestFails.xml
slevis-lmwg May 21, 2024
e99eaea
Add back mct to Externals.cfg
slevis-lmwg May 21, 2024
fed6805
Remove /test subdirectory
slevis-lmwg May 21, 2024
69dbee8
Remove bld/unit_testers/xFail/wrapClmTests.pl
slevis-lmwg May 21, 2024
8ef1ff4
Remove obsolete parts of bld/unit_testers/xFail/expectedFail.pm
slevis-lmwg May 21, 2024
0c26697
Remove obsolete parts of expectedClmTestFails.xml: DID I rm ENOUGH?
slevis-lmwg May 21, 2024
882425a
Remove mention of test_driver_*.sh in .gitignore
slevis-lmwg May 21, 2024
9407ce5
Remove reference to /test in /doc/.../testing.rst
slevis-lmwg May 21, 2024
93c274d
Update README by removing mention of /test directory
slevis-lmwg May 21, 2024
802b989
Second draft of ChangeLog/ChangeSum
slevis-lmwg May 21, 2024
a14ab08
Update cmeps to cmeps0.14.63 in Externals.cfg
slevis-lmwg May 23, 2024
fc53412
Fix for the LILACSMOKE test to pass
slevis-lmwg May 24, 2024
b7a0adf
Rm expected fails associated w https://github.com/ESCOMP/CMEPS/pull/460
slevis-lmwg May 24, 2024
9fc1352
Correct a testname in ExpectedTestFails.xml
slevis-lmwg May 24, 2024
798d43c
Add comment in lilacsmoke.py as per code review
slevis-lmwg May 28, 2024
aaeae95
Updated ChangeLog and ChangeSum
slevis-lmwg May 28, 2024
62d8ad0
Update share in Externals.cfg
slevis-lmwg May 28, 2024
26c1222
Update ChangeLog with latest info about tests
slevis-lmwg May 28, 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
3 changes: 0 additions & 3 deletions .config_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
<values>
<value component="clm" >$SRCROOT</value>
<value component="slim" >$SRCROOT/components/slim/</value>
<value component="dlnd" comp_interface="mct" >$SRCROOT/components/cpl7/components/data_comps_$COMP_INTERFACE/dlnd</value>
<value component="dlnd" comp_interface="nuopc" >$SRCROOT/components/cdeps/dlnd</value>
<value component="slnd" comp_interface="mct" >$SRCROOT/components/cpl7/components/stub_comps_$COMP_INTERFACE/slnd</value>
<value component="slnd" comp_interface="nuopc" >$CIMEROOT/CIME/non_py/src/components/stub_comps_$COMP_INTERFACE/slnd</value>
<value component="xlnd" comp_interface="mct" >$SRCROOT/components/cpl7/components/xcpl_comps_$COMP_INTERFACE/xlnd</value>
<value component="xlnd" comp_interface="nuopc" >$CIMEROOT/CIME/non_py/src/components/xcpl_comps_$COMP_INTERFACE/xlnd</value>
</values>
<group>case_comps</group>
Expand Down
28 changes: 7 additions & 21 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ required = True
local_path = components/cism
protocol = git
repo_url = https://github.com/ESCOMP/CISM-wrapper
tag = cismwrap_2_1_99
tag = cismwrap_2_1_100
externals = Externals_CISM.cfg
required = True

Expand All @@ -29,12 +29,12 @@ required = True
[mizuRoute]
local_path = components/mizuRoute
protocol = git
repo_url = https://github.com/nmizukami/mizuRoute
hash = 34723c2
repo_url = https://github.com/ESCOMP/mizuRoute
hash = 81c720c
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
required = True

[ccs_config]
tag = ccs_config_cesm0.0.92
tag = ccs_config_cesm0.0.106
protocol = git
repo_url = https://github.com/ESMCI/ccs_config_cesm.git
local_path = ccs_config
Expand All @@ -44,45 +44,31 @@ required = True
local_path = cime
protocol = git
repo_url = https://github.com/ESMCI/cime
tag = cime6.0.217_httpsbranch03
tag = cime6.0.238_httpsbranch01
required = True

[cmeps]
tag = cmeps0.14.50
tag = cmeps0.14.60
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = components/cmeps
required = True

[cdeps]
tag = cdeps1.0.28
tag = cdeps1.0.33
protocol = git
repo_url = https://github.com/ESCOMP/CDEPS.git
local_path = components/cdeps
externals = Externals_CDEPS.cfg
required = True

[cpl7]
tag = cpl77.0.7
protocol = git
repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
local_path = components/cpl7
required = True

[share]
tag = share1.0.18
protocol = git
repo_url = https://github.com/ESCOMP/CESM_share
local_path = share
required = True

[mct]
slevis-lmwg marked this conversation as resolved.
Show resolved Hide resolved
tag = MCT_2.11.0
protocol = git
repo_url = https://github.com/MCSclimate/MCT
local_path = libraries/mct
required = True

[parallelio]
tag = pio2_6_2
protocol = git
Expand Down
5 changes: 2 additions & 3 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ python ------------ Python modules used in tools and testing and automated check
Directory structure only for a CTSM checkout:

components -------- Other active sub-components needed for CTSM to run (river routing and land-ice models)
libraries --------- CESM libraries: MCT (Model Coupling Toolkit) and PIO (deprecated)
libraries --------- CESM libraries: PIO (deprecated)
share ------------- CESM shared code
ccs_config -------- CIME configure files (for grids, compsets, and machines) for CESM

Expand All @@ -68,7 +68,6 @@ components/cdeps -------------------- CESM top level data model shared code (for
components/cism --------------------- CESM Community land Ice Sheet Model.
components/mosart ------------------- Model for Scale Adaptive River Transport
components/rtm ---------------------- CESM River Transport Model.
components/cpl7 --------------------- CESM top level driver for MCT driver (deprecated will be removed)

Top level documentation ($CTSMROOT):

Expand Down Expand Up @@ -154,7 +153,7 @@ Source code directory structure:

src/biogeochem ---- Biogeochemisty
src/main ---------- Main control and high level code
src/cpl ----------- Land model high level caps for NUOPC driver (and MCT and LILAC)
src/cpl ----------- Land model high level caps for NUOPC driver (and LILAC)
src/biogeophys ---- Biogeophysics (Hydrology)
src/dyn_subgrid --- Dynamic land unit change
src/init_interp --- Online interpolation
Expand Down
5 changes: 1 addition & 4 deletions README.NUOPC_driver.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ by having an updated copy in your case directory.

## What if I want to use the MCT driver?
slevis-lmwg marked this conversation as resolved.
Show resolved Hide resolved

The MCT driver is now deprecated, and will be removed. So at this point we don't
suggest using it anymore.

For more notes see:
The MCT driver is now removed. For more notes see:

https://docs.google.com/presentation/d/1yjiKSEV53JDAJbYxhpY2T9GTxlWFzQAn
18 changes: 5 additions & 13 deletions bld/CLMBuildNamelist.pm
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ REQUIRED OPTIONS
(if read they allow user_nl_clm and CLM_BLDNML_OPTS to expand
variables [for example to use \$DIN_LOC_ROOT])
(default current directory)
-lnd_frac "domainfile" Land fraction file (the input domain file) (needed for MCT driver and LILAC)
-lnd_frac "domainfile" Land fraction file (the input domain file) (needed for LILAC)
-res "resolution" Specify horizontal grid. Use nlatxnlon for spectral grids;
dlatxdlon for fv grids (dlat and dlon are the grid cell size
in degrees for latitude and longitude respectively)
Expand All @@ -83,7 +83,7 @@ REQUIRED OPTIONS
(default 2000)
-structure "structure" The overall structure being used [ standard | fast ]
OPTIONS
-driver "value" CESM driver type you will run with [ mct | nuopc ]
-driver "value" CESM driver type you will run with [ nuopc ]
-bgc "value" Build CLM with BGC package [ sp | bgc | fates ]
(default is sp).
CLM Biogeochemistry mode
Expand Down Expand Up @@ -1893,10 +1893,10 @@ sub setup_logic_lnd_frac {
my ($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref) = @_;

#
# fatmlndfrc is required for the MCT driver (or LILAC), but uneeded for NUOPC
# fatmlndfrc is required for LILAC but uneeded for NUOPC
#
my $var = "lnd_frac";
if ( ($opts->{'driver'} eq "mct") || $opts->{'lilac'} ) {
if ( $opts->{'lilac'} ) {
if ( defined($opts->{$var}) ) {
if ( defined($nl->get_value('fatmlndfrc')) ) {
$log->fatal_error("Can NOT set both -lnd_frac option (set via LND_DOMAIN_PATH/LND_DOMAIN_FILE " .
Expand Down Expand Up @@ -3838,9 +3838,7 @@ sub setup_logic_popd_streams {
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_popdens', 'phys'=>$nl_flags->{'phys'},
'cnfireson'=>$nl_flags->{'cnfireson'}, 'hgrid'=>"0.5x0.5", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'} );
#
# TODO (mvertens, 2021-06-22) the following is needed for MCT since a use case enforces this - so for now stream_meshfile_popdens will be added to the mct
# stream namelist but simply not used

if ($opts->{'driver'} eq "nuopc" ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_meshfile_popdens', 'hgrid'=>"0.5x0.5");
my $inputdata_rootdir = $nl_flags->{'inputdata_rootdir'};
Expand All @@ -3854,12 +3852,6 @@ sub setup_logic_popd_streams {
$val = &quote_string( $val );
$nl->set_variable_value($group, $var, $val);
}
} else {
my $var = 'stream_meshfile_popdens';
my $group = $definition->get_group_name($var);
my $val = "none";
$val = &quote_string( $val );
$nl->set_variable_value($group, $var, $val);
}
} else {
# If bgc is NOT CN/CNDV or fire_method==nofire then make sure none of the popdens settings are set
Expand Down
6 changes: 3 additions & 3 deletions bld/config_files/config_definition_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Root directory of CLM source distribution (directory above CLM configure).
</entry>

<entry id="comp_intf"
valid_values="ESMF,MCT,cpl_\$COMP"
value="MCT"
valid_values="ESMF,cpl_\$COMP"
value="ESMF"
category="directories">
Component framework interface to use
(Model Coupling Toolkit, or Earth System Modeling Framework)
(Earth System Modeling Framework)
</entry>

<entry id="usr_src"
Expand Down
34 changes: 4 additions & 30 deletions bld/unit_testers/build-namelist_test.pl
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile {
#
# Figure out number of tests that will run
#
my $ntests = 2513;
my $ntests = 2454;

if ( defined($opts{'compare'}) ) {
$ntests += 1545;
$ntests += 1486;
}
plan( tests=>$ntests );

Expand Down Expand Up @@ -314,7 +314,7 @@ sub cat_and_create_namelistinfile {
print "=================================================================================\n";

my $startfile = "clmrun.clm2.r.1964-05-27-00000.nc";
foreach my $driver ( "mct", "nuopc" ) {
foreach my $driver ( "nuopc" ) {
print " For $driver driver\n\n";
# configuration, structure, irrigate, verbose, clm_demand, ssp_rcp, test, sim_year, use_case
foreach my $options ( "-res 0.9x1.25 -configuration nwp",
Expand All @@ -335,13 +335,7 @@ sub cat_and_create_namelistinfile {
my $file = $startfile;
&make_env_run();
my $base_options = "-envxml_dir . -driver $driver";
if ( $driver eq "mct" ) {
$base_options = "$base_options -lnd_frac $DOMFILE";
# Skip the MCT test for excess ice streams
if ( $options =~ /use_excess_ice_streams=.true./ ) {
next;
}
} else {
if ( $driver eq "nuopc" ) {
$base_options = "$base_options -namelist '&a force_send_to_atm = .false./'";
}
eval{ system( "$bldnml $base_options $options > $tempfile 2>&1 " ); };
Expand Down Expand Up @@ -548,11 +542,6 @@ sub cat_and_create_namelistinfile {
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm5_0",
},
"exice stream on, but mct" =>{ options=>"--res 0.9x1.25 --envxml_dir . --driver mct --lnd_frac $DOMFILE ",
namelst=>"use_excess_ice=.true., use_excess_ice_streams=.true.",
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm5_0",
},
"clm50CNDVwtransient" =>{ options=>" -envxml_dir . -use_case 20thC_transient -dynamic_vegetation -res 10x15 -ignore_warnings",
namelst=>"",
GLC_TWO_WAY_COUPLING=>"FALSE",
Expand Down Expand Up @@ -898,16 +887,6 @@ sub cat_and_create_namelistinfile {
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm5_0",
},
"both lnd_frac and on nml" =>{ options=>"-driver mct -lnd_frac $DOMFILE -envxml_dir .",
namelst=>"fatmlndfrc='frac.nc'",
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm5_0",
},
"lnd_frac set to UNSET" =>{ options=>"-driver mct -lnd_frac UNSET -envxml_dir .",
namelst=>"",
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm6_0",
},
"lnd_frac set but nuopc" =>{ options=>"-driver nuopc -lnd_frac $DOMFILE -envxml_dir .",
namelst=>"",
GLC_TWO_WAY_COUPLING=>"FALSE",
Expand All @@ -923,11 +902,6 @@ sub cat_and_create_namelistinfile {
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm6_0",
},
"force_send but not nuopc" =>{ options=>"-driver mct -lnd_frac $DOMFILE -envxml_dir .",
namelst=>"force_send_to_atm = .false.",
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm6_0",
},
"branch but NO nrevsn" =>{ options=>"-clm_start_type branch -envxml_dir .",
namelst=>"",
GLC_TWO_WAY_COUPLING=>"FALSE",
Expand Down
7 changes: 0 additions & 7 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@
</phase>
</test>

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

<test name="SMS_D.f10_f10_mg37.I2000Clm60BgcCrop.derecho_nvhpc.clm-crop">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ The output to the above command is as follows:
-vichydro <name> Turn VIC hydrologic parameterizations : [on | off] (default is off)
-crop <name> Toggle for prognostic crop model. [on | off] (default is off)
(can ONLY be turned on when BGC type is CN or CNDV)
-comp_intf <name> Component interface to use (ESMF or MCT) (default MCT)
-comp_intf <name> Component interface to use (default ESMF, currently no other option)
-defaults <file> Specify full path to a configuration file which will be used
to supply defaults instead of the defaults in bld/config_files.
This file is used to specify model configuration parameters only.
Expand Down
4 changes: 2 additions & 2 deletions python/ctsm/modify_input_files/fsurdat_modifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ def modify_optional(
"""Modify the dataset according to the optional settings"""

# Set fsurdat variables in a rectangle that could be global (default).
# Note that the land/ocean mask gets specified in the domain file for
# MCT or the ocean mesh files for NUOPC. Here the user may specify
# Note that the land/ocean mask gets specified in
# the ocean mesh files. Here the user may specify
# fsurdat variables inside a box but cannot change which points will
# run as land and which as ocean.
if idealized:
Expand Down
Loading
Loading