Changeset 5866 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

Timestamp:

2015-11-06T11:42:35+01:00 (8 years ago)

Author:

gm

Message:

#1613: vvl by default: add ln_linssh and remove key_vvl

File:

• branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (2 diffs)

branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -138 +138 @@
       ! Evaluate the masked next velocity (effect of the additional force not included)
       ! ---------------------------------  
-      IF( lk_vvl ) THEN          ! variable volume  (surface pressure gradient already included in dyn_hpg)
+      IF( .NOT.ln_linssh ) THEN     ! variable volume  (surface pressure gradient already included in dyn_hpg)
          !
          IF( ln_dynadv_vec ) THEN      ! vector form : applied on velocity
@@ -230 +230 @@
       CALL lbc_lnk( spgv, 'V', -1. )
 
-      IF( lk_vvl ) CALL sol_mat( kt )      ! build the matrix at kt (vvl case only)
+      IF( .NOT.ln_linssh )   CALL sol_mat( kt )      ! build the matrix at kt (non-linear free surface only)
 
       ! Right hand side of the elliptic equation and first guess