Skip to content

Latest v12 changes for rc14 #302

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

Merged
sdrabenh merged 4 commits into from
May 2, 2025
Merged

Latest v12 changes for rc14 #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f12015
QSPLIT options for FV3 and ADV
wmputman Apr 24, 2025
822166c
Merge remote-tracking branch 'origin/feature/wmputman/LM_v12rc12_WMP'…
sdrabenh Apr 28, 2025
c87d32e
latest patches from HWT experience
wmputman Apr 30, 2025
464d035
Merge remote-tracking branch 'origin/feature/wmputman/LM_v12rc12_WMP'…
sdrabenh Apr 30, 2025
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
7 changes: 6 additions & 1 deletion AdvCore_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ module AdvCore_GridCompMod
implicit none
private

integer :: QSPLIT
integer :: nx, ny
integer :: npes_x, npes_y
real(FVPRC) :: dt
Expand Down Expand Up @@ -330,6 +331,10 @@ subroutine SetServices(GC, rc)
call MAPL_GetResource( MAPL, rpt_mass, 'ADV_CORE_REPORT_TRACER_MASS:', default=rpt_mass, RC=STATUS )
VERIFY_(STATUS)

call MAPL_GetResource( MAPL, QSPLIT, 'ADV_QSPLIT:', default=0, RC=STATUS )
VERIFY_(STATUS)


! Start up FV if AdvCore is running without FV3_DynCoreIsRunning
!--------------------------------------------------
if (.NOT. FV3_DynCoreIsRunning) then
Expand Down Expand Up @@ -758,7 +763,7 @@ subroutine Run(GC, IMPORT, EXPORT, CLOCK, RC)
call offline_tracer_advection(TRACERS, PLE0, PLE1, MFX, MFY, CX, CY, &
FV_Atm(1)%gridstruct, FV_Atm(1)%flagstruct, FV_Atm(1)%bd, &
FV_Atm(1)%domain, FV_Atm(1)%npx, FV_Atm(1)%npy, FV_Atm(1)%npz, &
NQ, dt)
NQ, dt, QSPLIT)

! Get Tracer Mass after advection
!--------------------------------
Expand Down
3 changes: 3 additions & 0 deletions DynCore_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6617,7 +6617,10 @@ subroutine RunAddIncs(gc, import, export, clock, rc)

! Add Diabatic Forcing to State Variables
! ---------------------------------------
call MAPL_TimerOn (GENSTATE,"PHYS_ADD_INCS")
call ADD_INCS ( STATE,IMPORT,DT )
call MAPL_TimerOff(GENSTATE,"PHYS_ADD_INCS")


if (DYN_DEBUG) call DEBUG_FV_STATE('PHYSICS ADD_INCS',STATE)

Expand Down
33 changes: 13 additions & 20 deletions FV_StateMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ module FV_StateMod
logical :: fix_mass = .true.
integer :: CASE_ID = 11
integer :: AdvCore_Advection = 0
integer :: FV3_QSPLIT = 0
character(LEN=ESMF_MAXSTR) :: FV3_CONFIG

public FV_Atm
Expand Down Expand Up @@ -437,6 +438,8 @@ subroutine FV_Setup(GC,LAYOUT_FILE, RC)
call MAPL_GetResource( MAPL, AdvCore_Advection, label='AdvCore_Advection:', default=AdvCore_Advection, rc=status )
VERIFY_(STATUS)

call MAPL_GetResource( MAPL, FV3_QSPLIT, label='FV3_QSPLIT:', default=FV3_QSPLIT, rc=status )
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, ADJUST_DT, label='ADJUST_DT:' , default=ADJUST_DT, rc=status )
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, INT_fix_mass, label='fix_mass:' , default=INT_fix_mass, rc=status )
Expand Down Expand Up @@ -1944,13 +1947,13 @@ subroutine FV_Run (STATE, EXPORT, CLOCK, GC, PLE0, RC)
if (run_gtfv3 == 0) then
call cpu_time(start)
#endif

if (FV3_QSPLIT == 0) FV3_QSPLIT = FV_Atm(1)%flagstruct%q_split
call fv_dynamics( &
FV_Atm(1)%npx, FV_Atm(1)%npy, FV_Atm(1)%npz, FV_Atm(1)%ncnst, FV_Atm(1)%ng, myDT, &
FV_Atm(1)%flagstruct%consv_te, FV_Atm(1)%flagstruct%fill, &
kappa, cp, zvir, &
FV_Atm(1)%ptop, FV_Atm(1)%ks, FV_Atm(1)%flagstruct%ncnst, &
state%ksplit, state%nsplit, FV_Atm(1)%flagstruct%q_split, &
state%ksplit, state%nsplit, FV3_QSPLIT, &
FV_Atm(1)%u, FV_Atm(1)%v, FV_Atm(1)%w, FV_Atm(1)%delz, &
FV_Atm(1)%flagstruct%hydrostatic, &
FV_Atm(1)%pt, FV_Atm(1)%delp, FV_Atm(1)%q, &
Expand Down Expand Up @@ -2337,24 +2340,14 @@ subroutine FV_Run (STATE, EXPORT, CLOCK, GC, PLE0, RC)
if (mpp_pe()==0) print*,''
if (mpp_pe()==0) print*,'-------------- FV3 Tracer Debug After DYN --------------'
allocate( DEBUG_ARRAY(isc:iec,jsc:jec,npz) )
endif
do n=1,STATE%GRID%NQ
if (state%vars%tracer(n)%is_r4) then
where (state%vars%tracer(n)%content_r4 < tiny(0.0))
state%vars%tracer(n)%content_r4 = 0.0
end where
if (DEBUG_ADV) DEBUG_ARRAY(:,:,1:npz) = state%vars%tracer(n)%content_r4
else
where (state%vars%tracer(n)%content < tiny(0.0))
state%vars%tracer(n)%content = 0.0
end where
if (DEBUG_ADV) DEBUG_ARRAY(:,:,1:npz) = state%vars%tracer(n)%content
endif
if (DEBUG_ADV) then
call prt_maxmin(TRIM(state%vars%tracer(n)%tname), DEBUG_ARRAY, isc, iec, jsc, jec, 0, npz, fac1)
endif
enddo
if (DEBUG_ADV) then
do n=1,STATE%GRID%NQ
if (state%vars%tracer(n)%is_r4) then
DEBUG_ARRAY(:,:,1:npz) = state%vars%tracer(n)%content_r4
else
DEBUG_ARRAY(:,:,1:npz) = state%vars%tracer(n)%content
endif
call prt_maxmin(TRIM(state%vars%tracer(n)%tname), DEBUG_ARRAY, isc, iec, jsc, jec, 0, npz, fac1)
enddo
deallocate ( DEBUG_ARRAY )
if (mpp_pe()==0) print*,'-------------- FV3 Tracer Debug After DYN --------------'
if (mpp_pe()==0) print*,''
Expand Down
Loading