Changeset 8200 for branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.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/DOM/dommsk.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -550 +550 @@
       IF(lwp) WRITE(numout,*) 'dom_msk_nsa : noslip accurate boundary condition'
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   using Schchepetkin and O Brian scheme'
-      IF( lk_mpp )   CALL ctl_stop( ' mpp version is not yet implemented' )
+      IF( lk_mpp )   CALL ctl_stop('STOP', ' mpp version is not yet implemented' )
 
       ! mask for second order calculation of vorticity
@@ -572 +572 @@
          WRITE(numout,*) ' symetric boundary conditions need special'
          WRITE(numout,*) ' treatment not implemented. we stop.'
-         STOP
+         CALL ctl_stop('STOP', 'NEMO abort from dom_msk_nsa')
       ENDIF