Changeset 5167 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90

Timestamp:

2015-03-24T18:35:00+01:00 (9 years ago)

Author:

clem

Message:

LIM3 bug fix. see ticket #1492 (forthcoming update) which also solve ticket #1497

File:

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

trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90

@@ -72 +72 @@
       ! Constrain the thickness of the smallest category above himin
       !----------------------------------------------------------------------
-      CALL lim_var_glo2eqv
       DO jj = 1, jpj 
          DO ji = 1, jpi
+            rswitch = MAX( 0._wp , SIGN( 1._wp, a_i(ji,jj,1) - epsi20 ) )   !0 if no ice and 1 if yes
+            ht_i(ji,jj,1) = v_i (ji,jj,1) / MAX( a_i(ji,jj,1) , epsi20 ) * rswitch
             IF( v_i(ji,jj,1) > 0._wp .AND. ht_i(ji,jj,1) < rn_himin ) THEN
                a_i (ji,jj,1) = a_i(ji,jj,1) * ht_i(ji,jj,1) / rn_himin
@@ -98 +99 @@
          END DO
       END DO
-
-      !----------------------------------------------------
-      ! Rebin categories with thickness out of bounds
-      !----------------------------------------------------
-      IF ( jpl > 1 ) CALL lim_itd_th_reb( 1, jpl )
-
-      !-----------------
-      ! zap small values
-      !-----------------
-      CALL lim_var_zapsmall
 
       !---------------------
@@ -117 +108 @@
                DO ji = 1, jpi
                   zsal            = smv_i(ji,jj,jl)
-                  smv_i(ji,jj,jl) = sm_i(ji,jj,jl) * v_i(ji,jj,jl)
                   ! salinity stays in bounds
                   rswitch         = 1._wp - MAX( 0._wp, SIGN( 1._wp, - v_i(ji,jj,jl) ) )
@@ -127 +117 @@
          END DO
       ENDIF
+
+      !----------------------------------------------------
+      ! Rebin categories with thickness out of bounds
+      !----------------------------------------------------
+      IF ( jpl > 1 ) CALL lim_itd_th_reb( 1, jpl )
+
+      !-----------------
+      ! zap small values
+      !-----------------
+      CALL lim_var_zapsmall
 
       !------------------------------------------------------------------------------
@@ -150 +150 @@
       v_ice(:,:) = v_ice(:,:) * vmask(:,:,1)
  
-      ! for outputs
-      CALL lim_var_glo2eqv            ! equivalent variables (outputs)
-      CALL lim_var_agg(2)             ! aggregate ice thickness categories
-
-      ! conservation test
-      IF( ln_limdiahsb ) CALL lim_cons_hsm(0, 'limupdate2', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
-
       ! -------------------------------------------------
       ! Diagnostics
@@ -165 +158 @@
       afx_tot = afx_thd + afx_dyn
 
-      ! heat content variation (W.m-2)
       DO jj = 1, jpj
          DO ji = 1, jpi            
-            diag_heat_dhc(ji,jj) = diag_heat_dhc(ji,jj) -  &
-               &                   ( SUM( e_i(ji,jj,1:nlay_i,:) - e_i_b(ji,jj,1:nlay_i,:) ) +  & 
-               &                     SUM( e_s(ji,jj,1:nlay_s,:) - e_s_b(ji,jj,1:nlay_s,:) )    &
-               &                   ) * r1_rdtice   
-         END DO
-      END DO
+            ! heat content variation (W.m-2)
+            diag_heat(ji,jj) = diag_heat(ji,jj) -  &
+               &               ( SUM( e_i(ji,jj,1:nlay_i,:) - e_i_b(ji,jj,1:nlay_i,:) ) +  & 
+               &                 SUM( e_s(ji,jj,1:nlay_s,:) - e_s_b(ji,jj,1:nlay_s,:) )    &
+               &               ) * r1_rdtice   
+            ! salt, volume
+            diag_smvi(ji,jj) = diag_smvi(ji,jj) + SUM( smv_i(ji,jj,:) - smv_i_b(ji,jj,:) ) * rhoic * r1_rdtice
+            diag_vice(ji,jj) = diag_vice(ji,jj) + SUM( v_i  (ji,jj,:) - v_i_b  (ji,jj,:) ) * rhoic * r1_rdtice
+            diag_vsnw(ji,jj) = diag_vsnw(ji,jj) + SUM( v_s  (ji,jj,:) - v_s_b  (ji,jj,:) ) * rhosn * r1_rdtice
+         END DO
+      END DO
+
+      ! conservation test
+      IF( ln_limdiahsb ) CALL lim_cons_hsm(1, 'limupdate2', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
+
+      ! for outputs
+      CALL lim_var_glo2eqv
+      CALL lim_var_agg(2)
 
       ! -------------------------------------------------