Changeset 7966


Ignore:
Timestamp:
2017-04-25T14:38:51+02:00 (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

    r6793 r7966  
    12581258      ENDIF 
    12591259      ! 
     1260      ! Consistency check on ln_useCT and nn_eos 
     1261      IF ((nn_eos .EQ. -1) .AND. (.NOT. ln_useCT)) THEN 
     1262         CALL ctl_stop("ln_useCT should be set to True if using TEOS-10 (nn_eos=-1)") 
     1263      ELSE IF ((nn_eos .NE. -1) .AND. (ln_useCT)) THEN 
     1264         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)") 
     1265      ENDIF 
     1266      ! 
    12601267      SELECT CASE( nn_eos )         ! check option 
    12611268      ! 
Note: See TracChangeset for help on using the changeset viewer.