From 99511faf2f08ee1b0cfd3f5c007abab9f7dad077 Mon Sep 17 00:00:00 2001
From: Steve Goldhaber <goldy@ucar.edu>
Date: Fri, 8 Sep 2023 16:31:21 +0200
Subject: [PATCH 1/2] Add taper fix namelist entries and dme_energy_adjust

---
 bld/namelist_files/namelist_definition.xml | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
index 3ba59737e0..5a87d91448 100644
--- a/bld/namelist_files/namelist_definition.xml
+++ b/bld/namelist_files/namelist_definition.xml
@@ -766,6 +766,28 @@ Flag to determine how to handle dpcoup warning messages
 Default: off
 </entry>
 
+<entry id="fv_am_fix_taper" type="logical"  category="dyn_fv"
+       group="dyn_fv_inparm" valid_values="" >
+Flag to taper the fixer (regardless of whether applied level by level or
+as a global constant) from full to nil (def. above 95hPa).  This further
+limits the artifical effect of the fixer in the stratosphere where the gw
+forcing can be very sensitive to its increments. This option is experimental.
+Default: .false.
+</entry>
+
+<entry id="fv_am_fix_tpr_h" type="real"  category="dyn_fv"
+       group="dyn_fv_inparm" valid_values="" >
+Height (pressure) to start tapering the fixer. This option is experimental.
+Default: 9500._r8
+</entry>
+
+<entry id="fv_am_fix_tpr_w" type="real"  category="dyn_fv"
+       group="dyn_fv_inparm" valid_values="" >
+Height (pressure) interval over which the fixer taper function drops to zero.
+This option is experimental.
+Default: 1000._r8
+</entry>
+
 <!-- MPI configuration for FV dycore -->
 
 <entry id="force_2d" type="integer"  category="dyn_fv"
@@ -4936,6 +4958,16 @@ neutral thermosphere, and off for no WACCM-X.
 Default: 'off'
 </entry>
 
+<!--==============================================-->
+<!-- Hydrostatic pressure work in mass adjustment -->
+<entry id="dme_energy_adjust" type="logical"  category="NorESM"
+       group="phys_ctl_nl" valid_values="" >
+Switch to use appropriate energy adjustment in dry-mass adjustment at the
+end of tphysac.
+Default: .false.
+</entry>
+<!--==============================================-->
+
 <entry id="oplus_adiff_limiter" type="real" category="waccmx"
        group="ionosphere_nl" valid_values="" >
 Limiter for ambipolar diffusion coefficient used in O+ transport in the

From 6d4eb6dde4091fc58b3ef6d2d12989c6634813eb Mon Sep 17 00:00:00 2001
From: Steve Goldhaber <steveng@met.no>
Date: Mon, 11 Sep 2023 15:43:47 +0200
Subject: [PATCH 2/2] Update CAM-Nor-phys external tag

---
 Externals_CAM.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg
index 4a43ae2d5d..d265d93bd9 100644
--- a/Externals_CAM.cfg
+++ b/Externals_CAM.cfg
@@ -63,7 +63,7 @@ required = True
 
 [camnor_phys]
 protocol = git
-tag = camnor_noresm_v0.0.3
+tag = camnor_noresm_v0.0.4
 repo_url = https://github.com/NorESMhub/CAM-Nor-physics
 local_path = src/physics/camnor_phys
 required = True