Changeset 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/ICE/icecor.F90

Timestamp:

2021-11-28T18:59:49+01:00 (3 years ago)

Author:

gsamson

Message:

update branch to the head of the trunk (r15547); ticket #2632

Location:

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

Files:

• . (modified) (1 prop)
• src/ICE/icecor.F90 (modified) (4 diffs)

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

@@ -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/ticket2632_r14588_theta_sbcblk/src/ICE/icecor.F90

@@ -53 +53 @@
       INTEGER, INTENT(in) ::   kn    ! 1 = after dyn ; 2 = after thermo
       !
-      INTEGER  ::   ji, jj, jk, jl   ! dummy loop indices
+      INTEGER  ::   ji, jj, jl       ! dummy loop indices
       REAL(wp) ::   zsal, zzc
       !!----------------------------------------------------------------------
@@ -91 +91 @@
          zzc = rhoi * r1_Dt_ice
          DO jl = 1, jpl
-            DO_2D( 1, 1, 1, 1 )
+            DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
                zsal = sv_i(ji,jj,jl)
                sv_i(ji,jj,jl) = MIN(  MAX( rn_simin*v_i(ji,jj,jl) , sv_i(ji,jj,jl) ) , rn_simax*v_i(ji,jj,jl)  )
@@ -99 +99 @@
          END DO
       ENDIF
-
+      !
       IF( kn /= 0 ) THEN   ! no zapsmall if kn=0 (for bdy for instance) because we do not want ice-ocean exchanges (wfx,sfx,hfx)
          !                                                              otherwise conservation diags will fail
@@ -105 +105 @@
          CALL ice_var_zapsmall      !  Zap small values                                  !
          !                          !-----------------------------------------------------
-      ENDIF
-      !                             !-----------------------------------------------------
-      IF( kn == 2 ) THEN            !  Ice drift case: Corrections to avoid wrong values !
-         DO_2D( 0, 0, 0, 0 )        !-----------------------------------------------------
-            IF ( at_i(ji,jj) == 0._wp ) THEN    ! what to do if there is no ice
-               IF ( at_i(ji+1,jj) == 0._wp )   u_ice(ji  ,jj) = 0._wp   ! right side
-               IF ( at_i(ji-1,jj) == 0._wp )   u_ice(ji-1,jj) = 0._wp   ! left side
-               IF ( at_i(ji,jj+1) == 0._wp )   v_ice(ji,jj  ) = 0._wp   ! upper side
-               IF ( at_i(ji,jj-1) == 0._wp )   v_ice(ji,jj-1) = 0._wp   ! bottom side
-            ENDIF
-         END_2D
-         CALL lbc_lnk( 'icecor', u_ice, 'U', -1.0_wp, v_ice, 'V', -1.0_wp )
       ENDIF
       !

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