Changeset 11465 for NEMO/branches

Timestamp:

2019-08-20T18:03:53+02:00 (5 years ago)

Author:

acc

Message:

Branch dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap. Update VORTEX/MY_SRC/domvvl.F90 to be compatible with time swapping changes; now passes SETTE tests

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/tests/VORTEX/MY_SRC/domvvl.F90 (modified) (6 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/tests/VORTEX/MY_SRC/domvvl.F90

@@ -619 +619 @@
          tilde_e3t_n(:,:,:) = tilde_e3t_a(:,:,:)
       ENDIF
-      gdept(:,:,:,Kbb) = gdept(:,:,:,Kmm)
-      gdepw(:,:,:,Kbb) = gdepw(:,:,:,Kmm)
-
-      e3t(:,:,:,Kmm) = e3t(:,:,:,Kaa)
-      e3u(:,:,:,Kmm) = e3u(:,:,:,Kaa)
-      e3v(:,:,:,Kmm) = e3v(:,:,:,Kaa)
 
       ! Compute all missing vertical scale factor and depths
@@ -631 +625 @@
       ! --------------------------------------
       ! - ML - e3u(:,:,:,Kbb) and e3v(:,:,:,Kbb) are allready computed in dynnxt
-      ! - JC - hu(:,:,Kbb), hv(:,:,Kbb), hur_b, hvr_b also
+      ! - JC - hu(:,:,:,Kbb), hv(:,:,:,:,Kbb), hur_b, hvr_b also
       
       CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3f(:,:,:), 'F'  )
@@ -663 +657 @@
       ! Local depth and Inverse of the local depth of the water
       ! -------------------------------------------------------
-      hu(:,:,Kmm) = hu(:,:,Kaa)   ;   r1_hu(:,:,Kmm) = r1_hu(:,:,Kaa)
-      hv(:,:,Kmm) = hv(:,:,Kaa)   ;   r1_hv(:,:,Kmm) = r1_hv(:,:,Kaa)
       !
       ht(:,:) = e3t(:,:,1,Kmm) * tmask(:,:,1)
@@ -906 +898 @@
                      DO ji = 1, jpi
                         IF( ht_0(ji,jj)-ssh_ref <  rn_wdmin1 ) THEN ! if total depth is less than min depth
-
                            ssh(ji,jj,Kbb) = rn_wdmin1 - (ht_0(ji,jj) )
                            ssh(ji,jj,Kmm) = rn_wdmin1 - (ht_0(ji,jj) )
@@ -932 +923 @@
             ELSE
                !
-               ! usr_def_istate called here only to get ssh(:,:,Kbb), that is needed to initialize e3t(:,:,:,Kbb) and e3t(:,:,:,Kmm)
+               ! usr_def_istate called here only to get ssh(Kbb) needed to initialize e3t(Kbb) and e3t(Kmm)
+               !
                CALL usr_def_istate( gdept_0, tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb)  )  
-               ! usr_def_istate will be called again in istate_init to initialize ts(bn), ssh(bn), u(bn) and v(bn)
+               !
+               ! usr_def_istate will be called again in istate_init to initialize ts, ssh, u and v
                !
                DO jk=1,jpk
@@ -942 +935 @@
                END DO
                e3t(:,:,:,Kmm) = e3t(:,:,:,Kbb)
-               ssh(:,:,Kmm) = ssh(:,:,Kbb)   ! needed later for gde3w
-!!$                e3t(:,:,:,Kmm)=e3t_0(:,:,:)
-!!$                e3t(:,:,:,Kbb)=e3t_0(:,:,:)
+               ssh(:,:,Kmm) = ssh(:,:,Kbb)                                     ! needed later for gde3w
                !
             END IF           ! end of ll_wd edits