Skip to content

GEOS_MLT_v3: update FV state #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Andrew-won-Lee wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

GEOS_MLT_v3: update FV state #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3017a0a
GEOS_MLT_v3
May 6, 2026
ac367ec
Merge branch 'main' into feature/awlee/GEOS_MLT_v3
Andrew-won-Lee May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DynCore_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Module FVdycoreCubed_GridComp
DYN_CASE => CASE_ID, &
DYN_DEBUG => DEBUG, &
HYDROSTATIC => FV_HYDROSTATIC, &
GEOS_MLT => FV_GEOS_MLT, &
fv_getUpdraftHelicity, &
ADIABATIC, SW_DYNAMICS, AdvCore_Advection
use m_topo_remap, only: dyn_topo_remap
Expand Down
32 changes: 31 additions & 1 deletion FV_StateMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ module FV_StateMod
integer :: INT_ADIABATIC = 0
logical :: ADIABATIC = .false.
logical :: FV_HYDROSTATIC = .true.
logical :: FV_GEOS_MLT = .false.
integer :: INT_check_mass = 0
logical :: check_mass = .false.
integer :: INT_fix_mass = 1
Expand All @@ -77,7 +78,7 @@ module FV_StateMod

public FV_Atm
public FV_Setup, FV_InitState, FV_Run, FV_Finalize, FV_DA_Incs
public FV_HYDROSTATIC, ADIABATIC, DEBUG, COLDSTART, CASE_ID, SW_DYNAMICS, AdvCore_Advection
public FV_HYDROSTATIC, FV_GEOS_MLT, ADIABATIC, DEBUG, COLDSTART, CASE_ID, SW_DYNAMICS, AdvCore_Advection
public FV_RESET_CONSTANTS
public FV_To_State, State_To_FV
public T_TRACERS, T_FVDYCORE_VARS, T_FVDYCORE_GRID, T_FVDYCORE_STATE
Expand Down Expand Up @@ -743,6 +744,7 @@ subroutine FV_Setup(GC,LAYOUT_FILE, RC)
format='(" stretch_fac =",F10.4)' )

FV_HYDROSTATIC = FV_Atm(1)%flagstruct%hydrostatic
FV_GEOS_MLT = FV_Atm(1)%flagstruct%GEOS_MLT
DEBUG = FV_Atm(1)%flagstruct%fv_debug
prt_minmax = FV_Atm(1)%flagstruct%fv_debug

Expand Down Expand Up @@ -1084,6 +1086,7 @@ subroutine FV_InitState (STATE, CLOCK, INTERNAL, IMPORT, GC, RC)
if ( (gid==0) .and. (.not. FV_HYDROSTATIC) ) print*, 'FV3 being run Non-Hydrostatic'
if ( (gid==0) .and. (.not. FV_HYDROSTATIC) .and. (FV_Atm(1)%flagstruct%Make_NH) ) print*, 'FV3 Coldstarting Non-Hydrostatic W and DZ'
if ( (gid==0) .and. (FV_HYDROSTATIC) ) print*, 'FV3 being run Hydrostatic'
if ( (gid==0) .and. (FV_GEOS_MLT) ) print*, 'GEOS_MLT (lid extended to 150 or 210km) is being run'
if ( (gid==0) .and. (SW_DYNAMICS) ) print*, 'FV3 being run as Shallow-Water Model: test_case=', test_case
if ( (gid==0) .and. (FV_Atm(1)%flagstruct%grid_type == 4) ) print*, 'FV3 being run as Doubly-Periodic: test_case=', test_case
STATE%VARS%nwat = FV_Atm(1)%flagstruct%nwat
Expand Down Expand Up @@ -1169,6 +1172,10 @@ subroutine FV_InitState (STATE, CLOCK, INTERNAL, IMPORT, GC, RC)
end subroutine FV_InitState

subroutine FV_Run (STATE, EXPORT, CLOCK, GC, RC)

use ESMF

implicit none

