Changeset 4161 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90

Timestamp:

2013-11-07T11:01:27+01:00 (10 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2013 : merge in the 3rd dev branch dev_r4028_CNRS_LIM3, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 (modified) (6 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90

@@ -33 +33 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/LIM3 3.4 , UCL - NEMO Consortium (2011)
+   !! NEMO/LIM3 4.0 , UCL - NEMO Consortium (2011)
    !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -82 +82 @@
          DO ji = kideb, kiut
             zhiold(ji) = ht_i_b(ji) - dh_i_bott(ji) - dh_snowice(ji) - dh_i_surf(ji)
+            zsiold(ji) = sm_i_b(ji)
          END DO
 
@@ -90 +91 @@
          DO jk = 1, nlay_i
             DO ji = kideb, kiut
-               ze_init(ji) = ze_init(ji) + q_i_b(ji,jk) * ht_i_b(ji) / nlay_i
+               ze_init(ji) = ze_init(ji) + q_i_b(ji,jk) * ht_i_b(ji) / REAL (nlay_i )
             END DO
          END DO
@@ -117 +118 @@
             ! only drainage terms ( gravity drainage and flushing )
             ! snow ice / bottom sources are added in lim_thd_ent to conserve energy
-            zsiold(ji) = sm_i_b(ji)
             sm_i_b(ji) = sm_i_b(ji) + dsm_i_fl_1d(ji) + dsm_i_gd_1d(ji)
 
@@ -123 +123 @@
             i_ice_switch = 1._wp - MAX ( 0._wp, SIGN( 1._wp , - ht_i_b(ji) ) )
             sm_i_b(ji)   = i_ice_switch * sm_i_b(ji) + s_i_min * ( 1._wp - i_ice_switch )
-         END DO ! ji
-
-         CALL lim_var_salprof1d( kideb, kiut )         ! Salinity profile
-
-
-         !----------------------------
-         ! Heat flux - brine drainage
-         !----------------------------
-
-         DO ji = kideb, kiut
-!!gm useless
-            ! iflush  : 1 if summer 
-            iflush  =  MAX( 0._wp , SIGN( 1._wp , t_su_b(ji) - rtt        )  ) 
-            ! igravdr : 1 if t_su lt t_bo
-            igravdr =  MAX( 0._wp , SIGN( 1._wp , t_bo_b(ji) - t_su_b(ji) )  ) 
-            ! iaccrbo : 1 if bottom accretion
-            iaccrbo =  MAX( 0._wp , SIGN( 1._wp , dh_i_bott(ji)           )  )
-!!gm end useless
-            !
+
+            !----------------------------
+            ! Heat flux - brine drainage
+            !----------------------------
             fhbri_1d(ji) = 0._wp
-         END DO ! ji
-
-         !----------------------------
-         ! Salt flux - brine drainage
-         !----------------------------
-         DO ji = kideb, kiut
-            i_ice_switch = 1._wp - MAX(  0._wp, SIGN( 1._wp , - ht_i_b(ji) )  )
-            sfx_bri_1d(ji) = sfx_bri_1d(ji) - i_ice_switch * rhoic * a_i_b(ji) * ht_i_b(ji)         &
-               &           * ( MAX( dsm_i_gd_1d(ji) + dsm_i_fl_1d(ji) , sm_i_b(ji) - zsiold(ji) ) ) * r1_rdtice
-         END DO
+
+            !----------------------------
+            ! Salt flux - brine drainage
+            !----------------------------
+            sfx_bri_1d(ji) = sfx_bri_1d(ji) - i_ice_switch * rhoic * a_i_b(ji) * ht_i_b(ji) * ( sm_i_b(ji) - zsiold(ji) ) * r1_rdtice
+
+         END DO
+
+         ! Salinity profile
+         CALL lim_var_salprof1d( kideb, kiut )
+
 
          ! Only necessary for conservation check since salinity is modified
@@ -178 +164 @@
       IF(  num_sal == 3  )   CALL lim_var_salprof1d( kideb, kiut )
 
-
-      !------------------------------------------------------------------------------|
-      ! 5) Computation of salt flux due to Bottom growth
-      !------------------------------------------------------------------------------|
-      ! note: s_i_new = bulk_sal in constant salinity case
-      DO ji = kideb, kiut
-         sfx_thd_1d(ji) = sfx_thd_1d(ji) - s_i_new(ji) * rhoic * a_i_b(ji) * MAX( dh_i_bott(ji) , 0._wp ) * r1_rdtice
-      END DO
       !
       CALL wrk_dealloc( jpij, ze_init, zhiold, zsiold )