Changeset 4332 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.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_lac.F90 (modified) (5 diffs)

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

@@ -36 +36 @@
    PUBLIC lim_thd_lac     ! called by lim_thd
 
-   REAL(wp) ::   epsi20 = 1e-20_wp   ! constant values
-   REAL(wp) ::   epsi13 = 1e-13_wp   !
-   REAL(wp) ::   epsi11 = 1e-11_wp   !
-   REAL(wp) ::   epsi10 = 1e-10_wp   !
-   REAL(wp) ::   epsi06 = 1e-06_wp   !
-   REAL(wp) ::   epsi03 = 1e-03_wp   !
+   REAL(wp) ::   epsi10 = 1.e-10_wp   !
    REAL(wp) ::   zzero  = 0._wp      !
    REAL(wp) ::   zone   = 1._wp      !
@@ -160 +155 @@
                   !Energy of melting q(S,T) [J.m-3]
                   e_i(ji,jj,jk,jl) = e_i(ji,jj,jk,jl) / MAX( area(ji,jj) * v_i(ji,jj,jl) ,  epsi10 ) * REAL( nlay_i )
-                  zindb = 1._wp - MAX(  0._wp , SIGN( 1._wp , -v_i(ji,jj,jl) )  )   !0 if no ice and 1 if yes
+                  zindb = 1._wp - MAX(  0._wp , SIGN( 1._wp , -v_i(ji,jj,jl) + epsi10 )  )   !0 if no ice and 1 if yes
                   e_i(ji,jj,jk,jl) = e_i(ji,jj,jk,jl) * unit_fac * zindb
                END DO
@@ -286 +281 @@
                nbpac = nbpac + 1
                npac( nbpac ) = (jj - 1) * jpi + ji
-               IF( ji == jiindx .AND. jj == jjindx )   jiindex_1d = nbpac
             ENDIF
          END DO
       END DO
 
-      IF( ln_nicep )   WRITE(numout,*) 'lim_thd_lac : nbpac = ', nbpac
+      ! debug point to follow
+      jiindex_1d = 0
+      IF( ln_nicep ) THEN
+         DO ji = mi0(jiindx), mi1(jiindx)
+            DO jj = mj0(jjindx), mj1(jjindx)
+               IF ( tms(ji,jj) * ( qcmif(ji,jj) - qldif(ji,jj) )  >  0._wp ) THEN
+                  jiindex_1d = (jj - 1) * jpi + ji
+               ENDIF
+            END DO
+         END DO
+      ENDIF
+   
+      IF( ln_nicep ) WRITE(numout,*) 'lim_thd_lac : nbpac = ', nbpac
 
       !------------------------------
@@ -499 +505 @@
          END DO
 
-         IF( ln_nicep ) WRITE(numout,*) ' zv_i_ac : ', zv_i_ac(jiindx, 1:jpl)
+         IF( ln_nicep .AND. jiindex_1d > 0 ) WRITE(numout,*) ' zv_i_ac : ', zv_i_ac(jiindex_1d, 1:jpl)
          DO jl = ice_cat_bounds(jm,1), ice_cat_bounds(jm,2)
             DO ji = 1, nbpac
                zindb = MAX( 0._wp, SIGN( 1._wp , zdv_res(ji) ) )
-               zinda = MAX( 0._wp, SIGN( 1._wp , zat_i_lev(ji) - epsi06 ) )  ! clem
-               zv_i_ac(ji,jl) = zv_i_ac(ji,jl) + zindb * zinda * zdv_res(ji) * za_i_ac(ji,jl) / MAX( zat_i_lev(ji) , epsi06 )
-            END DO
-         END DO
-         IF( ln_nicep )   WRITE(numout,*) ' zv_i_ac : ', zv_i_ac(jiindx, 1:jpl)
+               zinda = MAX( 0._wp, SIGN( 1._wp , zat_i_lev(ji) - epsi10 ) )  ! clem
+               zv_i_ac(ji,jl) = zv_i_ac(ji,jl) + zindb * zinda * zdv_res(ji) * za_i_ac(ji,jl) / MAX( zat_i_lev(ji) , epsi10 )
+            END DO
+         END DO
+         IF( ln_nicep .AND. jiindex_1d > 0 )   WRITE(numout,*) ' zv_i_ac : ', zv_i_ac(jiindex_1d, 1:jpl)
 
          !---------------------------------
@@ -649 +655 @@
          !     CALL lim_cons_check (et_s_init, et_s_final, 1.0e-3, fieldid) 
          IF( ln_nicep ) THEN
-            WRITE(numout,*) ' vt_i_init : ', vt_i_init(jiindx,jjindx)
-            WRITE(numout,*) ' vt_i_final: ', vt_i_final(jiindx,jjindx)
-            WRITE(numout,*) ' et_i_init : ', et_i_init(jiindx,jjindx)
-            WRITE(numout,*) ' et_i_final: ', et_i_final(jiindx,jjindx)
+            DO ji = mi0(jiindx), mi1(jiindx)
+               DO jj = mj0(jjindx), mj1(jjindx)
+                  WRITE(numout,*) ' vt_i_init : ', vt_i_init (ji,jj)
+                  WRITE(numout,*) ' vt_i_final: ', vt_i_final(ji,jj)
+                  WRITE(numout,*) ' et_i_init : ', et_i_init (ji,jj)
+                  WRITE(numout,*) ' et_i_final: ', et_i_final(ji,jj)
+               END DO
+            END DO
          ENDIF
          !