Changeset 5462 for branches/UKMO/restart_datestamp/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

Timestamp:

2015-06-22T16:40:58+02:00 (9 years ago)

Author:

davestorkey

Message:

Update UKMO/restart_datestamp branch to revision 5442 of trunk. Also clear the SVN keywords again - necessary after the update step.

File:

• branches/UKMO/restart_datestamp/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) (1 diff)

branches/UKMO/restart_datestamp/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -250 +250 @@
       IF( ( ioptio > 1 .AND. .NOT. lk_esopa ) .OR. ( ioptio == 0 .AND. .NOT. lk_c1d ) )   &
            &   CALL ctl_stop( ' Choose only one surface pressure gradient scheme with a key cpp' )
-      IF( ( lk_dynspg_ts .OR. lk_dynspg_exp ) .AND. nn_isf .NE. 0 )   &
+      IF( ( lk_dynspg_ts .OR. lk_dynspg_exp ) .AND. ln_isfcav )   &
            &   CALL ctl_stop( ' dynspg_ts and dynspg_exp not tested with ice shelf cavity ' )
       !