From 0f603555083e9fdd895ad01b9ec985850efcae8f Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Wed, 28 Jul 2021 20:39:00 -0600
Subject: [PATCH 1/2] Rename values of atm_ozone_frequency namelist option

Based on discussion in https://github.com/ESCOMP/CAM/pull/404
---
 bld/build-namelist                         | 4 ++--
 bld/namelist_files/namelist_definition.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bld/build-namelist b/bld/build-namelist
index 8413f96f57..e88ca9ecc4 100755
--- a/bld/build-namelist
+++ b/bld/build-namelist
@@ -3848,9 +3848,9 @@ foreach my $name (@nl_groups) { $nl_group{$name} = ''; }
 # nature of ozone data passed to surface models -- only if cmeps (nuopc) coupling is used
 if ($opts{'cmeps'}) {
   if ($rad_prog_ozone) {
-    add_default($nl, 'atm_ozone_frequency', 'val'=>'instantaneous');
+    add_default($nl, 'atm_ozone_frequency', 'val'=>'subdaily');
   } else {
-    add_default($nl, 'atm_ozone_frequency', 'val'=>'monthly_interpolated');
+    add_default($nl, 'atm_ozone_frequency', 'val'=>'multiday_average');
   }
 }
 $outfile = "$opts{'dir'}/drv_flds_in";
diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
index 7a3da3c322..f592fd1f71 100644
--- a/bld/namelist_files/namelist_definition.xml
+++ b/bld/namelist_files/namelist_definition.xml
@@ -6808,7 +6808,7 @@ Default: set by build-namelist.
 <!-- Ozone namelist variables shared between CAM and driver -->
 
 <entry id="atm_ozone_frequency" type="char*64" category="ozone_coupling"
-       group="ozone_coupling_nl" valid_values="instantaneous,monthly_interpolated">
+       group="ozone_coupling_nl" valid_values="subdaily,multiday_average">
 Frequency of surface ozone field passed from CAM to surface components.
 Surface ozone is passed every coupling interval, but this namelist flag
 indicates whether the timestep-level values are interpolated from a

From 9b7390c12d21e22ed4372937e7a5d7a138e8864d Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Wed, 28 Jul 2021 20:39:31 -0600
Subject: [PATCH 2/2] Fix invalid xml

---
 bld/namelist_files/namelist_definition.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
index f592fd1f71..70088b85f1 100644
--- a/bld/namelist_files/namelist_definition.xml
+++ b/bld/namelist_files/namelist_definition.xml
@@ -2653,7 +2653,7 @@ Default: .false.
 
 <entry id="micro_mg_evap_rhthrsh_ifs" type="logical" category="microphys"
        group="micro_mg_nl" valid_values="" >
-Do not evaporate precipitation until RH<90% as done in the
+Do not evaporate precipitation until RH &lt; 90% as done in the
 IFS model (https://www.ecmwf.int/en/forecasts/documentation-and-support)
 Default: .false.
 </entry>