Changeset 6545 for branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.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/LBC/lib_mpp.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -3785 +3785 @@
 100   CONTINUE
       IF( iost /= 0 ) THEN
-         IF(ldwp) THEN
-            WRITE(kout,*)
-            WRITE(kout,*) ' ===>>>> : bad opening file: ', clfile
-            WRITE(kout,*) ' =======   ===  '
-            WRITE(kout,*) '           unit   = ', knum
-            WRITE(kout,*) '           status = ', cdstat
-            WRITE(kout,*) '           form   = ', cdform
-            WRITE(kout,*) '           access = ', cdacce
-            WRITE(kout,*) '           iostat = ', iost
-            WRITE(kout,*) '           we stop. verify the file '
-            WRITE(kout,*)
-         ENDIF
-         STOP 'ctl_opn bad opening'
+         ! If the run is about to fail we ALWAYS want to know
+         ! the full details! This must not be hidden behind
+         ! "IF(ldwp)" or other irrelevant conditional tests.
+         WRITE(kout,*)
+         WRITE(kout,*) ' ===>>>> : bad opening file: ', clfile
+         WRITE(kout,*) ' =======   ===  '
+         WRITE(kout,*) '           unit   = ', knum
+         WRITE(kout,*) '           status = ', cdstat
+         WRITE(kout,*) '           form   = ', cdform
+         WRITE(kout,*) '           access = ', cdacce
+         WRITE(kout,*) '           iostat = ', iost
+         WRITE(kout,*) '           we stop. verify the file '
+         WRITE(kout,*)
+        
+         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening')
       ENDIF