Changeset 6544

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.

Location:

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diadimg.F90 (modified) (1 diff)
• DYN/dynldf_bilapg.F90 (modified) (1 diff)
• LBC/lib_mpp.F90 (modified) (2 diffs)
• step.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

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

@@ -465 +465 @@
             END DO
          ELSE
-            IF(lwp)WRITE(numout,*) ' ldfguv: kahm= 1 or 2, here =', kahm
-            IF(lwp)WRITE(numout,*) '         We stop'
-            STOP 'ldfguv'
+            WRITE(numout,*) ' ldfguv: kahm= 1 or 2, here =', kahm
+            WRITE(numout,*) '         We stop'
+            CALL ctl_stop('STOP', 'ldfguv: Unexpected kahm value')
          ENDIF
          !                                             ! ===============

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

@@ -62 +62 @@
    USE lbcnfd         ! north fold treatment
    USE in_out_manager ! I/O manager
+   USE mod_oasis      ! coupling routines 
 
    IMPLICIT NONE
@@ -2015 +2016 @@
       !!----------------------------------------------------------------------
       !
+      #if defined key_oasis3
+      ! If we're trying to shut down cleanly then we need to consider the fact
+      ! that this could be part of an MPMD configuration - we don't want to
+      ! leave other components deadlocked.
+
+      CALL oasis_abort(nproc,"mppstop","NEMO initiated abort")
+
+      #else
+
       CALL mppsync
       CALL mpi_finalize( info )
+
+      #endif
+
       !
    END SUBROUTINE mppstop

branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -346 +346 @@
                                CALL ctl_stop( 'step: indic < 0' )
                                CALL dia_wri_state( 'output.abort', kstp )
+                               CALL ctl_stop('STOP','NEMO failure in stp')
       ENDIF
       IF( kstp == nit000   )   THEN