first implementation of exchange grid

NOAA-EMC · DeniseWorthen · Dec 16, 2021 · Jun 18, 2021 · Jun 23, 2021 · Jun 23, 2021
commit 0e662b0b62db49e2ce8c79587801a3a144dd84a8
diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml
@@ -1136,13 +1136,13 @@
     <type>char</type>
     <category>mapping</category>
     <group>MED_attributes</group>
-    <valid_values>ocn,atm,exch</valid_values>
+    <valid_values>ogrid,agrrid,xgrid</valid_values>
     <desc>
       Grid for atm ocn flux calc (untested)
       default: ocn
     </desc>
     <values>
-      <value>ocn</value>
+      <value>ogrid</value>
     </values>
   </entry>
 

diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
diff --git a/mediator/med.F90 b/mediator/med.F90
@@ -763,6 +763,15 @@ subroutine InitializeIPDv03p1(gcomp, importState, exportState, clock, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
     end do
 
+    ! Determine aoflux grid
+    call NUOPC_CompAttributeGet(gcomp, name='aoflux_grid', value=cvalue, isPresent=isPresent, isSet=isSet, rc=rc)
+    if (chkerr(rc,__LINE__,u_FILE_u)) return
+    if (.not. isPresent .and. .not. isSet) then
+       cvalue = 'ogrid'
+    end if
+    is_local%wrap%aoflux_grid = trim(cvalue)
+    write(6,*)'DEBUG: aoflux_grid = ',is_local%wrap%aoflux_grid
+
     !------------------
     ! Initialize mediator flds
     !------------------

diff --git a/mediator/med_internalstate_mod.F90 b/mediator/med_internalstate_mod.F90
@@ -75,9 +75,10 @@ module med_internalstate_mod
     type(ESMF_FieldBundle) :: FBMed_ocnalb_o                     ! Ocn albedo on ocn grid
     type(ESMF_FieldBundle) :: FBMed_ocnalb_a                     ! Ocn albedo on atm grid
     type(packed_data_type) :: packed_data_ocnalb_o2a(nmappers)   ! packed data for mapping ocn->atm
-    type(ESMF_FieldBundle) :: FBMed_aoflux_o                     ! Ocn/Atm flux fields on ocn grid
-    type(ESMF_FieldBundle) :: FBMed_aoflux_a                     ! Ocn/Atm flux fields on atm grid
+    type(ESMF_FieldBundle) :: FBMed_aoflux_a                     ! Ocn/Atm flux output fields on atm grid
+    type(ESMF_FieldBundle) :: FBMed_aoflux_o                     ! Ocn/Atm flux output fields on ocn grid
     type(packed_data_type) :: packed_data_aoflux_o2a(nmappers)   ! packed data for mapping ocn->atm
+    character(len=CS)      :: aoflux_grid                        ! 'ogrid', 'agrid' or 'xgrid'
 
     ! Mapping
     type(ESMF_RouteHandle) :: RH(ncomps,ncomps,nmappers)            ! Routehandles for pairs of components and different mappers