Merge gfdl_cryo

Merge remote-tracking branch 'gfdl_cryo/dev/cryo' into gfdl_cryo_merge

Author: OlgaSergienko

config_src/drivers/FMS_cap/MOM_surface_forcing_gfdl.F90

@@ -204,6 +204,8 @@ module MOM_surface_forcing_gfdl
                                                             !! for divergence damping, as determined
                                                             !! outside of the ocean model [m3 s-1]
   real, pointer, dimension(:,:) :: shelf_sfc_mass_flux =>NULL() !< mass flux to surface of ice sheet [kg m-2 s-1]
+  real :: IS_adot_int_land      !< The total surface mass flux to the ice sheet from land,
+                                !! area-integrated over the land grid [kg s-1]
   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.
@@ -678,6 +680,8 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
   ! Allow for user-written code to alter fluxes after all the above
   call user_alter_forcing(sfc_state, fluxes, Time, G, CS%urf_CS)
 
+  fluxes%IS_adot_int_land = IOB%IS_adot_int_land / (US%RZL2_to_kg * US%s_to_T)
+
   call cpu_clock_end(id_clock_forcing)
 
 end subroutine convert_IOB_to_fluxes

config_src/drivers/FMS_cap/ocean_model_MOM.F90

@@ -1039,9 +1039,17 @@ subroutine Ocean_stock_pe(OS, index, value, time_index)
   select case (index)
     case (ISTOCK_WATER)  ! Return the mass of fresh water in the ocean in [kg].
       if (OS%GV%Boussinesq) then
-        call get_ocean_stocks(OS%MOM_CSp, mass=value, on_PE_only=.true.)
+        if (OS%use_ice_shelf) then
+          call get_ocean_stocks(OS%MOM_CSp, mass=value, ice_shelf_CSp=OS%ice_shelf_CSp, on_PE_only=.true.)
+        else
+          call get_ocean_stocks(OS%MOM_CSp, mass=value, on_PE_only=.true.)
+        endif
       else  ! In non-Boussinesq mode, the mass of salt needs to be subtracted.
-        call get_ocean_stocks(OS%MOM_CSp, mass=value, salt=salt, on_PE_only=.true.)
+        if (OS%use_ice_shelf) then
+          call get_ocean_stocks(OS%MOM_CSp, mass=value, salt=salt, ice_shelf_CSp=OS%ice_shelf_CSp, on_PE_only=.true.)
+        else
+          call get_ocean_stocks(OS%MOM_CSp, mass=value, salt=salt, on_PE_only=.true.)
+        endif
         value = value - salt
       endif
     case (ISTOCK_HEAT)  ! Return the heat content of the ocean in [J].

src/core/MOM.F90

@@ -171,6 +171,7 @@ module MOM
 use MOM_offline_main,          only : offline_fw_fluxes_into_ocean, offline_fw_fluxes_out_ocean
 use MOM_offline_main,          only : offline_advection_layer, offline_transport_end
 use MOM_ice_shelf,             only : ice_shelf_CS, ice_shelf_query, initialize_ice_shelf
+use MOM_ice_shelf,             only : get_ice_shelf_mass_stock
 use MOM_particles_mod,         only : particles, particles_init, particles_run, particles_save_restart, particles_end
 use MOM_particles_mod,         only : particles_to_k_space, particles_to_z_space
 implicit none ; private
@@ -4400,11 +4401,12 @@ subroutine get_MOM_state_elements(CS, G, GV, US, C_p, C_p_scaled, use_temp)
 end subroutine get_MOM_state_elements
 
 !> Find the global integrals of various quantities.
-subroutine get_ocean_stocks(CS, mass, heat, salt, on_PE_only)
+subroutine get_ocean_stocks(CS, mass, heat, salt, ice_shelf_CSp, on_PE_only)
   type(MOM_control_struct), intent(inout) :: CS !< MOM control structure
   real,    optional, intent(out) :: heat  !< The globally integrated integrated ocean heat [J].
   real,    optional, intent(out) :: salt  !< The globally integrated integrated ocean salt [kg].
   real,    optional, intent(out) :: mass  !< The globally integrated integrated ocean mass [kg].
+  type(ice_shelf_CS), optional,     pointer :: ice_shelf_CSp !< A pointer to an ice shelf control structure
   logical, optional, intent(in)  :: on_PE_only !< If present and true, only sum on the local PE.
 
   if (present(mass)) &
@@ -4415,6 +4417,9 @@ subroutine get_ocean_stocks(CS, mass, heat, salt, on_PE_only)
   if (present(salt)) &
     salt = 1.0e-3 * global_mass_integral(CS%h, CS%G, CS%GV, CS%tv%S, on_PE_only=on_PE_only, unscale=CS%US%S_to_ppt)
 
+  if (present(ice_shelf_CSp) .and. present(mass)) then !add ice shelf contribution
+      mass = mass + CS%US%RZL2_to_kg * get_ice_shelf_mass_stock(ice_shelf_CSp, CS%G, CS%US, on_PE_only)
+  endif
 end subroutine get_ocean_stocks
 
 

src/core/MOM_forcing_type.F90

@@ -212,6 +212,8 @@ module MOM_forcing_type
   real :: saltFluxGlobalScl = 0.  !< scaling of restoring salt flux to zero out global net ( -1..1 ) [nondim]
   real :: netFWGlobalScl = 0.     !< scaling of net fresh water to zero out global net ( -1..1 ) [nondim]
 
+  real :: IS_adot_int_land = 0.   !< The total surface mass flux to the ice sheet,
+                                  !! area-integrated over the land grid [R Z L2 T-1 ~> kg s-1]
   logical :: fluxes_used = .true. !< If true, all of the heat, salt, and mass
                                   !! fluxes have been applied to the ocean.
   real :: dt_buoy_accum = -1.0    !< The amount of time over which the buoyancy fluxes
@@ -3827,8 +3829,7 @@ subroutine deallocate_forcing_type(fluxes)
   if (associated(fluxes%ustar_tidal))          deallocate(fluxes%ustar_tidal)
   if (associated(fluxes%ustar_shelf))          deallocate(fluxes%ustar_shelf)
   if (associated(fluxes%iceshelf_melt))        deallocate(fluxes%iceshelf_melt)
-  if (associated(fluxes%shelf_sfc_mass_flux)) &
-                                               deallocate(fluxes%shelf_sfc_mass_flux)
+  if (associated(fluxes%shelf_sfc_mass_flux))  deallocate(fluxes%shelf_sfc_mass_flux)
   if (associated(fluxes%frac_shelf_h))         deallocate(fluxes%frac_shelf_h)
   if (associated(fluxes%ustar_berg))           deallocate(fluxes%ustar_berg)
   if (associated(fluxes%area_berg))            deallocate(fluxes%area_berg)