type (T_FVDYCORE_STATE),pointer :: STATE
type (ESMF_State), intent(INOUT) :: EXPORT
Expand All @@ -1184,6 +1191,8 @@ subroutine FV_Run (STATE, EXPORT, CLOCK, GC, RC)
integer :: days, seconds
real(FVPRC) :: time_total, massD

integer :: year, month, day, hour, minute, second

integer :: i,j,k,n,nn
integer :: isc,iec,jsc,jec,ng
integer :: isd,ied,jsd,jed
Expand Down Expand Up @@ -1299,6 +1308,16 @@ subroutine FV_Run (STATE, EXPORT, CLOCK, GC, RC)
ng = FV_Atm(1)%ng
domain = FV_Atm(1)%domain

! Call the proper time variables for GEOS_MLT

call ESMF_ClockGet(CLOCK, currTime=fv_time, rc=status)
VERIFY_(status)

call ESMF_TimeGet(fv_time, yy=year, mm=month, dd=day, &
h=hour, m=minute, s=second, rc=status)
VERIFY_(status)


! Be sure we have the correct PHIS and number of tracers for this run
if (fv_first_run) then
! Determine how many water species we have
Expand Down Expand Up @@ -2016,6 +2035,7 @@ subroutine FV_Run (STATE, EXPORT, CLOCK, GC, RC)
state%ksplit, state%nsplit, FV_Atm(1)%flagstruct%q_split, &
FV_Atm(1)%u, FV_Atm(1)%v, FV_Atm(1)%w, FV_Atm(1)%delz, &
FV_Atm(1)%flagstruct%hydrostatic, &
FV_atm(1)%flagstruct%GEOS_MLT, year, month, day, hour, minute, second, &
FV_Atm(1)%pt, FV_Atm(1)%delp, FV_Atm(1)%q, &
FV_Atm(1)%ps, FV_Atm(1)%pe, FV_Atm(1)%pk, FV_Atm(1)%peln, FV_Atm(1)%pkz, &
FV_Atm(1)%phis, FV_Atm(1)%varflt, FV_Atm(1)%q_con, FV_Atm(1)%omga, &
Expand Down Expand Up @@ -4997,11 +5017,17 @@ end subroutine echo_fv3_setup

subroutine adiabatic_init(myDT,DEBUG_ARRAY,fac1)
use fv_nwp_nudge_mod, only: do_adiabatic_init

use ESMF, only: ESMF_Clock, ESMF_Time, ESMF_ClockGet, ESMF_TimeGet

real(FVPRC), intent(IN ) :: myDT
real(FVPRC), intent(INOUT) :: DEBUG_ARRAY(:,:,:)
real(FVPRC), intent(IN ) :: fac1
real(FVPRC), allocatable, dimension(:,:,:):: u0, v0, t0, dp0
real(FVPRC), parameter:: wt = 2.

integer :: year, month, day, hour, minute, second ! Used for GEOS_MLT

