Modify AdvCore SetServices to make use of FV_Setup; use IM,JM,LM tokens when AdvCore advection is running

Author: mmanyin

AdvCore_GridCompMod.F90

@@ -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
@@ -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
 
 !=============================================================================
 
@@ -253,75 +254,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)
 

FV_StateMod.F90

@@ -358,13 +358,27 @@ subroutine FV_Setup(GC,LAYOUT_FILE, RC)
   if (FV_Atm(1)%flagstruct%npz == 1) SW_DYNAMICS = .true.
 
 
+  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
+
 ! 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
@@ -397,8 +411,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)