Changeset 15440 for NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/ICE/icevar.F90

Timestamp:

2021-10-23T12:18:24+02:00 (3 years ago)

Author:

cetlod

Message:

dev_PISCO : merge with trunk@15439

File:

• NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/ICE/icevar.F90 (modified) (6 diffs)

NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/ICE/icevar.F90

@@ -343 +343 @@
       REAL(wp) ::   z1_dS
       REAL(wp) ::   ztmp1, ztmp2, zs0, zs
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   z_slope_s, zalpha    ! case 2 only
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   z_slope_s, zalpha    ! case 2 only
       REAL(wp), PARAMETER :: zsi0 = 3.5_wp
       REAL(wp), PARAMETER :: zsi1 = 4.5_wp
@@ -361 +361 @@
       CASE( 2 )       !  time varying salinity with linear profile  !
          !            !---------------------------------------------!
-         !
-         ALLOCATE( z_slope_s(jpi,jpj,jpl) , zalpha(jpi,jpj,jpl) )
+         z1_dS = 1._wp / ( zsi1 - zsi0 )
+         !
+         ALLOCATE( z_slope_s(jpi,jpj) , zalpha(jpi,jpj) )
          !
          DO jl = 1, jpl
-            DO jk = 1, nlay_i
-               sz_i(:,:,jk,jl)  = s_i(:,:,jl)
-            END DO
-         END DO
-         !                                      ! Slope of the linear profile
-         WHERE( h_i(:,:,:) > epsi20 )   ;   z_slope_s(:,:,:) = 2._wp * s_i(:,:,:) / h_i(:,:,:)
-         ELSEWHERE                      ;   z_slope_s(:,:,:) = 0._wp
-         END WHERE
-         !
-         z1_dS = 1._wp / ( zsi1 - zsi0 )
-         DO jl = 1, jpl
+
             DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
-               zalpha(ji,jj,jl) = MAX(  0._wp , MIN( ( zsi1 - s_i(ji,jj,jl) ) * z1_dS , 1._wp )  )
+               !                                      ! Slope of the linear profile
+               IF( h_i(ji,jj,jl) > epsi20 ) THEN
+                  z_slope_s(ji,jj) = 2._wp * s_i(ji,jj,jl) / h_i(ji,jj,jl)
+               ELSE
+                  z_slope_s(ji,jj) = 0._wp
+               ENDIF
+               !
+               zalpha(ji,jj) = MAX(  0._wp , MIN( ( zsi1 - s_i(ji,jj,jl) ) * z1_dS , 1._wp )  )
                !                             ! force a constant profile when SSS too low (Baltic Sea)
-               IF( 2._wp * s_i(ji,jj,jl) >= sss_m(ji,jj) )   zalpha(ji,jj,jl) = 0._wp
+               IF( 2._wp * s_i(ji,jj,jl) >= sss_m(ji,jj) )   zalpha(ji,jj) = 0._wp
             END_2D
-         END DO
-         !
-         ! Computation of the profile
-         DO jl = 1, jpl
+            !
+            ! Computation of the profile
             DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, nlay_i )
                !                          ! linear profile with 0 surface value
-               zs0 = z_slope_s(ji,jj,jl) * ( REAL(jk,wp) - 0.5_wp ) * h_i(ji,jj,jl) * r1_nlay_i
-               zs  = zalpha(ji,jj,jl) * zs0 + ( 1._wp - zalpha(ji,jj,jl) ) * s_i(ji,jj,jl)     ! weighting the profile
+               zs0 = z_slope_s(ji,jj) * ( REAL(jk,wp) - 0.5_wp ) * h_i(ji,jj,jl) * r1_nlay_i
+               zs  = zalpha(ji,jj) * zs0 + ( 1._wp - zalpha(ji,jj) ) * s_i(ji,jj,jl)     ! weighting the profile
                sz_i(ji,jj,jk,jl) = MIN( rn_simax, MAX( zs, rn_simin ) )
             END_3D
@@ -448 +444 @@
       CASE( 2 )       !  time varying salinity with linear profile  !
          !            !---------------------------------------------!
+         z1_dS = 1._wp / ( zsi1 - zsi0 )
          !
          ALLOCATE( z_slope_s(jpij), zalpha(jpij) )
          !
-         !                                      ! Slope of the linear profile
-         WHERE( h_i_1d(1:npti) > epsi20 )   ;   z_slope_s(1:npti) = 2._wp * s_i_1d(1:npti) / h_i_1d(1:npti)
-         ELSEWHERE                          ;   z_slope_s(1:npti) = 0._wp
-         END WHERE
-
-         z1_dS = 1._wp / ( zsi1 - zsi0 )
          DO ji = 1, npti
+            !                                      ! Slope of the linear profile
+            IF( h_i_1d(ji) > epsi20 ) THEN
+               z_slope_s(ji) = 2._wp * s_i_1d(ji) / h_i_1d(ji)
+            ELSE
+               z_slope_s(ji) = 0._wp
+            ENDIF
+            !
             zalpha(ji) = MAX(  0._wp , MIN(  ( zsi1 - s_i_1d(ji) ) * z1_dS , 1._wp  )  )
             !                             ! force a constant profile when SSS too low (Baltic Sea)
             IF( 2._wp * s_i_1d(ji) >= sss_1d(ji) )   zalpha(ji) = 0._wp
+            !
          END DO
          !
@@ -715 +714 @@
       bv_i (:,:,:) = 0._wp
       DO jl = 1, jpl
-         DO jk = 1, nlay_i
-            WHERE( t_i(:,:,jk,jl) < rt0 - epsi10 )
-               bv_i(:,:,jl) = bv_i(:,:,jl) - rTmlt * sz_i(:,:,jk,jl) * r1_nlay_i / ( t_i(:,:,jk,jl) - rt0 )
-            END WHERE
-         END DO
+         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, nlay_i )
+            IF( t_i(ji,jj,jk,jl) < rt0 - epsi10 ) THEN
+               bv_i(ji,jj,jl) = bv_i(ji,jj,jl) - rTmlt * sz_i(ji,jj,jk,jl) * r1_nlay_i / ( t_i(ji,jj,jk,jl) - rt0 )
+            ENDIF
+         END_3D
       END DO
       WHERE( vt_i(:,:) > epsi20 )   ;   bvm_i(:,:) = SUM( bv_i(:,:,:) * v_i(:,:,:) , dim=3 ) / vt_i(:,:)
@@ -782 +781 @@
       ! temporary
       REAL(wp) :: zintn, zintb                     ! time interpolation weights []
-      REAL(wp), DIMENSION(jpi,jpj) :: zsnwiceload  ! snow and ice load [m]
       !
       ! compute ice load used to define the equivalent ssh in lead
@@ -795 +793 @@
          zintb = REAL( nn_fsbc + 1 ) / REAL( nn_fsbc ) * 0.5_wp
          !
-         zsnwiceload(:,:) = ( zintn * psnwice_mass(:,:) + zintb * psnwice_mass_b(:,:) ) * r1_rho0
+         ! compute equivalent ssh in lead
+         ice_var_sshdyn(:,:) = pssh(:,:) + ( zintn * psnwice_mass(:,:) + zintb * psnwice_mass_b(:,:) ) * r1_rho0
          !
       ELSE
-         zsnwiceload(:,:) = 0.0_wp
+         ! compute equivalent ssh in lead
+         ice_var_sshdyn(:,:) = pssh(:,:)
       ENDIF
-      ! compute equivalent ssh in lead
-      ice_var_sshdyn(:,:) = pssh(:,:) + zsnwiceload(:,:)
       !
    END FUNCTION ice_var_sshdyn