Changeset 7966

Timestamp:

2017-04-25T14:38:51+02:00 (7 years ago)

Author:

frrh

Message:

Include missing revision 6482 from nemo_v3_6_STABLE

Command:
svn merge -r6477:6482 ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/nemo_v3_6_STABLE/NEMOGCM

This gets the GO6 package branch contents up to date with nemo_v3_6_STABLE up to and including
revision 6820.

File:

• branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -1258 +1258 @@
       ENDIF
       !
+      ! Consistency check on ln_useCT and nn_eos
+      IF ((nn_eos .EQ. -1) .AND. (.NOT. ln_useCT)) THEN
+         CALL ctl_stop("ln_useCT should be set to True if using TEOS-10 (nn_eos=-1)")
+      ELSE IF ((nn_eos .NE. -1) .AND. (ln_useCT)) THEN
+         CALL ctl_stop("ln_useCT should be set to False if using TEOS-80 or simplified equation of state (nn_eos=0 or nn_eos=1)")
+      ENDIF
+      !
       SELECT CASE( nn_eos )         ! check option
       !