Add MARBL to MOM6

.gitignore

@@ -6,3 +6,4 @@ html
 MOM6
 build/
 deps/
+pkg/MARBL

config_src/mct_driver/mom_surface_forcing_mct.F90

@@ -177,6 +177,8 @@ module MOM_surface_forcing_mct
                                                               !! ice-shelves, expressed as a coefficient
                                                               !! for divergence damping, as determined
                                                               !! outside of the ocean model in [m3/s]
+  real, pointer, dimension(:,:) :: ice_fraction      =>NULL() !< Fraction of ocn covered with ice
+  real, pointer, dimension(:,:) :: u10_sqr           =>NULL() !< 10m wind speed squared (m^2/s^2)
   integer :: xtype                                            !< The type of the exchange - REGRID, REDIST or DIRECT
   type(coupler_2d_bc_type)      :: fluxes                     !< A structure that may contain an array of
                                                               !! named fields used for passive tracer fluxes.
@@ -313,6 +315,9 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
 
     if (restore_temp) call safe_alloc_ptr(fluxes%heat_added,isd,ied,jsd,jed)
 
+    call safe_alloc_ptr(fluxes%ice_fraction,isd,ied,jsd,jed)
+    call safe_alloc_ptr(fluxes%u10_sqr,isd,ied,jsd,jed)
+
   endif   ! endif for allocation and initialization
 
 
@@ -521,6 +526,14 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
     fluxes%sw(i,j) = fluxes%sw_vis_dir(i,j) + fluxes%sw_vis_dif(i,j) + &
                      fluxes%sw_nir_dir(i,j) + fluxes%sw_nir_dif(i,j)
 
+    if (associated(IOB%ice_fraction)) then
+      fluxes%ice_fraction(i,j) = G%mask2dT(i,j) * IOB%ice_fraction(i-i0,j-j0)
+    end if
+
+    if (associated(IOB%u10_sqr)) then
+      fluxes%u10_sqr(i,j) = G%mask2dT(i,j) * US%m_s_to_L_T**2 * IOB%u10_sqr(i-i0,j-j0)
+    end if
+
   enddo; enddo
 
   ! applied surface pressure from atmosphere and cryosphere

config_src/mct_driver/ocn_cap_methods.F90

@@ -21,7 +21,7 @@ module ocn_cap_methods
 contains
 !=======================================================================
 
-!> Maps incomping ocean data to MOM6 data structures
+!> Maps incoming ocean data to MOM6 data structures
 subroutine ocn_import(x2o, ind, grid, ice_ocean_boundary, ocean_public, logunit, Eclock, c1, c2, c3, c4)
   real(kind=8)                  , intent(in)    :: x2o(:,:)           !< incoming data
   type(cpl_indices_type)        , intent(in)    :: ind                !< Structure with MCT attribute vects and indices
@@ -83,6 +83,12 @@ subroutine ocn_import(x2o, ind, grid, ice_ocean_boundary, ocean_public, logunit,
       ! ice runoff
       ice_ocean_boundary%rofi_flux(i,j) = x2o(ind%x2o_Foxx_rofi,k) * GRID%mask2dT(i,j)
 
+      ! ice fraction
+      ice_ocean_boundary%ice_fraction(i,j) = x2o(ind%x2o_Si_ifrac,k) * GRID%mask2dT(i,j)
+
+      ! 10m wind
+      ice_ocean_boundary%u10_sqr(i,j) = x2o(ind%x2o_So_duu10n,k) * GRID%mask2dT(i,j)
+
       ! surface pressure
       ice_ocean_boundary%p(i,j) = x2o(ind%x2o_Sa_pslv,k) * GRID%mask2dT(i,j)
 

config_src/mct_driver/ocn_comp_mct.F90

@@ -780,8 +780,6 @@ end subroutine ocean_model_init_sfc
 !! mi, mass of ice (kg/m2)
 !!
 !! Variables in the coupler that are **NOT** used in MOM6 (i.e., no corresponding field in fluxes):
-!! x2o_Si_ifrac, fractional ice wrt ocean
-!! x2o_So_duu10n, 10m wind speed squared (m^2/s^2)
 !! x2o_Sa_co2prog, bottom atm level prognostic CO2
 !! x2o_Sa_co2diag, bottom atm level diagnostic CO2
 !!
@@ -847,6 +845,8 @@ subroutine IOB_allocate(IOB, isc, iec, jsc, jec)
              IOB% calving (isc:iec,jsc:jec),         &
              IOB% runoff_hflx (isc:iec,jsc:jec),     &
              IOB% calving_hflx (isc:iec,jsc:jec),    &
+             IOB% ice_fraction (isc:iec,jsc:jec),    &
+             IOB% u10_sqr (isc:iec,jsc:jec),         &
              IOB% mi (isc:iec,jsc:jec),              &
              IOB% p (isc:iec,jsc:jec))
 
@@ -872,6 +872,8 @@ subroutine IOB_allocate(IOB, isc, iec, jsc, jec)
   IOB%calving          = 0.0
   IOB%runoff_hflx      = 0.0
   IOB%calving_hflx     = 0.0
+  IOB%ice_fraction     = 0.0
+  IOB%u10_sqr          = 0.0
   IOB%mi               = 0.0
   IOB%p                = 0.0
 

src/core/MOM_forcing_type.F90

@@ -167,6 +167,10 @@ module MOM_forcing_type
   real, pointer, dimension(:,:) :: iceshelf_melt => NULL() !< Ice shelf melt rate (positive)
                                  !! or freezing (negative) [R Z T-1 ~> kg m-2 s-1]
 
+  ! forcing fields brought in for MARBL
+  real, pointer, dimension(:,:) :: ice_fraction => NULL() !< Fraction of ocean cell under seaice [m2 m-2]
+  real, pointer, dimension(:,:) :: u10_sqr => NULL() !< 10m wind speed squared [L2 T-2 ~> m2 s-2]
+
   ! Scalars set by surface forcing modules
   real :: vPrecGlobalAdj = 0.     !< adjustment to restoring vprec to zero out global net [kg m-2 s-1]
   real :: saltFluxGlobalAdj = 0.  !< adjustment to restoring salt flux to zero out global net [kgSalt m-2 s-1]

src/parameterizations/MARBL

@@ -0,0 +1 @@
+../../pkg/MARBL/src/