Merge pull request #8 from MJHarrison-GFDL/ice_dynamics

call data override init for ice shelves

config_src/drivers/solo_driver/MOM_driver.F90

@@ -26,6 +26,7 @@ program MOM_main
 
   use MOM_cpu_clock,       only : cpu_clock_id, cpu_clock_begin, cpu_clock_end
   use MOM_cpu_clock,       only : CLOCK_COMPONENT
+  use MOM_data_override,   only : data_override_init
   use MOM_diag_mediator,   only : enable_averaging, disable_averaging, diag_mediator_end
   use MOM_diag_mediator,   only : diag_ctrl, diag_mediator_close_registration
   use MOM,                 only : initialize_MOM, step_MOM, MOM_control_struct, MOM_end
@@ -302,6 +303,7 @@ program MOM_main
     ! when using an ice shelf
     call initialize_ice_shelf_fluxes(ice_shelf_CSp, grid, US, fluxes)
     call initialize_ice_shelf_forces(ice_shelf_CSp, grid, US, forces)
+    call data_override_init(Ocean_Domain_in=grid%domain%mpp_domain)
   endif
 
 

src/ice_shelf/MOM_ice_shelf.F90

@@ -323,9 +323,10 @@ subroutine shelf_calc_flux(sfc_state_in, fluxes_in, Time, time_step, CS)
   G => CS%grid ; US => CS%US
   ISS => CS%ISS
 
-  if (CS%active_shelf_dynamics) &
+  if (CS%active_shelf_dynamics) then
        call data_override(G%Domain, 'shelf_sfc_mass_flux', fluxes_in%shelf_sfc_mass_flux, CS%Time, &
                           scale=US%kg_m3_to_R*US%m_to_Z)
+  endif
 
   if (CS%rotate_index) then
     allocate(sfc_state)