Merge remote-tracking branch 'upstream/master' into fixes

driver-mct/cime_config/config_component.xml

@@ -2920,7 +2920,7 @@
       <value compset="_DATM%COPYALL_NPS"    >72</value>
       <value compset="_DATM.*_CLM"          >48</value>
       <value compset="_DATM.*_DICE.*_POP2"  >4</value>
-      <value compset="_DATM.*_CICE.*_POP2"  >24</value>
+      <value compset="_DATM.*_SLND.*_CICE.*_POP2">24</value>
       <value compset="_DATM.*_CICE.*_DOCN"  >24</value>
       <value compset="_DATM.*_DOCN%US20"    >24</value>
       <value compset="_MPAS"                >1</value>
@@ -3008,7 +3008,7 @@
     <type>char</type>
     <default_value>8</default_value>
     <values>
-      <value compset="_DATM.*_POP2">$ATM_NCPL</value>
+      <value compset="_DATM.*_POP2.*_DROF">$ATM_NCPL</value>
       <value compset="_DATM.*_DOCN%SOM">$ATM_NCPL</value>
       <value compset="_DATM.*_DLND.*_DICE.*_DOCN">$ATM_NCPL</value>
       <value compset="_XATM.*_XLND.*_XICE.*_XOCN">$ATM_NCPL</value>
@@ -3032,6 +3032,8 @@
   </entry>
 
 
+  <!-- Logic for CPL_ALBAV should be reworked to depend on datm forcing rather
+       than compset: see https://github.com/ESMCI/cime/issues/120 -->
   <entry id="CPL_ALBAV">
     <type>logical</type>
     <valid_values>true,false</valid_values>
@@ -3043,15 +3045,18 @@
     <group>run_component_cpl</group>
     <file>env_run.xml</file>
     <desc>
-      Only used for compsets with DATM and POP (currently C and G):
+      Only used for compsets with DATM and POP (currently C, G and J):
       If true, compute albedos to work with daily avg SW down
       If false (default), albedos are computed with the assumption that downward
       solar radiation from the atm component has a diurnal cycle and zenith-angle
       dependence. This is normally the case when using an active atm component
       If true, albedos are computed with the assumption that downward
       solar radiation from the atm component is a daily average quantity and
       does not have a zenith-angle dependence. This is often the case when
-      using a data atm component. Only used for compsets with DATM and POP (currently C and G)
+      using a data atm component. Only used for compsets with DATM and POP (currently C, G and J).
+      NOTE: This should really depend on the datm forcing and not the compset per se.
+      So, for example, whether it is set in a J compset should depend on
+      what datm forcing is used.
     </desc>
   </entry>
 
@@ -3065,12 +3070,12 @@
     <group>run_component_cpl</group>
     <file>env_run.xml</file>
     <desc>
-      Only used for compsets with DATM and POP (currently C and G):
+      Only used for compsets with DATM and POP (currently C, G and J):
       If ocn, ocn provides EP balance factor for precipitation.
       Provides EP balance factor for precip for POP. A factor computed by
       POP is applied to precipitation so that precipitation balances
       evaporation and ocn global salinity does not drift. This is intended
-      for use when coupling POP to a DATM. Only used for C and G compsets.
+      for use when coupling POP to a DATM. Only used for C, G and J compsets.
       Default is off
     </desc>
   </entry>