Merge tag 'cime4.6.0' into gswp3drvflds

cime_config/cesm/allactive/config_compsets.xml

@@ -77,7 +77,7 @@
 
   <compset>
     <alias>B1850Cw</alias>  
-    <lname>1850_CAM55%WTSM_CLM50%BGC_CICE_POP2%ECO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
+    <lname>1850_CAM55%WTSM_CLM50%BGC_CICE_POP2%ECO_MOSART_SGLC_SWAV</lname>
   </compset>
 
 

cime_config/cesm/allactive/config_pes.xml

@@ -895,7 +895,7 @@
 	  <ntasks_lnd>-5</ntasks_lnd>
 	  <ntasks_rof>-5</ntasks_rof>
 	  <ntasks_ice>-7</ntasks_ice>
-	  <ntasks_ocn>-2</ntasks_ocn>
+	  <ntasks_ocn>-8</ntasks_ocn>
 	  <ntasks_glc>-1</ntasks_glc>
 	  <ntasks_wav>-12</ntasks_wav>
 	  <ntasks_cpl>-12</ntasks_cpl>
@@ -1336,14 +1336,14 @@
       <pes pesize="any" compset="CAM5.+CLM.+CICE.+POP.+">
 	<comment>none</comment>
 	<ntasks>
-	  <ntasks_atm>600</ntasks_atm>
-	  <ntasks_lnd>210</ntasks_lnd>
-	  <ntasks_rof>210</ntasks_rof>
-	  <ntasks_ice>390</ntasks_ice>
-	  <ntasks_ocn>30</ntasks_ocn>
-	  <ntasks_glc>600</ntasks_glc>
-	  <ntasks_wav>600</ntasks_wav>
-	  <ntasks_cpl>600</ntasks_cpl>
+	  <ntasks_atm>-40</ntasks_atm>
+	  <ntasks_lnd>-24</ntasks_lnd>
+	  <ntasks_rof>-24</ntasks_rof>
+	  <ntasks_ice>-16</ntasks_ice>
+	  <ntasks_ocn>-6</ntasks_ocn>
+	  <ntasks_glc>-40</ntasks_glc>
+	  <ntasks_wav>-40</ntasks_wav>
+	  <ntasks_cpl>-40</ntasks_cpl>
 	</ntasks>
 	<nthrds>
 	  <nthrds_atm>2</nthrds_atm>
@@ -1359,8 +1359,8 @@
 	  <rootpe_atm>0</rootpe_atm>
 	  <rootpe_lnd>0</rootpe_lnd>
 	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>210</rootpe_ice>
-	  <rootpe_ocn>600</rootpe_ocn>
+	  <rootpe_ice>-24</rootpe_ice>
+	  <rootpe_ocn>-40</rootpe_ocn>
 	  <rootpe_glc>0</rootpe_glc>
 	  <rootpe_wav>0</rootpe_wav>
 	  <rootpe_cpl>0</rootpe_cpl>

cime_config/cesm/allactive/testlist_allactive.xml

@@ -31,7 +31,7 @@
     </grid>
     <grid name="f19_g16">
       <test name="SMS_D">
-        <machine compiler="intel" testtype="prebeta" testmods="allactive/defaultio">edison</machine>
+        <machine compiler="intel" testtype="prebeta" testmods="allactive/defaultio">yellowstone</machine>
       </test>
       <test name="CME_Ld5">
         <machine compiler="intel" testtype="prebeta" testmods="allactive/defaultio">yellowstone</machine>

cime_config/cesm/machines/config_machines.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 
-<!--  
+<!--
 
  ===============================================================
- COMPILER and COMPILERS 
+ COMPILER and COMPILERS
  ===============================================================
- If a machine supports multiple compilers - then 
+ If a machine supports multiple compilers - then
   - the settings for COMPILERS should reflect the supported compilers
     as a comma separated string
-  - the setting for COMPILER should be the default compiler 
+  - the setting for COMPILER should be the default compiler
     (which is one of the values in COMPILERS)
-   
+
  ===============================================================
  MPILIB and MPILIBS
  ===============================================================
- If a machine supports only one MPILIB is supported - then 
- the setting for  MPILIB and MPILIBS should be blank ("")   
+ If a machine supports only one MPILIB is supported - then
+ the setting for  MPILIB and MPILIBS should be blank ("")
  If a machine supports multiple mpi libraries (e.g. mpich and openmpi)
   - the settings for MPILIBS should reflect the supported mpi libraries
     as a comma separated string
 
