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

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -1062 +1062 @@
       ENDIF
 #endif
-       
+      IF (cdfile_name == "output.abort") THEN
+         CALL ctl_stop('STOP', 'NEMO abort from dia_wri_state')
+      END IF     
+  
 !     IF( nn_timing == 1 )   CALL timing_stop('dia_wri_state') ! not sure this works for routines not called in first timestep
       !