Changeset 3837 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

Timestamp:

2013-03-12T15:55:32+01:00 (11 years ago)

Author:

trackstand2

Message:

Merge of finiss

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) (3 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -279 +279 @@
       WRITE(ldtxt(ii),*) '      size in bytes of exported buffer   nn_buffer   = ', nn_buffer     ;   ii = ii + 1
       WRITE(ldtxt(ii),*) '      whether to trim dry points         nn_pttrim   = ', nn_pttrim     ;   ii = ii + 1
-      WRITE(ldtxt(ii),*) '      number of cores per compute node   nn_cpn      = ', nn_cpnode     ;   ii = ii + 1
+      WRITE(ldtxt(ii),*) '      number of cores per compute node   nn_cpnode   = ', nn_cpnode     ;   ii = ii + 1
 #if defined key_agrif
       IF( .NOT. Agrif_Root() ) THEN
@@ -469 +469 @@
 
 #if defined key_mpp_rkpart
-      CALL ctl_stop('mpp_lnk_3d: should not have been called when key_mpp_rkpart defined!')
+      CALL ctl_stop('STOP', &
+                    'mpp_lnk_3d: should not have been called when key_mpp_rkpart defined!')
       RETURN
 #endif
@@ -2308 +2309 @@
       !!----------------------------------------------------------------------
       !
+#if defined key_mpp_rkpart
+      WRITE(*,*)'ARPDBG - should not be calling this version of mpp_ini_north!'
+      CALL MPI_ABORT(mpi_comm_opa, -1)
+      RETURN
+#endif
+
       njmppmax = MAXVAL( njmppt )
       !