Changeset 13237 for NEMO/trunk/src/ICE/iceistate.F90

Timestamp:

2020-07-03T11:12:53+02:00 (4 years ago)

Author:

smasson

Message:

trunk: Mid-year merge, merge back KERNEL-06_techene_e3

File:

• NEMO/trunk/src/ICE/iceistate.F90 (modified) (4 diffs)

NEMO/trunk/src/ICE/iceistate.F90

@@ -66 +66 @@
    INTEGER , PARAMETER ::   jp_hpd = 9           ! index of pnd depth        (m)
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   si  ! structure of input fields (file informations, fields read)
-   !   
+
    !! * Substitutions
 #  include "do_loop_substitute.h90"
@@ -108 +108 @@
       REAL(wp), DIMENSION(jpi,jpj)     ::   zt_su_ini, zht_s_ini, zsm_i_ini, ztm_i_ini !data from namelist or nc file
       REAL(wp), DIMENSION(jpi,jpj)     ::   zapnd_ini, zhpnd_ini                       !data from namelist or nc file
-      REAL(wp), DIMENSION(jpi,jpj,jpl) ::   zti_3d , zts_3d                            !temporary arrays
+      REAL(wp), DIMENSION(jpi,jpj,jpl) ::   zti_3d , zts_3d                            !locak arrays
       !!
       REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   zhi_2d, zhs_2d, zai_2d, zti_2d, zts_2d, ztsu_2d, zsi_2d, zaip_2d, zhip_2d
@@ -427 +427 @@
          ssh(:,:,Kbb) = ssh(:,:,Kbb) - snwice_mass(:,:) * r1_rho0
          !
