refactor mediator history to permit new functionality

cime_config/buildnml

@@ -103,11 +103,6 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
     #----------------------------------------------------
     nmlgen.init_defaults(infile, config)
 
-    if case.get_value('MEDIATOR_READ_RESTART'):
-        nmlgen.set_value('mediator_read_restart', value='.true.')
-    else:
-        nmlgen.set_value('mediator_read_restart', value='.false.')
-
     #--------------------------------
     # Overwrite: set brnch_retain_casename
     #--------------------------------
@@ -292,7 +287,7 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
     # the driver restart pointer will look like a mediator is present even if it is not
     nmlgen.set_value("drv_restart_pointer", value="rpointer.cpl")
 
-    logger.info("Writing nuopc_runseq for components {}".format(valid_comps))
+    logger.info("Writing nuopc_runconfig for components {}".format(valid_comps))
     nuopc_config_file = os.path.join(confdir, "nuopc.runconfig")
     nmlgen.write_nuopc_config_file(nuopc_config_file, data_list_path=data_list_path)
 

cime_config/config_component.xml

@@ -435,27 +435,6 @@
     </values>
   </entry>
 
-  <entry id="BARRIER_N">
-    <type>char</type>
-    <default_value>1</default_value>
-    <group>run_begin_stop_restart</group>
-    <file>env_run.xml</file>
-    <desc>
-      Sets periodic model barriers with BARRIER_OPTION and BARRIER_DATE for synchronization
-    </desc>
-  </entry>
-
-  <entry id="BARRIER_DATE">
-    <type>char</type>
-    <default_value>-999</default_value>
-    <group>run_begin_stop_restart</group>
-    <file>env_run.xml</file>
-    <desc>
-      Alternative date in yyyymmdd format
-      sets periodic model barriers with BARRIER_OPTION and BARRIER_N for synchronization
-    </desc>
-  </entry>
-
   <entry id="ESP_RUN_ON_PAUSE">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
@@ -841,6 +820,21 @@
     machines.</desc>
   </entry>
 
+  <entry id="CLM_USE_PETSC">
+    <type>logical</type>
+    <valid_values>TRUE,FALSE</valid_values>
+    <default_value>FALSE</default_value>
+    <group>build_component_clm</group>
+    <file>env_build.xml</file>
+    <desc>TRUE implies CLM is built with support for the PETSc
+      library. The Variably Saturated Flow Model (VSFM) solver in CLM
+      uses the PETSc library. In order to use the VSFM solver, CLM
+      must be built with PETSc support and linking to PETSc must occur
+      when building the ACME executable. This occurs if this variable
+      is set to TRUE. Note that is only available on a limited set of
+      machines/compilers.</desc>
+  </entry>
+
   <entry id="USE_MOAB">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
@@ -2294,10 +2288,6 @@
     <desc>standard full pathname of the cprnc executable</desc>
   </entry>
 
-  <!-- ===================================================================== -->
-  <!-- component coupling options and frequencies -->
-  <!-- ===================================================================== -->
-
   <entry id="CPL_I2O_PER_CAT">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
@@ -2307,38 +2297,6 @@
     <desc>determine if per ice thickness category fields are passed from ice to ocean - DO NOT EDIT (set by POP build-namelist)</desc>
   </entry>
 
-  <!-- ===================================================================== -->
-  <!-- history frequencies -->
-  <!-- ===================================================================== -->
-
-  <entry id="HIST_OPTION">
-    <type>char</type>
-    <valid_values>none,never,nsteps,nstep,nseconds,nsecond,nminutes,nminute,nhours,nhour,ndays,nday,nmonths,nmonth,nyears,nyear,end</valid_values>
-    <default_value>never</default_value>
-    <group>run_drv_history</group>
-    <file>env_run.xml</file>
-    <desc>Sets driver snapshot history file frequency (like REST_OPTION)</desc>
-  </entry>
-
-  <entry id="HIST_N">
-    <type>integer</type>
-    <valid_values></valid_values>
-    <default_value>-999</default_value>
-    <group>run_drv_history</group>
-    <file>env_run.xml</file>
-    <desc>Sets driver snapshot history file frequency (like REST_N)
-    </desc>
-  </entry>
-
-  <entry id="HIST_DATE">
-    <type>integer</type>
-    <valid_values></valid_values>
-    <default_value>-999</default_value>
-    <group>run_drv_history</group>
-    <file>env_run.xml</file>
-    <desc>yyyymmdd format, sets coupler snapshot history date (like REST_DATE)</desc>
-  </entry>
-
   <entry id="INFO_DBUG">
     <type>integer</type>
     <valid_values>0,1,2,3,4,5,6,7,8,9</valid_values>
@@ -2348,22 +2306,6 @@
     <desc>level of debug output, 0=minimum, 1=normal, 2=more, 3=too much</desc>
   </entry>
 
-  <entry id="CLM_USE_PETSC">
-    <type>logical</type>
-    <valid_values>TRUE,FALSE</valid_values>
-    <default_value>FALSE</default_value>
-    <group>build_component_clm</group>
-    <file>env_build.xml</file>
-    <desc>TRUE implies CLM is built with support for the PETSc
-      library. The Variably Saturated Flow Model (VSFM) solver in CLM
-      uses the PETSc library. In order to use the VSFM solver, CLM
-      must be built with PETSc support and linking to PETSc must occur
-      when building the ACME executable. This occurs if this variable
-      is set to TRUE. Note that is only available on a limited set of
-      machines/compilers.</desc>
-  </entry>
-
-
   <!-- Prerun/postrun custom script options -->
 
   <entry id="PRERUN_SCRIPT">
@@ -2541,6 +2483,21 @@
    <desc>add aoflux calculation to runseq</desc>
  </entry>
 
+  <!-- ===================================================================== -->
+  <!-- TODO: the following should be deleted. They are still used by  -->
+  <!-- the component testing but are not doing anything in cmeps -->
+  <!-- ===================================================================== -->
+
+  <entry id="BFBFLAG">
+    <type>logical</type>
+    <valid_values>TRUE,FALSE</valid_values>
+    <default_value>FALSE</default_value>
+    <group>run_flags</group>
+    <file>env_run.xml</file>
+    <desc>turns on coupler bit-for-bit reproducibility with varying pe counts</desc>
+  </entry>
+
+
  <help>
     =========================================
     Notes: