Skip to content

updates from CTM #301

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

Closed
mmanyin wants to merge 3 commits into from
Closed

updates from CTM #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72da1bd
Call FV_Setup in AdvCore; explicitly set the precision for MAPL expor…
mmanyin Apr 9, 2025
c5f3eb3
When using AdvCore, expect resources named IM, JM, LM, instead of AGC…
mmanyin Apr 9, 2025
1dcb4e9
Restore a diagnostic setting
mmanyin Apr 9, 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
76 changes: 19 additions & 57 deletions AdvCore_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ module AdvCore_GridCompMod
use fv_grid_utils_mod, only: g_sum

USE FV_StateMod, only: AdvCoreTracers => T_TRACERS
USE FV_StateMod, only: FV_Atm
USE FV_StateMod, only: FV_Atm, FV_setup
use CubeGridPrototype, only: register_grid_and_regridders

implicit none
Expand Down Expand Up @@ -129,6 +129,7 @@ subroutine SetServices(GC, rc)
type(ESMF_VM) :: VM
integer :: comm, ndt
integer :: p_split=1
character(len=ESMF_MAXSTR) :: LAYOUT_FILE

!=============================================================================

Expand Down Expand Up @@ -212,6 +213,7 @@ subroutine SetServices(GC, rc)
SHORT_NAME = 'AREA', &
LONG_NAME = 'agrid_cell_area', &
UNITS = 'm+2' , &
PRECISION = ESMF_KIND_R4, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -224,6 +226,7 @@ subroutine SetServices(GC, rc)
SHORT_NAME = TRIM(myTracer), &
LONG_NAME = TRIM(myTracer), &
UNITS = '1', &
PRECISION = ESMF_KIND_R4, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -253,75 +256,34 @@ subroutine SetServices(GC, rc)
call MAPL_GridCompSetEntryPoint ( gc, ESMF_METHOD_FINALIZE, Finalize, RC=status)
VERIFY_(STATUS)

! Check if AdvCore is running without FV3_DynCoreIsRunning, if yes then setup the MAPL Grid
! ----------------------------------------------------------------------------
! Check if AdvCore is running without FV3_DynCoreIsRunning, if yes then setup the MAPL Grid
! ----------------------------------------------------------------------------
call MAPL_GetObjectFromGC (GC, MAPL, RC=STATUS )
VERIFY_(STATUS)
call MAPL_GetResource(MAPL, DYCORE, 'DYCORE:', default="", RC=STATUS )
VERIFY_(STATUS)
call MAPL_GetResource(MAPL, AdvCore_Advection , label='AdvCore_Advection:', &
default=AdvCore_Advection, RC=STATUS )
VERIFY_(STATUS)
if(adjustl(DYCORE)=="FV3") FV3_DynCoreIsRunning = .true.
if(adjustl(DYCORE)=="FV3+ADV") FV3_DynCoreIsRunning = .true.

! Start up FMS/MPP
!-------------------------------------------
call ESMF_VMGet(VM,mpiCommunicator=comm,rc=STATUS)
VERIFY_(STATUS)
call fms_init(comm)
! Setup FMS/FV3
!--------------
call MAPL_GetResource ( MAPL, LAYOUT_FILE, 'LAYOUT:', default='fvcore_layout.rc', rc=status )
VERIFY_(STATUS)
call FV_Setup(GC, LAYOUT_FILE)

if (.NOT. FV3_DynCoreIsRunning) then
! Make sure FV3 is setup
! -----------------------
call register_grid_and_regridders()
call fv_init1(FV_Atm, dt, grids_on_my_pe, p_split)
! Get Domain decomposition
!-------------------------
call MAPL_GetResource( MAPL, nx, 'NX:', default=0, RC=STATUS )
VERIFY_(STATUS)
FV_Atm(1)%layout(1) = nx
call MAPL_GetResource( MAPL, ny, 'NY:', default=0, RC=STATUS )
VERIFY_(STATUS)
if (FV_Atm(1)%flagstruct%grid_type == 4) then
FV_Atm(1)%layout(2) = ny
else
FV_Atm(1)%layout(2) = ny / 6
end if
! Get Resolution Information
!---------------------------
! FV grid dimensions setup from MAPL
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npx, 'IM:', default= 32, RC=STATUS )
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npy, 'JM:', default=192, RC=STATUS )
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npz, 'LM:', default= 72, RC=STATUS )
VERIFY_(STATUS)
! FV likes npx;npy in terms of cell vertices
if (FV_Atm(1)%flagstruct%npy == 6*FV_Atm(1)%flagstruct%npx) then
FV_Atm(1)%flagstruct%ntiles = 6
FV_Atm(1)%flagstruct%npy = FV_Atm(1)%flagstruct%npx+1
FV_Atm(1)%flagstruct%npx = FV_Atm(1)%flagstruct%npx+1
else
FV_Atm(1)%flagstruct%ntiles = 1
FV_Atm(1)%flagstruct%npy = FV_Atm(1)%flagstruct%npy+1
FV_Atm(1)%flagstruct%npx = FV_Atm(1)%flagstruct%npx+1
endif
endif
! Register prototype of cubed sphere grid and associated regridders
!------------------------------------------------------------------
call register_grid_and_regridders()

! Read DT in case it is ever used by offline_tracer_advection
!------------------------------------------------------------
call MAPL_GetResource( MAPL, ndt, 'RUN_DT:', default=0, RC=STATUS )
VERIFY_(STATUS)
DT = ndt

! Start up FV if AdvCore is running without FV3_DynCoreIsRunning
!--------------------------------------------------
if (.NOT. FV3_DynCoreIsRunning) then
call fv_init2(FV_Atm, dt, grids_on_my_pe, p_split)
end if

! Ending with a Generic SetServices call is a MAPL requirement
!-------------------------------------------------------------
! Ending with a Generic SetServices call is a MAPL requirement
!-------------------------------------------------------------
call MAPL_GenericSetServices ( GC, rc=STATUS)
VERIFY_(STATUS)

Expand Down Expand Up @@ -363,7 +325,7 @@ subroutine Initialize(GC, IMPORT, EXPORT, CLOCK, RC)
type(ESMF_Config) :: CF
type (MAPL_MetaComp), pointer :: MAPL
type (ESMF_VM) :: VM
real, pointer :: temp2d(:,:)
real(REAL4), pointer :: temp2d(:,:)
integer :: IS, IE, JS, JE
logical :: gridCreated
type(ESMF_Grid) :: grid
Expand Down Expand Up @@ -484,7 +446,7 @@ subroutine Run(GC, IMPORT, EXPORT, CLOCK, RC)
REAL(FVPRC) :: PTOP, PINT
REAL(REAL8) :: ptop_r8,pint_r8
! Temporaries for exports/tracers
REAL, POINTER :: temp3D(:,:,:)
real(REAL4), pointer :: temp3D (:,:,:)
real(REAL4), pointer :: tracer_r4 (:,:,:)
real(REAL8), pointer :: tracer_r8 (:,:,:)
character(len=ESMF_MAXSTR) :: fieldName
Expand Down
18 changes: 16 additions & 2 deletions FV_StateMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,13 +375,27 @@ subroutine FV_Setup(GC,LAYOUT_FILE, RC)



call MAPL_GetResource( MAPL, AdvCore_Advection, label='AdvCore_Advection:', default=AdvCore_Advection, rc=status )
VERIFY_(STATUS)

! FV grid dimensions setup from MAPL
! Advect core expects to find IM/JM/LM in the resource file not AGCM_IM/AGCM_JM/AGCM_LM
if (AdvCore_Advection == 1) then
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npx, 'IM:', default= 32, RC=STATUS )
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npy, 'JM:', default=192, RC=STATUS )
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npz, 'LM:', default= 72, RC=STATUS )
VERIFY_(STATUS)
else
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npx, 'AGCM_IM:', default= 32, RC=STATUS )
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npy, 'AGCM_JM:', default=192, RC=STATUS )
VERIFY_(STATUS)
call MAPL_GetResource( MAPL, FV_Atm(1)%flagstruct%npz, 'AGCM_LM:', default= 72, RC=STATUS )
VERIFY_(STATUS)
endif

if (FV_Atm(1)%flagstruct%npz == 1) SW_DYNAMICS = .true.
! stretch_fac is kind(R_GRID) in FV, so to prevent a MAPL failure on RC check, we pull
! AGCM.STRETCH_FACTOR: as a REAL32 and then cast it to REAL64. This is because
Expand Down Expand Up @@ -422,8 +436,8 @@ subroutine FV_Setup(GC,LAYOUT_FILE, RC)
VERIFY_(STATUS)
DT = ndt

! Advect tracers within DynCore(AdvCore_Advection=.false.)
! or within AdvCore(AdvCore_Advection=.true.)
! Advect tracers within DynCore(AdvCore_Advection=0)
! or within AdvCore(AdvCore_Advection=1)
call MAPL_GetResource( MAPL, AdvCore_Advection, label='AdvCore_Advection:', default=AdvCore_Advection, rc=status )
VERIFY_(STATUS)

Expand Down
Loading