Changeset 10023 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DOM/iscplrst.F90

Timestamp:

2018-08-02T08:19:03+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.2 bug correction in dynnxt + domvvl_RK3 creation

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DOM/iscplrst.F90 (modified) (4 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DOM/iscplrst.F90

@@ -13 +13 @@
    USE oce             ! global tra/dyn variable
    USE dom_oce         ! ocean space and time domain
+   USE domvvl          !
    USE domwri          ! ocean space and time domain
    USE phycst          ! physical constants
@@ -149 +150 @@
       zwmaskn(:,:,1) = tmask   (:,:,1)
       zwmaskb(:,:,1) = ptmask_b(:,:,1)
-      DO jk = 2,jpk
+      DO jk = 2, jpk
          zwmaskn(:,:,jk) =  tmask  (:,:,jk) *  tmask  (:,:,jk-1)
          zwmaskb(:,:,jk) = ptmask_b(:,:,jk) * ptmask_b(:,:,jk-1)
@@ -179 +180 @@
       ssh(:,:,Nnn) = ssh(:,:,Nnn) * ssmask(:,:)
 
+!!gm BUGs....
+!
+!     for me ht_0, hu_0, hv_0 and hf_0 should be recomputed whatever the value of ln_linssh
+!     further more mask at all grid-point should be recomputed
+!     and mikt, u, v, f also...
+!
+!     perhaps, not, if dom_cfg.nc file has been modified....
+!
+!     Pierre we should discuss of that !
+
+
+
+
 !=============================================================================
 !PM: Is this needed since introduction of VVL by default?
       IF ( .NOT.ln_linssh ) THEN
-      ! Reconstruction of all vertical scale factors at now time steps
-      ! ======================================================================
+         ! Reconstruction of all vertical scale factors at now time steps
+         ! ======================================================================
+
+
+         CALL ctl_stop( 'iscplrst : gm: here there is a BUG: not all required fields are defined')
+
+         !
+         !                          !* NOW fields : 
+         CALL ssh2e3_now                  ! set: ht , hu , hv , r1_hu, r1_hv
+         !                                !      e3t, e3u , e3v, e3f         (from 1 to jpkm1)
+         !                                !      e3w, e3uw, e3vw             (from 1 to jpk  )
+         !                                !      gdept, gdepw, gde3w         (from 1 to jpk  )
+         !
+
+
       
 !!gm Question : bug ????
@@ -193 +220 @@
       ! Note that the former calculation were using ht_0  so if it as not been updated ===>>> BUG
 !!gm
-      
-      
-      ! Horizontal scale factor interpolations
-      ! --------------------------------------
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               IF ( tmask(ji,jj,1) == 0._wp .OR. ptmask_b(ji,jj,1) == 0._wp ) THEN
-                  DO jk = 1, jpk
-                     e3t_n(ji,jj,jk) = e3t_0(ji,jj,jk) * ( 1._wp + ssh(ji,jj,Nnn) * r1_ht_0(ji,jj) * tmask(ji,jj,jk) )
-                  END DO
-               ENDIF
-            END DO
-         END DO
-         !
-!!gm  Note that if this routine is called in dom_vvl_init then all the lines below are uselss !!!
-!!        they are a duplication of dom_vvl_init lines
-
-         !                                   !==  now fields  ==!
-         !
-         !                                            !* ssh at u- and v-points)
-         DO jj = 1, jpjm1   ;   DO ji = 1, jpim1            ! start from 1 due to f-point
-            zsshu(ji,jj) = 0.5_wp  * ( ssh(ji  ,jj,Nnn) + ssh(ji+1,jj  ,Nnn) ) * ssumask(ji,jj)
-            zsshv(ji,jj) = 0.5_wp  * ( ssh(ji  ,jj,Nnn) + ssh(ji  ,jj+1,Nnn) ) * ssvmask(ji,jj)
-            zsshf(ji,jj) = 0.25_wp * ( ssh(ji  ,jj,Nnn) + ssh(ji  ,jj+1,Nnn)   & 
-               &                     + ssh(ji+1,jj,Nnn) + ssh(ji+1,jj+1,Nnn) ) * ssfmask(ji,jj)
-         END DO             ;   END DO      
-         CALL lbc_lnk_multi( zsshu(:,:),'U', 1._wp , zsshu(:,:),'V', 1._wp , zsshf(:,:),'F', 1._wp )
-         !
-         !                                            !* hu and hv (and their inverse) 
-         ht_n   (:,:) = ht_0(:,:) +  ssh (:,:,Nnn)
-         hu_n   (:,:) = hu_0(:,:) + zsshu(:,:)
-         hv_n   (:,:) = hv_0(:,:) + zsshv(:,:)
-         r1_hu_n(:,:) = ssumask(:,:) / ( hu_n(:,:) + 1._wp - ssumask(:,:) )    ! ss mask mask due to ISF
-         r1_hv_n(:,:) = ssvmask(:,:) / ( hv_n(:,:) + 1._wp - ssvmask(:,:) )
-         !
-         !                                            !* e3u, e3uw  and  e3v, e3vw
-         z_ssh_h0(:,:) = ssh(:,:,Nnn) * r1_ht_0(:,:)         ! t-point
-         DO jk = 1, jpkm1
-            e3w_n(:,:,jk) = e3w_0(:,:,jk) * ( 1._wp + z_ssh_h0(:,:) * tmask(:,:,jk) )
-         END DO
-         z_ssh_h0(:,:) = zsshu(:,:) * r1_hu_0(:,:)           ! u-point
-         DO jk = 1, jpkm1
-            e3u_n (:,:,jk) = e3u_0 (:,:,jk) * ( 1._wp + z_ssh_h0(:,:) *  umask(:,:,jk) )
-            e3uw_n(:,:,jk) = e3uw_0(:,:,jk) * ( 1._wp + z_ssh_h0(:,:) * wumask(:,:,jk) )
-         END DO
-         z_ssh_h0(:,:) = zsshv(:,:) * r1_hv_0(:,:)           ! v-point
-         DO jk = 1, jpkm1
-            e3v_n (:,:,jk) = e3v_0 (:,:,jk) * ( 1._wp + z_ssh_h0(:,:) *  vmask(:,:,jk) )
-            e3vw_n(:,:,jk) = e3vw_0(:,:,jk) * ( 1._wp + z_ssh_h0(:,:) * wvmask(:,:,jk) )
-         END DO
-         z_ssh_h0(:,:) = zsshf(:,:) * r1_hf_0(:,:)           ! f-point
-         DO jk = 1, jpkm1
-            e3f_n(:,:,jk) = e3f_0(:,:,jk) * ( 1._wp + z_ssh_h0(:,:) * fmask(:,:,jk) )
-         END DO
-
-         z_ssh_h0(:,:) = 1._wp + ssh(:,:,Nnn) * r1_ht_0(:,:)    ! t-point
-         !
-         IF( ln_isfcav ) THEN    ! iceshelf cavities : ssh scaling not applied over the iceshelf thickness 
-            DO jk = 1, jpkm1
-               gdept_n(:,:,jk) = ( gdept_0(:,:,jk) - risfdep(:,:) ) * z_ssh_h0(:,:) + risfdep(:,:)
-               gdepw_n(:,:,jk) = ( gdepw_0(:,:,jk) - risfdep(:,:) ) * z_ssh_h0(:,:) + risfdep(:,:)
-               gde3w_n(:,:,jk) = gdept_n(:,:,jk) - ssh(:,:,Nnn)
-            END DO
-         ELSE
-            DO jk = 1, jpkm1
-               gdept_n(:,:,jk) = gdept_0(:,:,jk) * z_ssh_h0(:,:)
-               gdepw_n(:,:,jk) = gdepw_0(:,:,jk) * z_ssh_h0(:,:)
-               gde3w_n(:,:,jk) = gdept_n(:,:,jk) - ssh(:,:,Nnn)
-            END DO
-         ENDIF
-         
       ENDIF