Changeset 5868 for branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

Timestamp:

2015-11-06T19:07:02+01:00 (8 years ago)

Author:

jchanut

Message:

Free surface simplification #1620. Step 1: suppress filtered free surface

File:

• branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) (4 diffs)

branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -78 +78 @@
       !!             (lk_vvl=T), the leap-frog is applied on thickness weighted
       !!             velocity.
-      !!             Note also that in filtered free surface (lk_dynspg_flt=T),
-      !!             the time stepping has already been done in dynspg module
       !!
       !!              * Apply lateral boundary conditions on after velocity 
@@ -101 +99 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       INTEGER  ::   iku, ikv     ! local integers
-#if ! defined key_dynspg_flt
       REAL(wp) ::   z2dt         ! temporary scalar
-#endif
       REAL(wp) ::   zue3a, zue3n, zue3b, zuf, zec      ! local scalars
       REAL(wp) ::   zve3a, zve3n, zve3b, zvf, z1_2dt   !   -      -
@@ -120 +116 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~'
       ENDIF
-
-#if defined key_dynspg_flt
-      !
-      ! Next velocity :   Leap-frog time stepping already done in dynspg_flt.F routine
-      ! -------------
-
-      ! Update after velocity on domain lateral boundaries      (only local domain required)
-      ! --------------------------------------------------
-      CALL lbc_lnk( ua, 'U', -1. )         ! local domain boundaries
-      CALL lbc_lnk( va, 'V', -1. ) 
-      !
-#else
 
 # if defined key_dynspg_exp
@@ -201 +185 @@
       CALL Agrif_dyn( kt )             !* AGRIF zoom boundaries
 # endif
-#endif
 
       IF( l_trddyn ) THEN             ! prepare the atf trend computation + some diagnostics