Changeset 6545 for branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2016-05-17T12:35:16+02:00 (8 years ago)

Author:

frrh

Message:

Apply relevant changes by hand from
fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_mct revisions 5569 to 6355 inclusive
since svn merge DOES NOT WORK!

Note the presence in the NEMO code of key_oamct_v3 which, one assumes is for
specific use with OASIS3-MCT version 3... i.e. there are syntax changes in
OASIS calls to be dealt with! We must remember to deal with this when upgrading to
OASIS3-MCT vn3.0 then!

File:

• branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (2 diffs)

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

@@ -526 +526 @@
       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
@@ -548 +548 @@
          WRITE(numout,*) ' symetric boundary conditions need special'
          WRITE(numout,*) ' treatment not implemented. we stop.'
-         STOP
+         CALL ctl_stop('STOP', 'NEMO aborted from dia_wri')
       ENDIF