Changeset 5120 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90

Timestamp:

2015-03-03T17:11:55+01:00 (9 years ago)

Author:

acc

Message:

#1473. Re-organisation and optimisation of ice shelf cavity option. This commit merges changes from the dev_r5094_UKMO_ISFCLEAN branch onto the trunk. Results will change, even with ln_isfcav=F, due to a return to original definitions of the vertical metrics. All changes have been reviewed and SETTE tested.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) (1 diff)

trunk/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