- The default settings for COMPILERS and MPILIBS is blank (in config_machines.xml)  
+ The default settings for COMPILERS and MPILIBS is blank (in config_machines.xml)
 
  Normally variable substitutions are not made until the case scripts are run, however variables
- of the form $ENV{VARIABLE_NAME} are substituted in create_newcase from the environment 
+ of the form $ENV{VARIABLE_NAME} are substituted in create_newcase from the environment
  variable of the same name if it exists.
 
  ===============================================================
@@ -35,36 +35,36 @@
  should be set to TRUE for the given machine.
 
  ===============================================================
- batch_system 
+ batch_system
  ===============================================================
- The batch_system and associated tags are meant for configuring batch systems and 
- queues across machines.  The batch_system tag denotes the name for a particular 
- batch system, these can either be shared between one or more machines, or can be 
- defined for a specific machine if need be.  
- queues: 
- one or more queues can be defined per batch_system. if the attribute default="true" 
+ The batch_system and associated tags are meant for configuring batch systems and
+ queues across machines.  The batch_system tag denotes the name for a particular
+ batch system, these can either be shared between one or more machines, or can be
+ defined for a specific machine if need be.
+ queues:
+ one or more queues can be defined per batch_system. if the attribute default="true"
  is used, then that queue will be used by default. Alternatively, multiple queues can
  be used.  The following variables can be used to choose a queue :
- walltimemin: Giving the minimum amount of walltime for the queue. 
- walltimemax: The maximum amount of walltime for a queue. 
- jobmin:      The minimum node count required to use this queue. 
- jobmax:      The maximum node count required to use this queue. 
+ walltimemin: Giving the minimum amount of walltime for the queue.
+ walltimemax: The maximum amount of walltime for a queue.
+ jobmin:      The minimum node count required to use this queue.
+ jobmax:      The maximum node count required to use this queue.
 
- walltimes:  
- Denotes the walltimes that can be used for a particular machine. 
+ walltimes:
+ Denotes the walltimes that can be used for a particular machine.
  walltime: as before, if default="true" is defined, this walltime will be used
- by default. 
- Alternatively, ccsm_estcost must be used to choose the queue based on the estimated cost of the run. 
+ by default.
+ Alternatively, ccsm_estcost must be used to choose the queue based on the estimated cost of the run.
 
- mpirun: the mpirun command that will be used to actually launch the model.  
- The attributes used to choose the mpirun command are: 
+ mpirun: the mpirun command that will be used to actually launch the model.
+ The attributes used to choose the mpirun command are:
 
- mpilib: can either be 'default' the name of an mpi library, or a compiler name so one can choose the mpirun 
-         based on the mpi library in use. 
+ mpilib: can either be 'default' the name of an mpi library, or a compiler name so one can choose the mpirun
+         based on the mpi library in use.
+
+   the 'executable' tag must have arguments required for the chosen mpirun, as well as the executable name.
 
-   the 'executable' tag must have arguments required for the chosen mpirun, as well as the executable name. 
 
- 
 -->
 
 <config_machines>
@@ -84,10 +84,10 @@
     <DOUT_L_MSROOT>USERDEFINED_optional_run</DOUT_L_MSROOT>           <!-- complete path to a long term archiving directory -->
     <CCSM_BASELINE>USERDEFINED_optional_run</CCSM_BASELINE>           <!-- where the cesm testing scripts write and read baseline results -->
     <CCSM_CPRNC>USERDEFINED_optional_test</CCSM_CPRNC>                <!-- path to the cprnc tool used to compare netcdf history files in testing -->
-    <BATCHQUERY>USERDEFINED_optional_run</BATCHQUERY> 
+    <BATCHQUERY>USERDEFINED_optional_run</BATCHQUERY>
     <BATCHSUBMIT>USERDEFINED_optional_run</BATCHSUBMIT>
     <BATCHREDIRECT></BATCHREDIRECT>
