merge to ESCOMP cmeps1.1.41

cime_config/config_component_cesm.xml

@@ -122,7 +122,7 @@
     <desc>Activates additional CO2-related fields to be exchanged between components. Possible values are:
 
     CO2A: sets the driver namelist variable flds_co2a = .true.; this adds
-    prognostic CO2 and diagnostic CO2 at the lowest model level to be sent from
+    diagnostic CO2 at the lowest model level to be sent from
     the atmosphere to the land and ocean.
 
     CO2B: sets the driver namelist variable flds_co2b = .true.; this adds

cime_config/namelist_definition_drv.xml

@@ -1513,7 +1513,7 @@
       Auxiliary mediator a2x dynamic, radiation, and precipitation fields history output every 3 hours
     </desc>
     <values>
-      <value>Sa_z:Sa_topo:Sa_u:Sa_v:Sa_tbot:Sa_ptem:Sa_shum:Sa_dens:Sa_pbot:Sa_pslv:Faxa_lwdn:Faxa_rainc:Faxa_rainl:Faxa_snowc:Faxa_snowl:Faxa_swndr:Faxa_swvdr:Faxa_swndf:Faxa_swvdf:Sa_co2diag:Sa_co2prog</value>
+      <value>Sa_z:Sa_topo:Sa_u:Sa_v:Sa_tbot:Sa_ptem:Sa_shum:Sa_dens:Sa_pbot:Sa_pslv:Faxa_lwdn:Faxa_rainc:Faxa_rainl:Faxa_snowc:Faxa_snowl:Faxa_swndr:Faxa_swvdr:Faxa_swndf:Faxa_swvdf:Sa_co2prog</value>
     </values>
   </entry>
   <entry id="histaux_atm2med_file4_history_option">
@@ -1578,7 +1578,7 @@
     <group>MED_attributes</group>
     <desc>Auxiliary mediator a2x aerosol and ghg history output daily or endofrun</desc>
     <values>
-      <value>Faxa_bcph:Faxa_ocph:Faxa_dstwet:Faxa_dstdry:Sa_co2prog:Sa_co2diag</value>
+      <value>Faxa_bcph:Faxa_ocph:Faxa_dstwet:Faxa_dstdry:Faxa_ndep:Sa_co2diag</value>
     </values>
   </entry>
   <entry id="histaux_atm2med_file5_history_option">
@@ -1587,7 +1587,7 @@
     <group>MED_attributes</group>
     <desc>history option type</desc>
     <values>
-      <value>nhours</value>
+      <value>ndays</value>
     </values>
   </entry>
   <entry id="histaux_atm2med_file5_history_n">
@@ -1596,7 +1596,7 @@
     <group>MED_attributes</group>
     <desc>history option span</desc>
     <values>
-      <value>3</value>
+      <value>1</value>
     </values>
   </entry>
   <entry id="histaux_atm2med_file5_doavg">
@@ -1614,7 +1614,7 @@
     <group>MED_attributes</group>
     <desc>Number of time samples per file.</desc>
     <values>
-      <value>2</value>
+      <value>1</value>
     </values>
   </entry>
   <entry id="histaux_atm2med_file5_auxname">
@@ -2217,6 +2217,7 @@
     <group>ALLCOMP_attributes</group>
     <values>
       <value>.false.</value>
+      <value COMP_WAV='ww3'>.true.</value>
     </values>
     <desc>Auxiliary mediator wav2med average history output every day.
     Note that ww3dev will use this configuration variable and send
@@ -2228,6 +2229,7 @@
     <group>MED_attributes</group>
     <values>
       <value>Sw_hs_avg:Sw_Tm1_avg:Sw_thm_avg:Sw_u_avg:Sw_v_avg:Sw_ustokes_avg:Sw_vstokes_avg:Sw_tusx_avg:Sw_tusy_avg:Sw_thp0_avg:Sw_fp0_avg:Sw_phs0_avg:Sw_phs1_avg:Sw_pdir0_avg:Sw_pdir1_avg:Sw_pTm10_avg:Sw_pTm11_avg</value>
+      <value COMP_WAV='ww3'>Sw_Hs:Sw_t01:Sw_t0m1:Sw_thm:Sw_lamult:Sw_ustokes:Sw_vstokes</value>
     </values>
     <desc>Auxiliary mediator wav2med file1 colon delimited output
     fields. NOTE: these are assumed to be time averaged over a day in
@@ -2259,6 +2261,7 @@
     <group>MED_attributes</group>
     <values>
       <value>.false.</value>
+      <value COMP_WAV='ww3'>.true.</value>
     </values>
     <desc>Auxiliary mediator wav2med file1 time averaged flag for file output.
     If this flag is set to .false. only instantaneous output will be created in the auxiliary file.</desc>
@@ -2269,6 +2272,7 @@
     <group>MED_attributes</group>
     <values>
       <value>wav.24h.avg</value>
+      <value COMP_WAV='ww3'>ww3</value>
     </values>
   </entry>
   <entry id="histaux_wav2med_file1_ntperfile">

med_test_comps/xatm/cime_config/buildlib

@@ -0,0 +1 @@
+../../xshare/cime_config/buildlib

med_test_comps/xatm/cime_config/buildnml

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+"""
+build data model library
+"""
+
+import sys, os
+
+_CIMEROOT = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), "..", "..", "..", "..", ".."
+)
+sys.path.append(os.path.join(_CIMEROOT, "CIME", "Tools"))
+
+from standard_script_setup import *
+from CIME.buildnml import build_xcpl_nml, parse_input
+from CIME.case import Case
+
+
+def buildnml(case, caseroot, compname):
+    if compname != "xatm":
+        raise AttributeError
+    build_xcpl_nml(case, caseroot, compname)
+
+
+def _main_func():
+    caseroot = parse_input(sys.argv)
+    with Case(caseroot) as case:
+        buildnml(case, caseroot, "xatm")
+
+
+if __name__ == "__main__":
+    _main_func()

med_test_comps/xatm/cime_config/config_component.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet type="text/xsl" href="entry_id.xsl" ?>
+
+<entry_id version="3.0">
+  <description>
+    <desc atm="XATM">Dead atm component</desc>
+  </description>
+
+  <entry id="COMP_ATM">
+    <type>char</type>
+    <valid_values>xatm</valid_values>
+    <default_value>xatm</default_value>
+    <group>case_comp</group>
+    <file>env_case.xml</file>
+    <desc>Name of atmosphere component</desc>
+  </entry>
+
+  <help>
+    =========================================
+    XATM naming conventions in compset name
+    =========================================
+  </help>
+
+</entry_id>