Changeset 5991

Timestamp:

2015-12-03T12:05:25+01:00 (8 years ago)

Author:

cbricaud

Message:

correction of comments in limistate

File:

• branches/2015/dev_5974_MERCATOR10_LIMINI/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) (9 diffs)

branches/2015/dev_5974_MERCATOR10_LIMINI/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -50 +50 @@
 
    INTEGER , PARAMETER ::   jpfldi = 6           ! maximum number of files to read
-   INTEGER , PARAMETER ::   jp_hti = 1           ! index of thick (m)    at T-point
-   INTEGER , PARAMETER ::   jp_hts = 2           ! index of thick (m)    at T-point
+   INTEGER , PARAMETER ::   jp_hti = 1           ! index of ice thickness (m)    at T-point
+   INTEGER , PARAMETER ::   jp_hts = 2           ! index of snow thicknes (m)    at T-point
    INTEGER , PARAMETER ::   jp_ati = 3           ! index of ice fraction (%) at T-point
    INTEGER , PARAMETER ::   jp_tsu = 4           ! index of ice surface temp (K)    at T-point
@@ -101 +101 @@
       INTEGER    :: i_hemis, i_fill, jl0  
       REAL(wp)   :: ztest_1, ztest_2, ztest_3, ztest_4, ztests, zsigma, zarg, zA, zV, zA_cons, zV_cons, zconv 
+      REAL(wp), POINTER, DIMENSION(:,:)   :: zswitch    ! ice indicator
       REAL(wp), POINTER, DIMENSION(:,:)   :: zht_i_ini, zat_i_ini, zvt_i_ini            !data from namelist or nc file
       REAL(wp), POINTER, DIMENSION(:,:)   :: zts_u_ini, zht_s_ini, zsm_i_ini, ztm_i_ini !data from namelist or nc file
@@ -108 +109 @@
       CALL wrk_alloc( jpi, jpj, jpl, zh_i_ini,  za_i_ini,  zv_i_ini )
       CALL wrk_alloc( jpi, jpj,      zht_i_ini, zat_i_ini, zvt_i_ini, zts_u_ini, zht_s_ini, zsm_i_ini, ztm_i_ini )
+      CALL wrk_alloc( jpi, jpj,      zswitch )
 
       IF(lwp) WRITE(numout,*)
@@ -126 +128 @@
 
       ! basal temperature (considered at freezing point)
-      t_bo(:,:) = ( eos_fzp( sss_m(:,:) ) + rt0 ) * tmask(:,:,1) 
+      CALL eos_fzp( sss_m(:,:), t_bo(:,:) )
+      t_bo(:,:) = ( t_bo(:,:) + rt0 ) * tmask(:,:,1) 
+
 
       IF( ln_iceini ) THEN
@@ -168 +172 @@
                      zht_s_ini(ji,jj) = rn_hts_ini_n
                      zat_i_ini(ji,jj) = rn_ati_ini_n
+                     zts_u_ini(ji,jj) = rn_tmi_ini_n
                      zsm_i_ini(ji,jj) = rn_smi_ini_n
                      ztm_i_ini(ji,jj) = rn_tmi_ini_n
@@ -174 +179 @@
                      zht_s_ini(ji,jj) = rn_hts_ini_s
                      zat_i_ini(ji,jj) = rn_ati_ini_s
+                     zts_u_ini(ji,jj) = rn_tmi_ini_s
                      zsm_i_ini(ji,jj) = rn_smi_ini_s
                      ztm_i_ini(ji,jj) = rn_tmi_ini_s
@@ -200 +206 @@
 
                   ztest_1 = 0 ; ztest_2 = 0 ; ztest_3 = 0 ; ztest_4 = 0
-                  ztests  = 0 
+!                  ztests  = 0 
 
                   DO i_fill = jpl, 1, -1
 
-                     IF( ztests .NE. 4 ) THEN
+!                     IF( ztests .NE. 4 ) THEN
+                     IF ( ( ztest_1 + ztest_2 + ztest_3 + ztest_4 ) .NE. 4 ) THEN
                         !----------------------------
                         ! fill the i_fill categories
@@ -295 +302 @@
                            IF(lwp) WRITE(numout,*) ' * TEST 3 THICKNESS OF THE LAST CATEGORY OUT OF BOUNDS *** zh_i_ini(ji,jj,i_fill) = ', &
                            zh_i_ini(ji,jj,i_fill), ' hi_max(jpl-1) = ', hi_max(i_fill-1)
+                           IF(lwp) WRITE(numout,*) ' ji,jj,i_fill ',ji,jj,i_fill
+                           IF(lwp) WRITE(numout,*) 'zht_i_ini ',zht_i_ini(ji,jj)
                            ztest_3 = 0
                         ENDIF
@@ -485 +494 @@
       CALL wrk_dealloc( jpi, jpj, jpl, zh_i_ini,  za_i_ini,  zv_i_ini )
       CALL wrk_dealloc( jpi, jpj,      zht_i_ini, zat_i_ini, zvt_i_ini, zts_u_ini, zht_s_ini, zsm_i_ini, ztm_i_ini )
+      CALL wrk_dealloc( jpi, jpj,      zswitch )
 
    END SUBROUTINE lim_istate