-    <SUPPORTED_BY>USERDEFINED_optional</SUPPORTED_BY>                 
+    <SUPPORTED_BY>USERDEFINED_optional</SUPPORTED_BY>
     <GMAKE_J>1</GMAKE_J>
     <MAX_TASKS_PER_NODE>USERDEFINED_required_build</MAX_TASKS_PER_NODE> <!-- maximum number of threads*tasks on a node -->
     <PES_PER_NODE>USERDEFINED_required_build</PES_PER_NODE> <!-- maximum number of mpi tasks on a node -->
@@ -221,13 +221,13 @@
 	<command name="unload">netcdf</command>
       </modules>
       <modules compiler="intel13">
-	<command name="load">intel/13.1.2</command> 
+	<command name="load">intel/13.1.2</command>
       </modules>
       <modules compiler="intel14">
-	<command name="load">intel/14.0.3</command> 
+	<command name="load">intel/14.0.3</command>
       </modules>
       <modules compiler="intel15">
-	<command name="load">intel/15.0.0</command> 
+	<command name="load">intel/15.0.0</command>
       </modules>
 
       <modules mpilib="impi">
@@ -457,7 +457,7 @@
       <executable></executable>
     </mpirun>
     <mpirun mpilib="mvapich2">
-      <executable>srun</executable>  
+      <executable>srun</executable>
       <arguments>
         <arg name="mpi">--mpi=none</arg>
         <arg name="num_tasks">--ntasks={{ num_tasks }}</arg>
@@ -466,7 +466,7 @@
       </arguments>
     </mpirun>
     <mpirun mpilib="mvapich">
-      <executable>srun</executable>  
+      <executable>srun</executable>
       <arguments>
         <arg name="num_tasks">--ntasks={{ num_tasks }}</arg>
         <arg name="cpu_bind">--cpu_bind=sockets --cpu_bind=verbose</arg>
@@ -598,10 +598,10 @@
 	<command name="rm">craype-ivybridge</command>
 	<command name="rm">craype</command>
       </modules>
-      
+
       <modules compiler="intel">
 	<command name="load">PrgEnv-intel</command>
-	<command name="switch">intel intel/2016.0.109</command>
+	<command name="switch">intel intel/16.0.2.181</command>
 	<command name="rm">cray-libsci</command>
 	<command name="use">/global/project/projectdirs/ccsm1/modulefiles/cori</command>
       </modules>
@@ -673,7 +673,7 @@
     <batch_system type="slurm" version="x.y">
     <queues>
 	<queue jobmin="1" jobmax="9999" default="true">batch</queue>
-    </queues> 
+    </queues>
       <walltimes>
 	<walltime default="true">0:59:00</walltime>
       </walltimes>
@@ -705,7 +705,7 @@
       <cmd_path lang="sh">module</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
       <modules>
-	<command name="purge"/> 
+	<command name="purge"/>
         <command name="load">perl/5.20.7</command>
         <command name="load">cmake/3.0.0</command>
         <command name="load">pgi/15.5</command>
@@ -787,7 +787,7 @@
 	<command name="rm">craype-ivybridge</command>
 	<command name="rm">craype</command>
       </modules>
-      
+
       <modules compiler="intel">
 	<command name="load">PrgEnv-intel</command>
 	<command name="switch">intel intel/15.0.1.133</command>
@@ -965,7 +965,7 @@
       <init_path lang="perl">/opt/modules/default/init/perl.pm</init_path>
       <init_path lang="sh">/opt/modules/default/init/sh</init_path>
       <init_path lang="csh">/opt/modules/default/init/csh</init_path>
-      
+
       <cmd_path lang="perl">/opt/modules/default/bin/modulecmd perl</cmd_path>
       <cmd_path lang="sh">module</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
@@ -1269,7 +1269,7 @@
 	<arg name="num_tasks"> -n {{ num_tasks }}</arg>
 	<arg name="locargs">  $LOCARGS</arg>
 	<arg name="bg_threadlayout"> --envs BG_THREADLAYOUT=1</arg>
-	<arg name="omp_stacksize"> --envs OMP_STACKSIZE=32M</arg> 
+	<arg name="omp_stacksize"> --envs OMP_STACKSIZE=32M</arg>
 	<arg name="thread_count"> --envs OMP_NUM_THREADS={{ thread_count }}</arg>
 	<arg name="colon">:</arg>
       </arguments>
@@ -1326,7 +1326,7 @@
 	<executable></executable>
       </mpirun>
       <mpirun mpilib="default">
