Changeset 5313 for branches/2014/dev_r4650_UKMO11_restart_functionality/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90

Timestamp:

2015-05-29T11:46:03+02:00 (9 years ago)

Author:

timgraham

Message:

Merged head of trunk (r5302) into branch

File:

• branches/2014/dev_r4650_UKMO11_restart_functionality/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) (1 diff)

branches/2014/dev_r4650_UKMO11_restart_functionality/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90

@@ -127 +127 @@
       IF( ln_dynzad_zts .AND. .NOT. ln_dynadv_vec )   &
           CALL ctl_stop( 'Sub timestepping of vertical advection requires vector form; set ln_dynadv_vec = .TRUE.' )
+      IF( ln_dynzad_zts .AND. ln_isfcav )   &
+          CALL ctl_stop( 'Sub timestepping of vertical advection does not work with ln_isfcav = .TRUE.' )
 
       !                               ! Set nadv