-         IF( .NOT.ln_linssh ) THEN
-            !
-            WHERE( ht_0(:,:) > 0 )   ;   z2d(:,:) = 1._wp + ssh(:,:,Kmm)*tmask(:,:,1) / ht_0(:,:)
-            ELSEWHERE                ;   z2d(:,:) = 1._wp   ;   END WHERE
-            !
-            DO jk = 1,jpkm1                     ! adjust initial vertical scale factors                
-               e3t(:,:,jk,Kmm) = e3t_0(:,:,jk) * z2d(:,:)
-               e3t(:,:,jk,Kbb) = e3t(:,:,jk,Kmm)
-               e3t(:,:,jk,Kaa) = e3t(:,:,jk,Kmm)
-            END DO
-            !
-            ! Reconstruction of all vertical scale factors at now and before time-steps
-            ! =========================================================================
-            ! Horizontal scale factor interpolations
-            ! --------------------------------------
-            CALL dom_vvl_interpol( e3t(:,:,:,Kbb), e3u(:,:,:,Kbb), 'U' )
-            CALL dom_vvl_interpol( e3t(:,:,:,Kbb), e3v(:,:,:,Kbb), 'V' )
-            CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3u(:,:,:,Kmm), 'U' )
-            CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3v(:,:,:,Kmm), 'V' )
-            CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3f(:,:,:), 'F' )
-            ! Vertical scale factor interpolations
-            ! ------------------------------------
-            CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3w (:,:,:,Kmm), 'W'  )
-            CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3uw(:,:,:,Kmm), 'UW' )
-            CALL dom_vvl_interpol( e3v(:,:,:,Kmm), e3vw(:,:,:,Kmm), 'VW' )
-            CALL dom_vvl_interpol( e3u(:,:,:,Kbb), e3uw(:,:,:,Kbb), 'UW' )
-            CALL dom_vvl_interpol( e3v(:,:,:,Kbb), e3vw(:,:,:,Kbb), 'VW' )
-            ! t- and w- points depth
-            ! ----------------------
-            !!gm not sure of that....
-            gdept(:,:,1,Kmm) = 0.5_wp * e3w(:,:,1,Kmm)
-            gdepw(:,:,1,Kmm) = 0.0_wp
-            gde3w(:,:,1) = gdept(:,:,1,Kmm) - ssh(:,:,Kmm)
-            DO jk = 2, jpk
-               gdept(:,:,jk,Kmm) = gdept(:,:,jk-1,Kmm) + e3w(:,:,jk  ,Kmm)
-               gdepw(:,:,jk,Kmm) = gdepw(:,:,jk-1,Kmm) + e3t(:,:,jk-1,Kmm)
-               gde3w(:,:,jk) = gdept(:,:,jk  ,Kmm) - ssh (:,:,Kmm)
-            END DO
-         ENDIF
+         IF( .NOT.ln_linssh )   CALL dom_vvl_zgr( Kbb, Kmm, Kaa )   ! interpolation scale factor, depth and water column
+! !!st
+!          IF( .NOT.ln_linssh ) THEN
+!             !
+!             WHERE( ht_0(:,:) > 0 )   ;   z2d(:,:) = 1._wp + ssh(:,:,Kmm)*tmask(:,:,1) / ht_0(:,:)
+!             ELSEWHERE                ;   z2d(:,:) = 1._wp   ;   END WHERE
+!             !
+!             DO jk = 1,jpkm1                     ! adjust initial vertical scale factors
+!                e3t(:,:,jk,Kmm) = e3t_0(:,:,jk) * z2d(:,:)
+!                e3t(:,:,jk,Kbb) = e3t(:,:,jk,Kmm)
+!                e3t(:,:,jk,Kaa) = e3t(:,:,jk,Kmm)
+!             END DO
+!             !
+!             ! Reconstruction of all vertical scale factors at now and before time-steps
+!             ! =========================================================================
+!             ! Horizontal scale factor interpolations
+!             ! --------------------------------------
+!             CALL dom_vvl_interpol( e3t(:,:,:,Kbb), e3u(:,:,:,Kbb), 'U' )
+!             CALL dom_vvl_interpol( e3t(:,:,:,Kbb), e3v(:,:,:,Kbb), 'V' )
+!             CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3u(:,:,:,Kmm), 'U' )
+!             CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3v(:,:,:,Kmm), 'V' )
+!             CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3f(:,:,:), 'F' )
+!             ! Vertical scale factor interpolations
+!             ! ------------------------------------
+!             CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3w (:,:,:,Kmm), 'W'  )
+!             CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3uw(:,:,:,Kmm), 'UW' )
+!             CALL dom_vvl_interpol( e3v(:,:,:,Kmm), e3vw(:,:,:,Kmm), 'VW' )
+!             CALL dom_vvl_interpol( e3u(:,:,:,Kbb), e3uw(:,:,:,Kbb), 'UW' )
+!             CALL dom_vvl_interpol( e3v(:,:,:,Kbb), e3vw(:,:,:,Kbb), 'VW' )
+!             ! t- and w- points depth
+!             ! ----------------------
+!             !!gm not sure of that....
+!             gdept(:,:,1,Kmm) = 0.5_wp * e3w(:,:,1,Kmm)
+!             gdepw(:,:,1,Kmm) = 0.0_wp
+!             gde3w(:,:,1) = gdept(:,:,1,Kmm) - ssh(:,:,Kmm)
+!             DO jk = 2, jpk
+!                gdept(:,:,jk,Kmm) = gdept(:,:,jk-1,Kmm) + e3w(:,:,jk  ,Kmm)
+!                gdepw(:,:,jk,Kmm) = gdepw(:,:,jk-1,Kmm) + e3t(:,:,jk-1,Kmm)
+!                gde3w(:,:,jk) = gdept(:,:,jk  ,Kmm) - ssh (:,:,Kmm)
+!             END DO
+!          ENDIF
       ENDIF
       
@@ -503 +505 @@
       !!
       !!-----------------------------------------------------------------------------
-      INTEGER ::   ios   ! Local integer output status for namelist read
-      INTEGER ::   ifpr, ierror
+      INTEGER ::   ios, ifpr, ierror   ! Local integers
+
       !
       CHARACTER(len=256) ::  cn_dir          ! Root directory for location of ice files