Merge pull request #16 from ekluzek/fixcoldstartnmosart

Fix cold start and replace mosart name

cime_config/buildlib

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Build the mosart component library
+Build the rtm component library
 """
 #pylint: disable=unused-wildcard-import, wildcard-import, multiple-imports
 #pylint: disable=wrong-import-position, invalid-name, too-many-locals

cime_config/buildnml

@@ -64,6 +64,7 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
     #----------------------------------------------------
 
     run_type = case.get_value("RUN_TYPE")
+    finidat_rtm = str(nmlgen.get_value("finidat_rtm"))
     if run_type == 'branch' or run_type == 'hybrid':
         run_refcase = case.get_value("RUN_REFCASE")
         run_refdate = case.get_value("RUN_REFDATE")
@@ -77,9 +78,11 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
             nmlgen.add_default("finidat_rtm", value=filename, ignore_abs_path=True)
         else:
             nmlgen.add_default("nrevsn_rtm", value=filename)
+    elif finidat_rtm.strip() == '':
+        nmlgen.set_value('finidat_rtm', value=' ')
     else:
         if nmlgen.get_default('finidat_rtm') == 'UNSET':
-            nmlgen.add_default('finidat_rtm', value='', ignore_abs_path=True)
+            nmlgen.add_default('finidat_rtm', value=' ', ignore_abs_path=True)
         else:
             nmlgen.add_default("finidat_rtm")
 
@@ -159,7 +162,7 @@ def buildnml(case, caseroot, compname):
     #----------------------------------------------------
     # Clear out old data.
     #----------------------------------------------------
-    data_list_path = os.path.join(case.get_case_root(), "Buildconf", "mosart.input_data_list")
+    data_list_path = os.path.join(case.get_case_root(), "Buildconf", "rtm.input_data_list")
     if os.path.exists(data_list_path):
         os.remove(data_list_path)
     #----------------------------------------------------

cime_config/testdefs/testlist_rtm.xml

@@ -23,6 +23,17 @@
       <option name="comment"  >Run with DEBUG compiler option all machine/compilers</option>
     </options>
   </test>
+  <test name="SMS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmColdStart">
+    <machines>
+      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
+      <machine name="cheyenne" compiler="gnu" category="rtm"></machine>
+      <machine name="hobart" compiler="nag" category="rtm"></machine>
+    </machines>
+    <options>
+      <option name="wallclock">0:20</option>
+      <option name="comment"  >Run a Cold-Start with all machine/compilers</option>
+    </options>
+  </test>
   <test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnIceOff">
     <machines>
       <machine name="cheyenne" compiler="intel" category="rtm">

cime_config/testdefs/testmods_dirs/rtm/rtmColdStart/include_user_mods

@@ -0,0 +1 @@
+../default

cime_config/testdefs/testmods_dirs/rtm/rtmColdStart/user_nl_rtm

@@ -0,0 +1 @@
+ finidat_rtm = ' '

docs/ChangeLog

@@ -1,3 +1,26 @@
+===============================================================
+Tag name:  rtm1_0_69
+Originator(s): erik
+Date: Jun 03, 2019
+One-line Summary: Fix cold-starts and remove mosart from files
+
+You couldn't set finidat_rtm to blank to indicate a cold start should
+be done. This fixes that issue. It now both indicates that a cold start
+should happen, AND it doesn't search for an empty filename from inputdata.
+
+Also added a cold-start test to make sure this continues to work.
+
+mosart was in a few places and it was changed to refer to "rtm" now.
+For example the list of files needed was mosart.input_data_files now
+it's properly rtm.input_data_files.
+
+Fixes: #14, #15
+
+   Fixes #14 -- Can't set finidat_rtm to blank indicating a cold-start
+   Fixes #15 -- mosart is used in the title of some files
+Testing:
+   rtm testlist on hobart and cheyenne (PASS)
+
 ===============================================================
 Tag name:  rtm1_0_68
 Originator(s): erik