Changeset 6544 for branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/DIA

Timestamp:

2016-05-17T11:33:10+02:00 (8 years ago)

Author:

frrh

Message:

Add by hand, relevant changes ONLY, from
fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_cplseq from revisions 5279 to 5303.

Note: we no longer employ a separate CPP key for key_oasis3mct and simply intend
to use the NEMO base code key_oasis3.

Note also that most, if not all the changnes made here are things which should
go to the nemo trunk since they involve improvements to error messages, shutdown
processes and abort handling.

File:

• branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90 (modified) (1 diff)

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

@@ -124 +124 @@
 
     CASE DEFAULT
-       IF(lwp) WRITE(numout,*) ' E R R O R : bad cd_type in dia_wri_dimg '
-       STOP 'dia_wri_dimg'
+       WRITE(numout,*) 'dia_wri_dimg : E R R O R : bad cd_type in dia_wri_dimg'
+       CALL ctl_stop( 'STOP', 'dia_wri_dimg :bad cd_type in dia_wri_dimg ' )
 
     END SELECT