Skip to content

Commit

Permalink
Remove unnecessary and problematic initialization steps
Browse files Browse the repository at this point in the history
  • Loading branch information
MJHarrison-GFDL committed Dec 21, 2023
1 parent 249aade commit 43c3824
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions config_src/drivers/FMS_cap/ocean_model_MOM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -558,13 +558,15 @@ subroutine update_ocean_model(Ice_ocean_boundary, OS, Ocean_sfc, time_start_upda
call convert_IOB_to_fluxes(Ice_ocean_boundary, OS%flux_tmp, index_bnds, OS%Time, dt_coupling, &
OS%grid, OS%US, OS%forcing_CSp, OS%sfc_state)

if (OS%use_ice_shelf) &
call shelf_calc_flux(OS%sfc_state, OS%flux_tmp, OS%Time,dt_coupling, OS%Ice_shelf_CSp)
if (OS%icebergs_alter_ocean) &
call iceberg_fluxes(OS%grid, OS%US, OS%flux_tmp, OS%use_ice_shelf, &
OS%sfc_state, dt_coupling, OS%marine_ice_CSp)

call fluxes_accumulate(OS%flux_tmp, OS%fluxes, OS%grid, weight)
!THIS CODE DOES NOT WORK - MJH
!if (OS%use_ice_shelf) &
! call shelf_calc_flux(OS%sfc_state, OS%flux_tmp, OS%Time,dt_coupling, OS%Ice_shelf_CSp)
!if (OS%icebergs_alter_ocean) &
! call iceberg_fluxes(OS%grid, OS%US, OS%flux_tmp, OS%use_ice_shelf, &
! OS%sfc_state, dt_coupling, OS%marine_ice_CSp)

!call fluxes_accumulate(OS%flux_tmp, OS%fluxes, OS%grid, weight)
!END BAD BLOCK - MJH
#ifdef _USE_GENERIC_TRACER
! Incorporate the current tracer fluxes into the running averages
call MOM_generic_tracer_fluxes_accumulate(OS%flux_tmp, weight)
Expand Down

0 comments on commit 43c3824

Please sign in to comment.