Skip to content

Commit dd244ac

Browse files
committed
Make adjust_ps consistent with SCREAM
Make setting of adjust_ps consistent with SCREAM repo. We want to allow adjust_ps=.false. for SCREAM, but retain adjust_ps=.true. for E3SM to remain BFB for v2. This change was originally made downstream in SCREAM, but causes conflicts between the two repos, and prevents EAM compsets from being BFB between the E3SM and SCREAM repos. Moving this change upstream, protected in an ifdef, allows the two repos to be consistent, and keeps EAM compsets BFB between the SCREAM and E3SM repos. This also sets the precedent for allowing changes upstream in E3SM that should apply only to SCREAM configurations, protected in ifdef SCREAM. To enable, we simply need to add the -cppdefs '-DSCREAM' flag to CAM_CONFIG_OPTS for SCREAM compsets. [BFB]
1 parent 89d4726 commit dd244ac

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

components/homme/src/share/prim_driver_base.F90

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,11 @@ subroutine applyCAMforcing_tracers(elem,hvcoord,np1,np1_qdp,dt,adjustment)
15971597
if (dt_remap_factor==0) then
15981598
adjust_ps=.true. ! stay on reference levels for Eulerian case
15991599
else
1600+
#ifdef SCREAM
1601+
adjust_ps=.false. ! Lagrangian case can support adjusting dp3d or ps
1602+
#else
16001603
adjust_ps=.true. ! Lagrangian case can support adjusting dp3d or ps
1604+
#endif
16011605
endif
16021606
#else
16031607
adjust_ps=.true. ! preqx requires forcing to stay on reference levels

0 commit comments

Comments
 (0)