From 0a679be87dc7e32e3a8cc8022b656e69a8096ad3 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 2 Aug 2023 12:06:06 -0600 Subject: [PATCH 01/12] Add more tests resolving #68 --- cime_config/testdefs/testlist_mosart.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cime_config/testdefs/testlist_mosart.xml b/cime_config/testdefs/testlist_mosart.xml index b70990a..8164e77 100644 --- a/cime_config/testdefs/testlist_mosart.xml +++ b/cime_config/testdefs/testlist_mosart.xml @@ -5,10 +5,13 @@ + + + - + @@ -17,6 +20,7 @@ + @@ -26,12 +30,13 @@ - + + @@ -69,7 +74,10 @@ + + + @@ -97,6 +105,7 @@ + @@ -106,18 +115,21 @@ + + + - + From 8899b2ba3be1114bc5421bcdb3475b70e742f648 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 25 Jan 2024 01:46:27 -0700 Subject: [PATCH 02/12] Update README about MOSART being obscelensent --- README.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.rst b/README.rst index 43311a4..c240025 100644 --- a/README.rst +++ b/README.rst @@ -5,6 +5,18 @@ Model for Scale Adaptive River Transport The Model for Scale Adaptive River Transport, Mosart, is part of the Community Earth System Model. +IMPORTANT NOTE: MOSART is Obsolescent! + +MOSART is part of CESM3, but is obsolescent. + +We do not have support for creating input datasets for MOSART and +as such can NOT use MOSART for Paleo work. + +Longer term MOSART will be removed in future versions of CESM and the new model +mizuRoute will be used for Paleo work as well as present day. +It's also possible that external collaborators will support the use of MOSART +for present day climate even as mizuRoute becomes the default model for CESM. + See the CESM web site for documentation and information: http://www.cesm.ucar.edu From 212f459d728e08cfbed7bf0402e6864799b60a9e Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 30 Oct 2024 18:14:43 -0600 Subject: [PATCH 03/12] Fix conflicts from the merge in the testlist Adds more tests on izumi as well as some gnu and one nvhpc test. --- cime_config/testdefs/testlist_mosart.xml | 66 ++++-------------------- 1 file changed, 11 insertions(+), 55 deletions(-) diff --git a/cime_config/testdefs/testlist_mosart.xml b/cime_config/testdefs/testlist_mosart.xml index b274535..8a1b899 100644 --- a/cime_config/testdefs/testlist_mosart.xml +++ b/cime_config/testdefs/testlist_mosart.xml @@ -1,29 +1,16 @@ - + -<<<<<<< HEAD - - - - - -||||||| abd2bc4 - - -======= + ->>>>>>> mosart1.1.02 + + -<<<<<<< HEAD - -||||||| abd2bc4 - -======= @@ -44,7 +31,6 @@ ->>>>>>> mosart1.1.02 @@ -69,15 +55,9 @@ -<<<<<<< HEAD - - -||||||| abd2bc4 - -======= + ->>>>>>> mosart1.1.02 @@ -96,16 +76,10 @@ -<<<<<<< HEAD - - - -||||||| abd2bc4 - - -======= + + + ->>>>>>> mosart1.1.02 @@ -127,15 +101,9 @@ -<<<<<<< HEAD - - -||||||| abd2bc4 - -======= ->>>>>>> mosart1.1.02 + @@ -144,15 +112,9 @@ -<<<<<<< HEAD - - -||||||| abd2bc4 - -======= ->>>>>>> mosart1.1.02 + @@ -161,15 +123,9 @@ -<<<<<<< HEAD - - -||||||| abd2bc4 - -======= ->>>>>>> mosart1.1.02 + From fb41a046f96c91772e0c1a401a353604454dce9a Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 30 Oct 2024 18:19:20 -0600 Subject: [PATCH 04/12] Fix compset to point to MOSART and add a comment that it isn't functional yet. Would be good for testing though. This resolves #61 --- cime_config/config_compsets.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 2e0d1e2..bcdb077 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -37,8 +37,9 @@ + R2000MOSART - 2000_SATM_DLND%LCPL_SICE_SOCN_MIZUROUTE_SGLC_SWAV + 2000_SATM_DLND%LCPL_SICE_SOCN_MOSART_SGLC_SWAV From c1f476cd0e508edbb0cb680fcf8ab4129af9b7e8 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 30 Oct 2024 18:34:52 -0600 Subject: [PATCH 05/12] Change Clm51 test to Clm60 This fixes #91 --- cime_config/testdefs/testlist_mosart.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_mosart.xml b/cime_config/testdefs/testlist_mosart.xml index 8a1b899..98a610c 100644 --- a/cime_config/testdefs/testlist_mosart.xml +++ b/cime_config/testdefs/testlist_mosart.xml @@ -64,14 +64,14 @@ - + - + From 891a45d45c28ada9ea8d23b0095ed6667d878306 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 31 Oct 2024 12:29:14 -0600 Subject: [PATCH 06/12] Change mosart tests to all be Clm60 --- cime_config/testdefs/testlist_mosart.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cime_config/testdefs/testlist_mosart.xml b/cime_config/testdefs/testlist_mosart.xml index 98a610c..c572a91 100644 --- a/cime_config/testdefs/testlist_mosart.xml +++ b/cime_config/testdefs/testlist_mosart.xml @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -132,7 +132,7 @@ - + From 77494596d594df6c5843747944abf1612c8d5494 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 31 Oct 2024 12:33:04 -0600 Subject: [PATCH 07/12] Rm 2 fldlist_add lines needed only for rof_from_glc, which is obsolete --- src/cpl/nuopc/rof_import_export.F90 | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/cpl/nuopc/rof_import_export.F90 b/src/cpl/nuopc/rof_import_export.F90 index 80cc7c7..d5fd022 100644 --- a/src/cpl/nuopc/rof_import_export.F90 +++ b/src/cpl/nuopc/rof_import_export.F90 @@ -113,8 +113,6 @@ subroutine advertise_fields(gcomp, flds_scalar_name, rc) call fldlist_add(fldsToRof_num, fldsToRof, 'Flrl_rofsub') call fldlist_add(fldsToRof_num, fldsToRof, 'Flrl_rofi') call fldlist_add(fldsToRof_num, fldsToRof, 'Flrl_irrig') - call fldlist_add(fldsToRof_num, fldsToRof, 'Fgrg_rofl') ! liq runoff from glc - call fldlist_add(fldsToRof_num, fldsToRof, 'Fgrg_rofi') ! ice runoff from glc do n = 1,fldsToRof_num call NUOPC_Advertise(importState, standardName=fldsToRof(n)%stdname, & From 17c55722219c625cf3bf2dc9a69149309972cc72 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 31 Oct 2024 12:37:37 -0600 Subject: [PATCH 08/12] Reduce logging noise from mosart's decomp info --- src/riverroute/mosart_control_type.F90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/riverroute/mosart_control_type.F90 b/src/riverroute/mosart_control_type.F90 index 672613f..095d1f1 100644 --- a/src/riverroute/mosart_control_type.F90 +++ b/src/riverroute/mosart_control_type.F90 @@ -990,10 +990,12 @@ subroutine init_decomp(this, locfn, decomp_option, use_halo_option, & endif pid = max(pid,0) pid = min(pid,npes-1) +#ifndef NDEBUG if (iam == pid) then write(iulog,'(2a,i9,a,i9,a,i9,a,i9)')' mosart decomp info',& ' proc = ',iam,' begr = ',begr,' endr = ',endr,' numr = ',lnumr endif +#endif call mpi_barrier(mpicom_rof,ier) enddo From 3fa79c4ae3f8b50a433d0a9aab9690843a791a71 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 31 Oct 2024 13:08:24 -0600 Subject: [PATCH 09/12] Fix typo --- cime_config/testdefs/testlist_mosart.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_mosart.xml b/cime_config/testdefs/testlist_mosart.xml index c572a91..4974b78 100644 --- a/cime_config/testdefs/testlist_mosart.xml +++ b/cime_config/testdefs/testlist_mosart.xml @@ -1,4 +1,4 @@ - + From 3af251485b1847fd005845aa1a4126f105390a29 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 31 Oct 2024 13:36:09 -0600 Subject: [PATCH 10/12] Partly back out 891a45d due to ERROR: Invalid compset name --- cime_config/testdefs/testlist_mosart.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cime_config/testdefs/testlist_mosart.xml b/cime_config/testdefs/testlist_mosart.xml index 4974b78..f43e080 100644 --- a/cime_config/testdefs/testlist_mosart.xml +++ b/cime_config/testdefs/testlist_mosart.xml @@ -14,7 +14,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -53,7 +53,7 @@ - + From 692d1839489d6979c1a241e0f638189186405cfc Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 31 Oct 2024 15:33:10 -0600 Subject: [PATCH 11/12] Revert 7749459 and add if statement as proposed by Erik K --- src/cpl/nuopc/rof_import_export.F90 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpl/nuopc/rof_import_export.F90 b/src/cpl/nuopc/rof_import_export.F90 index d5fd022..08dbc60 100644 --- a/src/cpl/nuopc/rof_import_export.F90 +++ b/src/cpl/nuopc/rof_import_export.F90 @@ -113,6 +113,10 @@ subroutine advertise_fields(gcomp, flds_scalar_name, rc) call fldlist_add(fldsToRof_num, fldsToRof, 'Flrl_rofsub') call fldlist_add(fldsToRof_num, fldsToRof, 'Flrl_rofi') call fldlist_add(fldsToRof_num, fldsToRof, 'Flrl_irrig') + if ( ctl%rof_from_glc ) then + call fldlist_add(fldsToRof_num, fldsToRof, 'Fgrg_rofl') ! liq runoff from glc + call fldlist_add(fldsToRof_num, fldsToRof, 'Fgrg_rofi') ! ice runoff from glc + end if do n = 1,fldsToRof_num call NUOPC_Advertise(importState, standardName=fldsToRof(n)%stdname, & From e49b68400c6578a6dc3073ef150ee236d60ff7e9 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 31 Oct 2024 16:42:17 -0600 Subject: [PATCH 12/12] Update mosart testlist --- cime_config/testdefs/testlist_mosart.xml | 26 ++++++++---------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/cime_config/testdefs/testlist_mosart.xml b/cime_config/testdefs/testlist_mosart.xml index f43e080..ce171cf 100644 --- a/cime_config/testdefs/testlist_mosart.xml +++ b/cime_config/testdefs/testlist_mosart.xml @@ -14,16 +14,6 @@ - - - - - - - - - - @@ -33,7 +23,7 @@ - + @@ -43,7 +33,7 @@ - + @@ -53,7 +43,7 @@ - + @@ -64,7 +54,7 @@ - + @@ -74,7 +64,7 @@ - + @@ -89,7 +79,7 @@ - + @@ -99,7 +89,7 @@ - + @@ -110,7 +100,7 @@ - +