mosart1_0_27

Upgrade config_component to version 3, allow output file format
to change, fix a couple bugs

Bugs fixed: 2477, 2494

Author: ekluzek

cime_config/buildnml

@@ -79,10 +79,11 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen):
         run_refcase = case.get_value("RUN_REFCASE")
         run_refdate = case.get_value("RUN_REFDATE")
         run_tod     = case.get_value("RUN_REFTOD")
-        if inst_string:
-            filename = "%s.mosart%s.r.%s-%s.nc" %(run_refcase, inst_string, run_refdate, run_tod)
-        else:
+        rundir      = case.get_value("RUNDIR")
+        filename = "%s.mosart%s.r.%s-%s.nc" %(run_refcase, inst_string, run_refdate, run_tod)
+        if not os.path.exists(os.path.join(rundir, filename ) ):
             filename = "%s.mosart.r.%s-%s.nc" %(run_refcase, run_refdate, run_tod)
+
         if run_type == "hybrid":
             nmlgen.add_default("finidat_rtm", value=filename, ignore_abs_path=True)
         else:

cime_config/config_component.xml

@@ -1,6 +1,18 @@
 <?xml version="1.0"?>
 
-<definitions_variables>
+<entry_id version="3.0">
+
+  <!-- modifier_mode allowed values are
+       '*' 0 or more modifiers (default)
+       '1' exactly 1 modifier
+       '?' 0 or 1 modifiers
+       '+' 1 or more modifiers
+       This file may have lnd desc entries.
+  -->
+  <description modifier_mode="*">
+    <desc rof="MOSART[%FLOOD]">MOSART: MOdel for Scale Adaptive River Transport</desc>
+    <desc option="FLOOD">MOSART model with flood:</desc>
+  </description>
 
   <entry id="COMP_ROF"> 
      <type>char</type>
@@ -35,7 +47,7 @@
     <desc>mode for mosart flood feature, NULL means mosart flood is turned off</desc>
   </entry>
 
-  <entry id="MOSART_SIMYR"> 
+  <entry id="MOSART_SIMYR">
     <type>char</type>
     <valid_values></valid_values>
     <default_value>-simyr 2000</default_value>
@@ -49,16 +61,10 @@
     <file>env_run.xml</file>
     <desc>MOSART build-namelist options</desc>
   </entry>
-
-  <description>
-    <desc compset="_MOSART">MOSART:</desc>
-    <desc compset="_MOSART%FLOOD">MOSART model with flood:</desc>
-  </description>
-
   <help>
     =========================================
     MOSART naming conventions
     =========================================
   </help>
 
-</definitions_variables>
+</entry_id>

cime_config/testdefs/testmods_dirs/mosart/default/user_nl_mosart

@@ -1,7 +1,5 @@
-&mosart_inparam
 !  do_rtm = .true.
 !  ice_runoff  = .true. 
   rtmhist_ndens     = 1,1,1
   rtmhist_nhtfrq    =-24,-8
   rtmhist_mfilt     = 1,1
-/

cime_config/testdefs/testmods_dirs/mosart/iceOff/user_nl_mosart

@@ -1,4 +1,2 @@
-&mosart_inparam
   do_rtm = .true.
   ice_runoff  = .false. 
-/

cime_config/testdefs/testmods_dirs/mosart/mosartOff/user_nl_mosart

@@ -1,4 +1,2 @@
-&rtm_inparm
   do_rtm = .false.
   ice_runoff  = .false. 
-/

doc/ChangeLog

@@ -1,3 +1,27 @@
+===============================================================
+Tag name:  mosart1_0_27
+Originator(s): erik
+Date: Oct 03, 2017
+One-line Summary: Upgrade config_component to version 3, allow output file format
+                  to change, fix a couple bugs
+
+Bugs fixed: 2477, 2494
+
+Testing: aux_clm testlist with cfgcompsetv3_n01_clm4_5_16_r251 on yellowstone/cheyenne/hobart
+
+M    src/riverroute/RtmIO.F90 - Changes from Jim Edwards to change format of output NetCDF
+           files, and remove public attribute from io_type
+
+           Remove unneeded setting of namelist group name in test namelists (bug 2494)
+M    cime_config/testdefs/testmods_dirs/mosart/default/user_nl_mosart
+M    cime_config/testdefs/testmods_dirs/mosart/iceOff/user_nl_mosart
+M    cime_config/testdefs/testmods_dirs/mosart/mosartOff/user_nl_mosart
+
+M    cime_config/buildnml ------------- Fix bug 2477 for MOSART so that
+        if NINST_RTM > 1, will check if REFCASE has instance name
+        in it and then use it, but if not use it without instance name
+M    cime_config/config_component.xml - Upgrade to version 3 format
+
 ===============================================================
 Tag name:  mosart1_0_26
 Originator(s): erik