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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove all refences of mct #74

Merged
merged 24 commits into from
Feb 2, 2024
Merged

remove all refences of mct #74

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7f844f6
Merge pull request #3 from gold2718/update_noresm
gold2718 Apr 27, 2023
f3ea37d
updates to remove mct_mod and all other mct related files from share/
mvertens Apr 28, 2023
7e7535b
Merge pull request #4 from mvertens/feature/remove_mct_from_share
mvertens Apr 28, 2023
d471166
first step in removing mct
mvertens Dec 11, 2023
cf7467f
first set of changes that compile and run
mvertens Dec 12, 2023
f168435
fixes to get only roundoff level errors
mvertens Dec 12, 2023
6289745
changes to clean things up - but results are still not reproducible f…
mvertens Dec 12, 2023
01598e5
fixes to mapping generaiton
mvertens Dec 13, 2023
cf39041
fixes to get model reproducible
mvertens Dec 13, 2023
1bb3382
more cleanup
mvertens Dec 13, 2023
0de8ed0
masterproc -> mainproc
mvertens Dec 13, 2023
422491a
changed comment to refer to MOSART rather than RTM
mvertens Dec 13, 2023
79f2df3
removed commented code and changed PIO_BCAST_ERROR to PIO_INTERNAL_ER…
mvertens Dec 15, 2023
5223cb4
fix compilation issues
mvertens Dec 15, 2023
a446c51
addressed comment in PR
mvertens Dec 15, 2023
dd93319
added center to description of lon/lat of gridcells
mvertens Dec 15, 2023
d2a2220
updated test suite
mvertens Jan 3, 2024
3ecf243
updated mosart testing
mvertens Jan 4, 2024
4005853
Start the entry for the next tag
ekluzek Jan 8, 2024
72dddbf
Change test list name back to mosart
ekluzek Jan 17, 2024
221b953
Add back flooding so it can be turned on with source mods which is ne…
ekluzek Jan 22, 2024
d0a49a0
Add back flooding in the code, so @swensosc has a chance of turning i…
ekluzek Jan 22, 2024
fcc37a7
Don't write out negative channel errors if bypass_routing is none, th…
ekluzek Jan 22, 2024
8c682b1
Update ChangeLog
ekluzek Feb 2, 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
14 changes: 0 additions & 14 deletions cime_config/namelist_definition_mosart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,6 @@
</desc>
</entry>

<entry id="smat_option">
<type>char</type>
<category>mosart</category>
<group>mosart_inparm</group>
<valid_values>opt,Xonly,Yonly</valid_values>
<values>
<value>Xonly</value>
</values>
<desc>
sparse matrix mct setting. Xonly is bfb on different pe counts,
opt and Yonly might involve partial sums
</desc>
</entry>

<entry id="decomp_option">
<type>char</type>
<category>mosart</category>
Expand Down
74 changes: 32 additions & 42 deletions cime_config/testdefs/testlist_mosart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,93 +1,79 @@
<?xml version="1.0"?>
<testlist version="2.0">

<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="mosart/default">
<test name="PFS" grid="f10_f10_mg37" compset="I1850Clm50Sp" testmods="mosart/default">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Restart test without DEBUG on all machines/compilers</option>
<option name="comment" >Performance test</option>
</options>
</test>
<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="mosart/iceOff">
<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="mosart/default">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Restart test without DEBUG</option>
</options>
</test>
<test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="mosart/mosartCold">
<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="mosart/iceOff">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Run a Cold-Start with all machine/compilers</option>
</options>
</test>
<test name="SMS_Lh3" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="mosart/mosartOff">
<test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="mosart/mosartCold">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Test with MOSART turned off</option>
<option name="comment" >Run a Cold-Start with all machine/compilers</option>
</options>
</test>
<test name="SMS_Lh3_Vmct" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="mosart/mosartOff">
<test name="SMS_Lh3" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="mosart/mosartOff">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Test with MCT and MOSART off</option>
<option name="comment" >Test with MOSART turned off</option>
</options>
</test>
<test name="SMS_Lh3" grid="f10_f10_mg37" compset="I2000Clm51Sp" testmods="mosart/clmAccelSpinupIgnoreWarn">
<machines>
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Test with CLM accelerated spinup, but ignore warnigns so it will send a warning but still run</option>
</options>
</test>
<test name="SMS_Lh3" grid="1x1_brazil" compset="I2000Clm50Sp" testmods="mosart/mosartGridNull">
<machines>
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Test with grid where ROF is NULL which should turn MOSART off</option>
</options>
</test>
<test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="mosart/default">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
<machine name="izumi" compiler="nag" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Smoke test with DEBUG on all machines/compilers</option>
</options>
</test>
<test name="SMS_D_Ld5_Vmct" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="mosart/default">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Smoke test with DEBUG and MCT driver</option>
</options>
</test>
<test name="SMS_D" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="mosart/decompOpts">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -96,7 +82,8 @@
</test>
<test name="SMS_D" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="mosart/passChannelDepths">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -105,15 +92,17 @@
</test>
<test name="ERP_D" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="mosart/qgrwlOpts">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="PEM_D" grid="f10_f10_mg37" compset="I1850Clm50Sp" testmods="mosart/inplacethreshold">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -122,7 +111,8 @@
</test>
<test name="SMS" grid="f10_f10_mg37" compset="I1850Clm50Sp" testmods="mosart/nobypass">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
<machine name="derecho" compiler="intel" category="mosart"></machine>
<machine name="betzy" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand Down
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/mosart/decompOpts/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../default
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/mosart/decompOpts/user_nl_mosart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
smat_option = 'opt'
decomp_option = '1d'
8 changes: 4 additions & 4 deletions cime_config/testdefs/testmods_dirs/mosart/default/user_nl_mosart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! ice_runoff = .true.
rtmhist_ndens = 1,1,1
rtmhist_nhtfrq =-24,-8
rtmhist_mfilt = 1,1
! ice_runoff = .true.
rtmhist_ndens = 1,1,1
rtmhist_nhtfrq =-24,-8
rtmhist_mfilt = 1,1
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/mosart/inplacethreshold/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../default
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/mosart/qgrwlOpts/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../default
6 changes: 6 additions & 0 deletions docs/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
===============================================================
Tag name: mosart1_0_49
Originator(s): erik
Date: Jan 08, 2024
One-line Summary: Remove MCT

===============================================================
Tag name: mosart1_0_48
Originator(s): erik
Expand Down
91 changes: 0 additions & 91 deletions src/cpl/mct/mosart_cpl_indices.F90
View file
Open in desktop

This file was deleted.

Loading