From d480ecc39880952abf4e3178abcbb99d2fc15780 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Fri, 4 Jun 2021 13:08:26 -0600
Subject: [PATCH] Fix namelist variables that weren't being set

With my upcoming fix for https://github.com/ESMCI/cime/issues/3984, I
was getting some failures due to namelist variables that weren't
properly defined.

(1) mediator_read_restart: since this is set in the code rather than via
    the normal mechanism, I think it's appropriate to have
    skip_default_entry="true" here.

(2) ESP's pio_netcdf_format: I'm not positive that the way I've set it
    is correct, but it seems more correct than before.
---
 cime_config/namelist_definition_drv.xml     | 2 +-
 cime_config/namelist_definition_modelio.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml
index 94a821d79..f0dca561f 100644
--- a/cime_config/namelist_definition_drv.xml
+++ b/cime_config/namelist_definition_drv.xml
@@ -571,7 +571,7 @@
     </values>
   </entry>
 
-  <entry id="mediator_read_restart" modify_via_xml="MEDIATOR_READ_RESTART">
+  <entry id="mediator_read_restart" skip_default_entry="true" modify_via_xml="MEDIATOR_READ_RESTART">
     <type>logical</type>
     <category>expdef</category>
     <group>DRIVER_attributes</group>
diff --git a/cime_config/namelist_definition_modelio.xml b/cime_config/namelist_definition_modelio.xml
index ea5d47f0a..35af19567 100644
--- a/cime_config/namelist_definition_modelio.xml
+++ b/cime_config/namelist_definition_modelio.xml
@@ -166,6 +166,7 @@
     <value component="rof">$ROF_PIO_NETCDF_FORMAT</value>
     <value component="glc">$GLC_PIO_NETCDF_FORMAT</value>
     <value component="wav">$WAV_PIO_NETCDF_FORMAT</value>
+    <value component="esp">$ESP_PIO_NETCDF_FORMAT</value>
     </values>
   </entry>