Changeset 5134 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90

Timestamp:

2015-03-09T18:27:34+01:00 (9 years ago)

Author:

clem

Message:

LIM3: changes to constrain ice thickness after advection. Ice volume and concentration are advected while ice thickness is deduced. This could result in overly high thicknesses associated with very low concentrations (in the 5th category)

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90

@@ -115 +115 @@
                DO ji = 1, jpi
                   !0 if no ice and 1 if yes
-                  rswitch = 1.0 - MAX(  0.0 , SIGN( 1.0 , - v_i(ji,jj,jl) + epsi20 )  )
+                  rswitch = MAX(  0._wp , SIGN( 1._wp , v_i(ji,jj,jl) - epsi20 )  )
                   !Energy of melting q(S,T) [J.m-3]
                   e_i(ji,jj,jk,jl) = rswitch * e_i(ji,jj,jk,jl) / MAX( v_i(ji,jj,jl) , epsi20 ) * REAL( nlay_i )
@@ -125 +125 @@
                DO ji = 1, jpi
                   !0 if no ice and 1 if yes
-                  rswitch = 1.0 - MAX(  0.0 , SIGN( 1.0 , - v_s(ji,jj,jl) + epsi20 )  )
+                  rswitch = MAX(  0._wp , SIGN( 1._wp , v_s(ji,jj,jl) - epsi20 )  )
                   !Energy of melting q(S,T) [J.m-3]
                   e_s(ji,jj,jk,jl) = rswitch * e_s(ji,jj,jk,jl) / MAX( v_s(ji,jj,jl) , epsi20 ) * REAL( nlay_s )
@@ -158 +158 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            rswitch  = tmask(ji,jj,1) * ( 1._wp - MAX( 0._wp , SIGN( 1._wp , - at_i(ji,jj) + epsi10 ) ) ) ! 0 if no ice
+            rswitch  = tmask(ji,jj,1) * MAX( 0._wp , SIGN( 1._wp , at_i(ji,jj) - epsi10 ) ) ! 0 if no ice
             !
             !           !  solar irradiance transmission at the mixed layer bottom and used in the lead heat budget
@@ -360 +360 @@
       CALL lim_var_eqv2glo
 
+      CALL lim_var_zapsmall
       !--------------------------------------------
       ! Diagnostic thermodynamic growth rates
@@ -413 +414 @@
 
       IF( ln_limdiahsb ) CALL lim_cons_hsm(1, 'limitd_th_rem', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
-      IF( ln_limdiahsb ) CALL lim_cons_hsm(0, 'limthd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
       !------------------------------------------------------------------------------|
       !  7) Add frazil ice growing in leads.
       !------------------------------------------------------------------------------|
+      IF( ln_limdiahsb ) CALL lim_cons_hsm(0, 'limthd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
       CALL lim_thd_lac
       CALL lim_var_glo2eqv    ! only for info
@@ -513 +514 @@
             a_i_1d(ji)  = MAX( 0._wp, a_i_1d(ji) + zda_mel ) 
             ! adjust thickness
-            rswitch     = 1._wp - MAX( 0._wp , SIGN( 1._wp , - a_i_1d(ji) + epsi20 ) )
+            rswitch     = MAX( 0._wp , SIGN( 1._wp , a_i_1d(ji) - epsi20 ) )
             ht_i_1d(ji) = rswitch * zv / MAX( a_i_1d(ji), epsi20 )
             ! retrieve total concentration