Skip to content

Commit

Permalink
Merge pull request #74 from mvertens/feature/remove_mct
Browse files Browse the repository at this point in the history 
remove all refences of mct
  • Loading branch information
@ekluzek
ekluzek authored Feb 2, 2024
2 parents abd2bc4 + 8c682b1 commit 1c22a8c
Show file tree
Hide file tree
Showing 24 changed files with 3,754 additions and 5,280 deletions.
14 changes: 0 additions & 14 deletions cime_config/namelist_definition_mosart.xml
View file
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
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
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
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
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
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../default
48 changes: 48 additions & 0 deletions docs/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
===============================================================
Tag name: mosart1_0_49
Originator(s): mvertens
Date: Feb 02, 2024
One-line Summary: Remove MCT, some cleanup and high level refactoring

Removes all MCT references from the code and replaces them with ESMF routehandles and mapping calls
major changes to RtmMod.F90 along with other code cleanup described below

RtmVar
Now contains new ESMF data types needed for the MOSART mapping
type(ESMF_Field) , public :: srcField
type(ESMF_Field) , public :: dstField
type(ESMF_RouteHandle) , public :: rh_dnstream
type(ESMF_RouteHandle) , public :: rh_direct
type(ESMF_RouteHandle) , public :: rh_eroutUp

RtmMod:
now have two new init phases for mosart. The first init phase is now called MOSART_init1 and replaces Rtmini. This has mostly what was there before but moves the creation of all routehandles to the second init phase - MOSART_init2 which must be called after the mesh has been read in. Also - moved the section of code for MOSART_init2 to be right below the section for MOSART_init1.
removed the mapping for Smatp_dnstrm since it was not used and there is no reason to create a map that is not needed. The associated code that was commented out for this has also been removed.
renamed RtmRun to MOSART_run
new indentation
MOSART_physics.F90
now using the computed routehandle rh_eroutUp
new indentation
Removed namelist variable do_rtmflood and xml variable MOSART_FLOOD_MODE. Also removed subroutine MOSART_FloodInit in RtmMod.F90 which was never activated and in fact the model aborted if you tried to invoke it.
Verified that this was no longer needed in consult with @swensosc.
masterproc -> mainproc
updated the MOSART testlist for derecho and betzy (betzy is a NorESM platform) and added a PFS test

Issues resolved:
Resolves #65 -- Remove MCT
Resolves #75 -- masterproc to mainproc
Resolves #73 -- testlist to Derecho
Resolved #85 -- Remove RtmFileUtils

Testing: standard testing
izumi -- PASS
cheyenne -- PASS (following change answers but determined to be OK)
ERP_D.f10_f10_mg37.I1850Clm50Bgc.derecho_intel.mosart-qgrwlOpts
PEM_D.f10_f10_mg37.I1850Clm50Sp.derecho_intel.mosart-inplacethreshold
SMS_D.f10_f10_mg37.I1850Clm50Bgc.derecho_intel.mosart-decompOpts

(first two due to baseline not having history output, so rerunning shows b4b)
(Last one shows roundoff level answer changes)

See https://github.com/ESCOMP/MOSART/pull/74 for more details

===============================================================
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

This file was deleted.

Loading

0 comments on commit 1c22a8c

Please sign in to comment.