Changeset 15574 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/ISF/isfhdiv.F90

Timestamp:

2021-12-03T20:32:50+01:00 (3 years ago)

Author:

techene

Message:

#2605 #2715 trunk merged into dev_r14318_RK3_stage1

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1

Files:

• . (modified) (1 prop)
• src/OCE/ISF/isfhdiv.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/ISF/isfhdiv.F90

@@ -52 +52 @@
          IF ( ln_isfpar_mlt ) CALL isf_hdiv_mlt(misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, fwfisf_par, fwfisf_par_b, phdiv)
          !
-         ! ice sheet coupling contribution 
+         ! ice sheet coupling contribution
          IF ( ln_isfcpl .AND. kt /= 0 ) THEN
             !
@@ -91 +91 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       INTEGER  ::   ikt, ikb 
-      REAL(wp), DIMENSION(jpi,jpj) :: zhdiv
+      REAL(wp), DIMENSION(A2D(nn_hls)) :: zhdiv
       !!----------------------------------------------------------------------
       !
@@ -97 +97 @@
       !
       ! compute integrated divergence correction
-      zhdiv(:,:) = 0.5_wp * ( pfwf(:,:) + pfwf_b(:,:) ) * r1_rho0 / phtbl(:,:)
+      DO_2D( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
+         zhdiv(ji,jj) = 0.5_wp * ( pfwf(ji,jj) + pfwf_b(ji,jj) ) * r1_rho0 / phtbl(ji,jj)
+      END_2D
       !
       ! update divergence at each level affected by ice shelf top boundary layer
-      DO_2D( 1, 1, 1, 1 )
+      DO_2D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
          ikt = ktop(ji,jj)
          ikb = kbot(ji,jj)
          ! level fully include in the ice shelf boundary layer
          DO jk = ikt, ikb - 1
-            phdiv(ji,jj,jk) = phdiv(ji,jj,jk) + zhdiv(ji,jj)
+            phdiv(ji,jj,jk) = phdiv(ji,jj,jk) - zhdiv(ji,jj)
          END DO
          ! level partially include in ice shelf boundary layer 
-         phdiv(ji,jj,ikb) = phdiv(ji,jj,ikb) + zhdiv(ji,jj) * pfrac(ji,jj)
+         phdiv(ji,jj,ikb) = phdiv(ji,jj,ikb) - zhdiv(ji,jj) * pfrac(ji,jj)
       END_2D
       !
@@ -131 +133 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in   ) :: pqvol
       !!----------------------------------------------------------------------
-      INTEGER :: jk
+      INTEGER :: ji, jj, jk
       !!----------------------------------------------------------------------
       !
-      DO jk=1,jpk 
-         phdiv(:,:,jk) =  phdiv(:,:,jk) + pqvol(:,:,jk) * r1_e1e2t(:,:)   &
-            &                             / e3t(:,:,jk,Kmm)
-      END DO
+      DO_3D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls, 1, jpk )
+         phdiv(ji,jj,jk) =  phdiv(ji,jj,jk) + pqvol(ji,jj,jk) * r1_e1e2t(ji,jj)   &
+            &                             / e3t(ji,jj,jk,Kmm)
+      END_3D
       !
    END SUBROUTINE isf_hdiv_cpl

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+