Merge branch 'nemo-cmc-dragiou' into nemo-compilation

phil-blain · Sep 10, 2020 · d3d6ed5 · d3d6ed5
2 parents c2bca64 + c1390a0
commit d3d6ed5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/cicecore/cicedynB/dynamics/ice_dyn_eap.F90 b/cicecore/cicedynB/dynamics/ice_dyn_eap.F90
@@ -130,7 +130,8 @@ subroutine eap (dt)
           Tbu, hwater, &
           stressp_1, stressp_2, stressp_3, stressp_4, &
           stressm_1, stressm_2, stressm_3, stressm_4, &
-          stress12_1, stress12_2, stress12_3, stress12_4
+          stress12_1, stress12_2, stress12_3, stress12_4, &
+          dragiou
       use ice_grid, only: tmask, umask, dxt, dyt, dxhy, dyhx, cxp, cyp, cxm, cym, &
           tarear, uarear, to_ugrid, t2ugrid_vector, u2tgrid_vector
       use ice_state, only: aice, vice, vsno, uvel, vvel, divu, shear, &
@@ -541,7 +542,8 @@ subroutine eap (dt)
                strintx (:,:,iblk), strinty (:,:,iblk), &
                strairx (:,:,iblk), strairy (:,:,iblk), & 
                strocnx (:,:,iblk), strocny (:,:,iblk), & 
-               strocnxT(:,:,iblk), strocnyT(:,:,iblk))
+               strocnxT(:,:,iblk), strocnyT(:,:,iblk), &
+               dragiou (:,:,iblk))
 
       enddo
       !$OMP END PARALLEL DO

diff --git a/cicecore/cicedynB/dynamics/ice_dyn_evp.F90 b/cicecore/cicedynB/dynamics/ice_dyn_evp.F90
@@ -84,7 +84,8 @@ subroutine evp (dt)
           Tbu, hwater, &
           stressp_1, stressp_2, stressp_3, stressp_4, &
           stressm_1, stressm_2, stressm_3, stressm_4, &
-          stress12_1, stress12_2, stress12_3, stress12_4
+          stress12_1, stress12_2, stress12_3, stress12_4, &
+          dragiou
       use ice_grid, only: tmask, umask, dxt, dyt, dxhy, dyhx, cxp, cyp, cxm, cym, &
           tarear, uarear, tinyarea, to_ugrid, t2ugrid_vector, u2tgrid_vector, &
           grid_type, HTE, HTN
@@ -559,7 +560,8 @@ subroutine evp (dt)
                strintx (:,:,iblk), strinty (:,:,iblk), &
                strairx (:,:,iblk), strairy (:,:,iblk), &
                strocnx (:,:,iblk), strocny (:,:,iblk), & 
-               strocnxT(:,:,iblk), strocnyT(:,:,iblk))
+               strocnxT(:,:,iblk), strocnyT(:,:,iblk), &
+               dragiou (:,:,iblk))
 
       enddo
       !$OMP END PARALLEL DO

diff --git a/cicecore/cicedynB/dynamics/ice_dyn_shared.F90 b/cicecore/cicedynB/dynamics/ice_dyn_shared.F90
@@ -769,7 +769,8 @@ subroutine dyn_finish (nx_block, ny_block, &
                              strintx,  strinty,  &
                              strairx,  strairy,  &
                              strocnx,  strocny,  &
-                             strocnxT, strocnyT) 
+                             strocnxT, strocnyT, &
+                             dragiou)
 
       integer (kind=int_kind), intent(in) :: &
          nx_block, ny_block, & ! block dimensions
@@ -796,6 +797,7 @@ subroutine dyn_finish (nx_block, ny_block, &
          strocny     ! ice-ocean stress, y-direction
 
       real (kind=dbl_kind), dimension (nx_block,ny_block), intent(out) :: &
+         dragiou , & ! effective ice-ocean drag for implicit calculation
          strocnxT, & ! ice-ocean stress, x-direction
          strocnyT    ! ice-ocean stress, y-direction
 
@@ -819,6 +821,7 @@ subroutine dyn_finish (nx_block, ny_block, &
       do i = 1, nx_block
          strocnxT(i,j) = c0
          strocnyT(i,j) = c0
+         dragiou(i,j)  = c0
       enddo
       enddo
 
@@ -851,6 +854,9 @@ subroutine dyn_finish (nx_block, ny_block, &
          ! divide by aice for coupling
          strocnxT(i,j) = strocnx(i,j) / aiu(i,j)
          strocnyT(i,j) = strocny(i,j) / aiu(i,j)
+
+         ! compute the effective drag along cosw for use in NEMO
+         dragiou(i,j) = vrel * cosw
       enddo
 
       end subroutine dyn_finish

diff --git a/cicecore/cicedynB/general/ice_flux.F90 b/cicecore/cicedynB/general/ice_flux.F90
@@ -54,6 +54,7 @@ module ice_flux
 
        ! out to ocean          T-cell (kg/m s^2)
        ! Note, CICE_IN_NEMO uses strocnx and strocny for coupling
+         dragiou , & ! effective used drag between ice and ocean times cosw
          strocnxT, & ! ice-ocean stress, x-direction
          strocnyT    ! ice-ocean stress, y-direction