Changeset 4332 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90

Timestamp:

2013-12-11T15:38:42+01:00 (10 years ago)

Author:

clem

Message:

update LIM3 to fix remaining bugs. Now working in global and regional config.

File:

• branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (modified) (8 diffs)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90

@@ -32 +32 @@
    PUBLIC   lim_thd_dh   ! called by lim_thd
 
-   REAL(wp) ::   epsi20 = 1e-20   ! constant values
-   REAL(wp) ::   epsi13 = 1e-13   !
-   REAL(wp) ::   epsi16 = 1e-16   !
-   REAL(wp) ::   zzero  = 0.e0    !
-   REAL(wp) ::   zone   = 1.e0    !
+   REAL(wp) ::   epsi20 = 1.e-20   ! constant values
+   REAL(wp) ::   epsi10 = 1.e-10   !
+   REAL(wp) ::   epsi13 = 1.e-13   !
+   REAL(wp) ::   zzero  = 0._wp    !
+   REAL(wp) ::   zone   = 1._wp    !
 
    !!----------------------------------------------------------------------
@@ -125 +125 @@
       INTEGER  ::   num_iter_max, numce_dh
       REAL(wp) ::   meance_dh
+      REAL(wp) ::   zinda 
       REAL(wp), POINTER, DIMENSION(:) ::   zinnermelt
       REAL(wp), POINTER, DIMENSION(:) ::   zfbase, zdq_i
@@ -288 +289 @@
       END DO
 
-      !                     !-------------------
-      IF( con_i ) THEN      ! Conservation test
-         !                  !-------------------
+      !                                          !-------------------
+      IF( con_i .AND. jiindex_1d > 0 ) THEN      ! Conservation test
+         !                                       !-------------------
          numce_dh  = 0
          meance_dh = 0._wp
@@ -494 +495 @@
       END DO ! jk
 
-      !                     !-------------------
-      IF( con_i ) THEN      ! Conservation test
-      !                     !-------------------
+      !                                          !-------------------
+      IF( con_i .AND. jiindex_1d > 0 ) THEN      ! Conservation test
+      !                                          !-------------------
          DO ji = kideb, kiut
             IF(  ( fc_bo_i(ji) + fbif_1d(ji) + qlbbq_1d(ji) ) >= 0.e0  ) THEN
@@ -544 +545 @@
          sfx_thd_1d(ji)  = sfx_thd_1d(ji) - sm_i_b(ji) * a_i_b(ji) * zdvres * rhoic * r1_rdtice
          !                     ! excessive energy is sent to lateral ablation
-         fsup     (ji) =  rhoic * lfus * at_i_b(ji) / MAX( 1.0 - at_i_b(ji) , epsi13 ) * zdvres * r1_rdtice
+         zinda = MAX( 0._wp, SIGN( 1._wp , 1.0 - at_i_b(ji) - epsi10 ) )
+         fsup(ji) =  zinda * rhoic * lfus * at_i_b(ji) / MAX( 1.0 - at_i_b(ji) , epsi10 ) * zdvres * r1_rdtice
       END DO
 
@@ -577 +579 @@
 
          ! energy of melting of remaining snow
-         zqt_s(ji) =    ( 1. - zihg ) * zqt_s(ji) / MAX( zhni, epsi13 )
+         zinda = MAX( 0._wp, SIGN( 1._wp , zhni - epsi10 ) )
+         zqt_s(ji) =    ( 1. - zihg ) * zqt_s(ji) / MAX( zhni, epsi10 ) * zinda
          zdhnm     =  - ( 1. - zihg ) * ( 1. - zihgnew ) * zfdt_final(ji) / MAX( zqt_s(ji) , epsi13 )
          zhnfi     =  zhni + zdhnm
@@ -613 +616 @@
          ENDIF
          !
-         ! diagnostic ( bottom ice growth )
+         ! diagnostic 
          ii = MOD( npb(ji) - 1, jpi ) + 1
          ij = ( npb(ji) - 1 ) / jpi + 1
@@ -689 +692 @@
          ! clem: new salinity difference stored (to be used in limthd_ent.F90)
          IF (  num_sal == 2  ) THEN
-            i_ice_switch = 1.0 - MAX( 0.e0 , SIGN( 1.0 , - zhgnew(ji) + epsi13 ) )
+            i_ice_switch = MAX( 0._wp , SIGN( 1._wp , zhgnew(ji) - epsi10 ) )
             ! salinity dif due to snow-ice formation
-            dsm_i_si_1d(ji) = ( zsm_snowice - sm_i_b(ji) ) * dh_snowice(ji) / MAX( zhgnew(ji), epsi13 ) * i_ice_switch     
+            dsm_i_si_1d(ji) = ( zsm_snowice - sm_i_b(ji) ) * dh_snowice(ji) / MAX( zhgnew(ji), epsi10 ) * i_ice_switch     
             ! salinity dif due to bottom growth 
             IF (  fc_bo_i(ji) + fbif_1d(ji) + qlbbq_1d(ji)  < 0._wp ) THEN
-               dsm_i_se_1d(ji) = ( s_i_new(ji) - sm_i_b(ji) ) * dh_i_bott(ji) / MAX( zhgnew(ji), epsi13 ) * i_ice_switch
+               dsm_i_se_1d(ji) = ( s_i_new(ji) - sm_i_b(ji) ) * dh_i_bott(ji) / MAX( zhgnew(ji), epsi10 ) * i_ice_switch
             ENDIF
          ENDIF