Changeset 8200 for branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90

Timestamp:

2017-06-21T14:27:02+02:00 (7 years ago)

Author:

frrh

Message:

Merge branches/UKMO/dev_r5518_GC3_couple_pkg@7985 using command:

svn merge -r 6574:7985 ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GC3_couple_pkg

File:

• branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90

@@ -327 +327 @@
                END DO
             ELSE
-               IF(lwp) WRITE(numout,*) ' ldfght: kaht= 1 or 2, here =', kaht
-               IF(lwp) WRITE(numout,*) '         We stop'
-               STOP 'ldfght'
+               WRITE(numout,*) ' ldfght: kaht= 1 or 2, here =', kaht
+               WRITE(numout,*) '         We stop'
+               CALL ctl_stop( 'STOP', 'ldfght : unexpected kaht value')
             ENDIF
             !                                             ! ===============