Changeset 13430

Timestamp:

2020-08-24T13:02:49+02:00 (4 years ago)

Author:

techene

Message:

qco debug : consequence of the trunk bad commit #2385

File:

• NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/ICE/iceistate.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/ICE/iceistate.F90

@@ -21 +21 @@
    USE sbc_ice , ONLY : tn_ice, snwice_mass, snwice_mass_b
    USE eosbn2         ! equation of state
+# if defined key_qco
+   USE domqco         ! Variable volume
+# else
    USE domvvl         ! Variable volume
+# endif
    USE ice            ! sea-ice: variables
    USE ice1D          ! sea-ice: thermodynamics variables
@@ -427 +431 @@
          ssh(:,:,Kbb) = ssh(:,:,Kbb) - snwice_mass(:,:) * r1_rho0
          !
+#if defined key_qco
+         IF( .NOT.ln_linssh )   CALL dom_qco_zgr( Kbb, Kmm, Kaa )   ! interpolation scale factor, depth and water column
+#else
          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
+
       ENDIF