Skip to content

Commit

Permalink
(*)Set mca_step(:,:,1) from misp_sum(:,:)
Browse files Browse the repository at this point in the history
  Set the initial value of mca_step in SIS_dynamics_trans from misp_sum.  These
are mathematically equivalent, but had been created using sums in different
orders, so answers can change at the level of roundoff when MERGED_CONTINUITY is
true.  The subroutine cell_mass_from_CAS is no longer being called.  The
solutions in the current MOM6_examples test cases are unaltered.
  • Loading branch information
Hallberg-NOAA committed Dec 15, 2018
1 parent 3b82d4f commit d8fdc91
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/SIS_dyn_trans.F90
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ module SIS_dyn_trans
use SIS_transport, only : SIS_transport_CS, adjust_ice_categories, cell_average_state_type
use SIS_transport, only : alloc_cell_average_state_type, dealloc_cell_average_state_type
use SIS_transport, only : cell_ave_state_to_ice_state, ice_state_to_cell_ave_state
use SIS_transport, only : cell_mass_from_CAS, ice_cat_transport, finish_ice_transport
use SIS_transport, only : ice_cat_transport, finish_ice_transport
use SIS_types, only : ocean_sfc_state_type, ice_ocean_flux_type, fast_ice_avg_type
use SIS_types, only : ice_state_type, IST_chksum, IST_bounds_check
use SIS_utils, only : get_avg, post_avg, ice_line !, ice_grid_chksum
Expand Down Expand Up @@ -371,13 +371,10 @@ subroutine SIS_dynamics_trans(IST, OSS, FIA, IOF, dt_slow, CS, icebergs_CS, G, I
enddo ; enddo

! Determine the whole-cell averaged mass of snow and ice.
if (.not.CS%merged_cont) CS%nts = 0
if ((CS%nts == 0) .and. (.not.CS%slab_ice)) &
call ice_state_to_cell_ave_state(IST, G, IG, CS%SIS_transport_CSp, CS%CAS)
if (CS%merged_cont .and. (CS%nts == 0)) then
CS%mca_step(:,:,:) = 0.0
call cell_mass_from_CAS(CS%CAS, G, IG, CS%mca_step(:,:,1))
call pass_var(CS%mca_step(:,:,1), G%Domain)
do j=jsd,jed ; do i=isd,ied ; CS%mca_step(i,j,1) = misp_sum(i,j) ; enddo ; enddo
endif

! Correct the wind stresses for changes in the fractional ice-coverage.
Expand Down

0 comments on commit d8fdc91

Please sign in to comment.