!***********
! Haloe Data
!***********
Expand Down Expand Up @@ -5081,6 +5107,7 @@ subroutine adiabatic_init(myDT,DEBUG_ARRAY,fac1)
FV_Atm(1)%flagstruct%k_split, FV_Atm(1)%flagstruct%n_split, FV_Atm(1)%flagstruct%q_split, &
FV_Atm(1)%u, FV_Atm(1)%v, FV_Atm(1)%w, FV_Atm(1)%delz, &
FV_Atm(1)%flagstruct%hydrostatic, &
FV_Atm(1)%flagstruct%GEOS_MLT, year, month, day, hour, minute, second, &
FV_Atm(1)%pt, FV_Atm(1)%delp, FV_Atm(1)%q, &
FV_Atm(1)%ps, FV_Atm(1)%pe, FV_Atm(1)%pk, FV_Atm(1)%peln, FV_Atm(1)%pkz, &
FV_Atm(1)%phis, FV_Atm(1)%varflt, FV_Atm(1)%q_con, FV_Atm(1)%omga, &
Expand All @@ -5100,6 +5127,7 @@ subroutine adiabatic_init(myDT,DEBUG_ARRAY,fac1)
FV_Atm(1)%flagstruct%k_split, FV_Atm(1)%flagstruct%n_split, FV_Atm(1)%flagstruct%q_split, &
FV_Atm(1)%u, FV_Atm(1)%v, FV_Atm(1)%w, FV_Atm(1)%delz, &
FV_Atm(1)%flagstruct%hydrostatic, &
FV_Atm(1)%flagstruct%GEOS_MLT, year, month, day, hour, minute, second, &
FV_Atm(1)%pt, FV_Atm(1)%delp, FV_Atm(1)%q, &
FV_Atm(1)%ps, FV_Atm(1)%pe, FV_Atm(1)%pk, FV_Atm(1)%peln, FV_Atm(1)%pkz, &
FV_Atm(1)%phis, FV_Atm(1)%varflt, FV_Atm(1)%q_con, FV_Atm(1)%omga, &
Expand Down Expand Up @@ -5142,6 +5170,7 @@ subroutine adiabatic_init(myDT,DEBUG_ARRAY,fac1)
FV_Atm(1)%flagstruct%k_split, FV_Atm(1)%flagstruct%n_split, FV_Atm(1)%flagstruct%q_split, &
FV_Atm(1)%u, FV_Atm(1)%v, FV_Atm(1)%w, FV_Atm(1)%delz, &
FV_Atm(1)%flagstruct%hydrostatic, &
FV_Atm(1)%flagstruct%GEOS_MLT, year, month, day, hour, minute, second, &
FV_Atm(1)%pt, FV_Atm(1)%delp, FV_Atm(1)%q, &
FV_Atm(1)%ps, FV_Atm(1)%pe, FV_Atm(1)%pk, FV_Atm(1)%peln, FV_Atm(1)%pkz, &
FV_Atm(1)%phis, FV_Atm(1)%varflt, FV_Atm(1)%q_con, FV_Atm(1)%omga, &
Expand All @@ -5161,6 +5190,7 @@ subroutine adiabatic_init(myDT,DEBUG_ARRAY,fac1)
FV_Atm(1)%flagstruct%k_split, FV_Atm(1)%flagstruct%n_split, FV_Atm(1)%flagstruct%q_split, &
FV_Atm(1)%u, FV_Atm(1)%v, FV_Atm(1)%w, FV_Atm(1)%delz, &
FV_Atm(1)%flagstruct%hydrostatic, &
FV_Atm(1)%flagstruct%GEOS_MLT, year, month, day, hour, minute, second, &
FV_Atm(1)%pt, FV_Atm(1)%delp, FV_Atm(1)%q, &
FV_Atm(1)%ps, FV_Atm(1)%pe, FV_Atm(1)%pk, FV_Atm(1)%peln, FV_Atm(1)%pkz, &
FV_Atm(1)%phis, FV_Atm(1)%varflt, FV_Atm(1)%q_con, FV_Atm(1)%omga, &
Expand Down
10 changes: 10 additions & 0 deletions geos-gtfv3/driver/FV_State_Utilities.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ subroutine set_resolution_dependent_geos_defaults(fix_mass, DT, FV_Atm)
FV_Atm(1)%flagstruct%n_sponge = 18 ! ~0.2mb
FV_Atm(1)%flagstruct%n_zfilter = 50 ! ~10mb
endif
if (FV_Atm(1)%flagstruct%npz >= 186) then
FV_Atm(1)%flagstruct%n_sponge = 3 ! ~0.008mb
FV_Atm(1)%flagstruct%n_zfilter = 56 ! ~10mb
FV_Atm(1)%flagstruct%GEOS_MLT = .true.
endif
if (FV_Atm(1)%flagstruct%npz >= 190) then
FV_Atm(1)%flagstruct%nsponge = 3 ! ~0.001mb
FV_Atm(1)%flagstruct%n_zfilter = 60 ! ~10mb
FV_Atm(1)%flagstruct%GEOS_MLT = .true.
endif
FV_Atm(1)%flagstruct%tau = 0.
FV_Atm(1)%flagstruct%rf_cutoff = 7.5e2
FV_Atm(1)%flagstruct%d2_bg_k1 = 0.20
Expand Down
Loading