Changeset 15070

Timestamp:

2021-07-02T14:02:38+02:00 (3 years ago)

Author:

clem

Message:

make ice option nn_icesal=3 reproducible

File:

• NEMO/trunk/src/ICE/icevar.F90 (modified) (4 diffs)

NEMO/trunk/src/ICE/icevar.F90

@@ -341 +341 @@
       !!-------------------------------------------------------------------
       INTEGER  ::   ji, jj, jk, jl   ! dummy loop index
-      REAL(wp) ::   zsal, z1_dS
-      REAL(wp) ::   zargtemp , zs0, zs
+      REAL(wp) ::   z1_dS
+      REAL(wp) ::   ztmp1, ztmp2, zs0, zs
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   z_slope_s, zalpha    ! case 2 only
       REAL(wp), PARAMETER :: zsi0 = 3.5_wp
@@ -409 +409 @@
          DO jl = 1, jpl
             DO jk = 1, nlay_i
-               zargtemp  = ( REAL(jk,wp) - 0.5_wp ) * r1_nlay_i
-               sz_i(:,:,jk,jl) =  1.6_wp * (  1._wp - COS( rpi * zargtemp**(0.407_wp/(0.573_wp+zargtemp)) )  )
+               ztmp1 = ( REAL(jk,wp) - 0.5_wp ) * r1_nlay_i
+               ztmp2 = 1.6_wp * (  1._wp - COS( rpi * ztmp1**(0.407_wp/(0.573_wp+ztmp1)) ) )
+               DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+                  sz_i(ji,jj,jk,jl) =  ztmp2
+               END_2D
             END DO
          END DO
@@ -427 +430 @@
       !!-------------------------------------------------------------------
       INTEGER  ::   ji, jk    ! dummy loop indices
-      REAL(wp) ::   zargtemp, zsal, z1_dS   ! local scalars
+      REAL(wp) ::   ztmp1, ztmp2, z1_dS   ! local scalars
       REAL(wp) ::   zs, zs0              !   -      -
       !
@@ -480 +483 @@
 !!gm cf remark in ice_var_salprof routine, CASE( 3 )
          DO jk = 1, nlay_i
-            zargtemp  = ( REAL(jk,wp) - 0.5_wp ) * r1_nlay_i
-            zsal =  1.6_wp * ( 1._wp - COS( rpi * zargtemp**( 0.407_wp / ( 0.573_wp + zargtemp ) ) ) )
+            ztmp1  = ( REAL(jk,wp) - 0.5_wp ) * r1_nlay_i
+            ztmp2 =  1.6_wp * ( 1._wp - COS( rpi * ztmp1**( 0.407_wp / ( 0.573_wp + ztmp1 ) ) ) )
             DO ji = 1, npti
-               sz_i_1d(ji,jk) = zsal
+               sz_i_1d(ji,jk) = ztmp2
             END DO
          END DO