Skip to content

Commit

Permalink
Merge 'CONRAD/investigate_adjust_ps' (PR #6063)
Browse files Browse the repository at this point in the history
This is an incremental change to introduce adjustment of dp3d
instead of adjustment of ps.

adjust_ps is still used for preqx (forcing was never rewritten),
rsplit=0 (only adjust_ps is possible), or EAM (to not touch every test).

Fixed bugs in forcing_ut init, testing it only
with adjust_ps=false option.

[non-BFB] for HOMME tests with baselines (with moist forcing
and some without nontrivial forcing, because even zero forcing
is processed differently for adjustment of dp3d).
  • Loading branch information
oksanaguba committed Mar 20, 2024
2 parents 04d7347 + eba2ee0 commit 84be1d3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions components/homme/src/share/prim_driver_base.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1621,8 +1621,9 @@ subroutine applyCAMforcing_tracers(elem,hvcoord,np1,np1_qdp,dt,adjustment)
adjust_ps=.true. ! preqx requires forcing to stay on reference levels
#endif

#ifdef CAM
adjust_ps=.true. ! For CAM runs, require forcing to stay on reference levels
#if defined(CAM) && !defined(SCREAM)
adjust_ps=.true. ! Special case when CAM is defined, and SCREAM is not defined,
! require forcing to stay on reference levels no matter dt_remap_factor
#endif

dp=elem%state%dp3d(:,:,:,np1)
Expand Down

0 comments on commit 84be1d3

Please sign in to comment.