Merge remote-tracking branch 'alex/iOM4_with_bergs' into iOM4p4_branch

MJHarrison-GFDL · Feb 14, 2024 · dabd2d4 · dabd2d4
2 parents b5684bf + 83ec6d7
commit dabd2d4
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/ice_shelf/MOM_ice_shelf_dynamics.F90 b/src/ice_shelf/MOM_ice_shelf_dynamics.F90
@@ -1201,12 +1201,15 @@ subroutine ice_shelf_advect(CS, ISS, G, time_step, Time, calve_ice_shelf_bergs)
     call shelf_advance_front(CS, ISS, G, ISS%hmask, uh_ice, vh_ice)
     !add mass of the partially-filled cells to calving field, which is used to initialize icebergs
     !Then, remove the partially-filled cells from the ice shelf
+    ISS%calving(:,:)=0.0
+    ISS%calving_hflx(:,:)=0.0
     do j=jsc,jec; do i=isc,iec
       if (ISS%hmask(i,j)==2) then
-        ISS%calving(i,j) = ISS%h_shelf(i,j) * ISS%area_shelf_h(i,j) * &
-                           CS%density_ice / (G%areaT(i,j) * time_step)
-        ISS%calving_hflx(i,j) = CS%Cp_ice * ISS%h_shelf(i,j) * ISS%area_shelf_h(i,j) * &
-                                CS%density_ice * CS%t_shelf(i,j) / G%areaT(i,j)
+        ISS%calving(i,j) = (ISS%h_shelf(i,j) * CS%density_ice) * &
+                           (ISS%area_shelf_h(i,j) * G%IareaT(i,j)) / time_step
+        ISS%calving_hflx(i,j) = (CS%Cp_ice * CS%t_shelf(i,j)) * &
+                                ((ISS%h_shelf(i,j) * CS%density_ice) * &
+                                (ISS%area_shelf_h(i,j) * G%IareaT(i,j)))
         ISS%h_shelf(i,j) = 0.0; ISS%area_shelf_h(i,j) = 0.0; ISS%hmask(i,j) = 0.0
       endif
     enddo; enddo