-	<executable>mpiexec_mpt</executable>  
+	<executable>mpiexec_mpt</executable>
 	<arguments>
 	  <arg name="mpi">--mpi=none</arg>
 	  <arg name="num_tasks">-n={{ num_tasks }}</arg>
@@ -1673,11 +1673,11 @@
     <DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
     <DIN_LOC_ROOT_CLMFORC>$ENV{CESMROOT}/lmwg</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$CESMSCRATCHROOT/archive/$CASE</DOUT_S_ROOT>
-    <DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>              
-    <CCSM_BASELINE>$ENV{CESMDATAROOT}/ccsm_baselines</CCSM_BASELINE>                   
+    <DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
+    <CCSM_BASELINE>$ENV{CESMDATAROOT}/ccsm_baselines</CCSM_BASELINE>
     <CCSM_CPRNC>$ENV{CESMDATAROOT}/tools/cime/tools/cprnc/cprnc</CCSM_CPRNC>
     <PERL5LIB>/glade/apps/opt/perlmods/lib64/perl5:/glade/apps/opt/perlmods/share/perl5</PERL5LIB>
-    <BATCHQUERY>bjobs -w</BATCHQUERY>                                                                     
+    <BATCHQUERY>bjobs -w</BATCHQUERY>
     <BATCHSUBMIT>bsub</BATCHSUBMIT>
     <BATCHREDIRECT>&lt; </BATCHREDIRECT>
     <SUPPORTED_BY>cseg</SUPPORTED_BY>

components/stub_comps/sesp/cime_config/config_component.xml

@@ -2,9 +2,9 @@
 
 <?xml-stylesheet type="text/xsl" href="definitions_variables.xsl" ?>
 
-<definitions_variables> 
+<definitions_variables>
 
-  <entry id="COMP_ESP"> 
+  <entry id="COMP_ESP">
     <type>char</type>
     <valid_values>sesp</valid_values>
     <default_value>sesp</default_value>
@@ -14,7 +14,8 @@
   </entry>
 
   <description>
+    <desc compset="_"> No ESP component  </desc>
     <desc compset="_SESP">Stub esp component</desc>
   </description>
 
-</definitions_variables> 
+</definitions_variables>

driver_cpl/bld/namelist_files/namelist_defaults_drv.xml

@@ -107,7 +107,7 @@
 <cpl_decomp>$CPL_DECOMP</cpl_decomp>
 <wall_time_limit>-1.0</wall_time_limit> 
 <force_stop_at>month</force_stop_at> 
-<flux_diurnal>.true.</flux_diurnal> 
+<flux_diurnal>.false.</flux_diurnal> 
 
 <run_barriers COMP_RUN_BARRIERS="TRUE">.true.</run_barriers> 
 <run_barriers COMP_RUN_BARRIERS="FALSE">.false.</run_barriers> 

driver_cpl/bld/namelist_files/namelist_definition_drv.xml

@@ -462,7 +462,7 @@ type="logical"
 category="control" 
 group="seq_infodata_inparm">
 If true, turn on diurnal cycle in computing atm/ocn fluxes
-default: true
+default: false
 </entry>
 
 <entry 

driver_cpl/cime_config/config_component.xml

@@ -2211,8 +2211,8 @@
 
   <entry id="NINST_ESP_LAYOUT">
     <type>char</type>
-    <valid_values>sequential</valid_values>
-    <default_value>sequential</default_value>
+    <valid_values>sequential,concurrent</valid_values>
+    <default_value>concurrent</default_value>
     <group>mach_pes_esp</group>
     <file>env_mach_pes.xml</file>
     <desc>Layout of external processing tool instances</desc>

driver_cpl/driver/cesm_comp_mod.F90

@@ -1558,9 +1558,6 @@ subroutine cesm_init()
       call shr_sys_abort(subname//' ERROR: rof_prognostic but num_inst_rof not num_inst_max')
    if (wav_prognostic .and. num_inst_wav /= num_inst_max) &
       call shr_sys_abort(subname//' ERROR: wav_prognostic but num_inst_wav not num_inst_max')
-   if (num_inst_esp /= 1) then
-      call shr_sys_abort(subname//' ERROR: num_inst_esp must be 1')
-    end if
 
    !----------------------------------------------------------
    !| Initialize attribute vectors for prep_c2C_init_avs routines and fractions