Feature/history updates

cime_config/buildexe

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 build model executable

cime_config/buildnml

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Namelist creator for CIME's driver.
 """
 import os, sys
@@ -84,11 +84,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
     #--------------------------------

cime_config/config_component.xml

@@ -331,7 +331,7 @@
 
   <entry id="STOP_OPTION">
     <type>char</type>
-    <valid_values>none,never,nsteps,nstep,nseconds,nsecond,nminutes,nminute,nhours,nhour,ndays,nday,nmonths,nmonth,nyears,nyear,date,ifdays0,end</valid_values>
+    <valid_values>none,never,nsteps,nstep,nseconds,nsecond,nminutes,nminute,nhours,nhour,ndays,nday,nmonths,nmonth,nyears,nyear,date,end</valid_values>
     <default_value>ndays</default_value>
     <group>run_begin_stop_restart</group>
     <file>env_run.xml</file>
@@ -363,7 +363,7 @@
 
   <entry id="REST_OPTION">
     <type>char</type>
-    <valid_values>none,never,nsteps,nstep,nseconds,nsecond,nminutes,nminute,nhours,nhour,ndays,nday,nmonths,nmonth,nyears,nyear,date,ifdays0,end</valid_values>
+    <valid_values>none,never,nsteps,nstep,nseconds,nsecond,nminutes,nminute,nhours,nhour,ndays,nday,nmonths,nmonth,nyears,nyear,date,end</valid_values>
     <default_value>$STOP_OPTION</default_value>
     <group>run_begin_stop_restart</group>
     <file>env_run.xml</file>
@@ -1862,6 +1862,26 @@
     <desc>pes or cores per node for accounting purposes </desc>
   </entry>
 
+  <entry id="NGPUS_PER_NODE">
+    <type>integer</type>
+    <default_value>0</default_value>
+    <values>
+      <value compiler="pgi-gpu">1</value>
+      <value compiler="nvhpc-gpu">1</value>
+    </values>
+    <group>mach_pes</group>
+    <file>env_mach_pes.xml</file>
+    <desc> Number of GPUs per node used for simulation </desc>
+  </entry>
+
+  <entry id="MAX_GPUS_PER_NODE">
+    <type>integer</type>
+    <default_value>0</default_value>
+    <group>mach_pes_last</group>
+    <file>env_mach_pes.xml</file>
+    <desc>maximum number of GPUs allowed per node </desc>
+  </entry>
+
   <entry id="COSTPES_PER_NODE">
     <type>integer</type>
     <default_value>$MAX_MPITASKS_PER_NODE</default_value>
@@ -2293,7 +2313,7 @@
 
   <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,date,ifdays0,end</valid_values>
+    <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>
@@ -2343,7 +2363,6 @@
       machines/compilers.</desc>
   </entry>
 
-
   <!-- Prerun/postrun custom script options -->
 
   <entry id="PRERUN_SCRIPT">