Changeset 7985

Timestamp:

2017-04-28T10:03:20+02:00 (8 years ago)

Author:

frrh

Message:

Met Office GMED ticket 322 refers.
Apply updates the Met Office GC3 coupled package branch in order to
accommodate developments under GMED ticket 320 which insert long
standing missing revisions of the nemo_v3_6_STABLE branch
to the Met Office GO6 package branch.

These changes are not dependent on a particular revision of the GO6
package branch and may be used with or without upgrading that branch.

Location:

branches/UKMO/dev_r5518_GC3_couple_pkg/NEMOGCM/NEMO/OPA_SRC

Files:

• LBC/lib_mpp.F90 (modified) (2 diffs)
• wrk_nemo.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GC3_couple_pkg/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
@@ -2008 +2007 @@
    SUBROUTINE mppstop
    
+   USE mod_oasis      ! coupling routines
 
       !!----------------------------------------------------------------------

branches/UKMO/dev_r5518_GC3_couple_pkg/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

@@ -72 +72 @@
    !!----------------------------------------------------------------------
    USE par_oce        ! ocean parameters
-   USE lib_mpp
 
    IMPLICIT NONE
@@ -454 +453 @@
    SUBROUTINE wrk_allocbase( kidim , kjdim , kkdim , kldim , kisrt , kjsrt , kksrt , klsrt ,   &
       &                      kwrk1d, kwrk2d, kwrk3d, kwrk4d, pwrk1d, pwrk2d, pwrk3d, pwrk4d    )
+   USE in_out_manager, ONLY: numout
       INTEGER                              , INTENT(in   )           :: kidim, kjdim, kkdim, kldim
       INTEGER                              , INTENT(in   )           :: kisrt, kjsrt, kksrt, klsrt
@@ -484 +484 @@
          &      .AND. SUM( tree(ii)%ishape ) /= 0 )
          ii = ii + 1
-         IF (ii > jparray) CALL ctl_stop('STOP', 'NEMO aborted wrk_allocbase')
+         IF (ii > jparray) THEN
+            WRITE(numout,*) "E R R O R: NEMO aborted wrk_allocbase"
+            FLUSH(numout)
+            STOP 'Increase the value of jparray'
                            ! increase the value of jparray (should not be needed as already very big!)
+         END IF
       END DO