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

Timestamp:

2014-02-04T13:12:20+01:00 (10 years ago)

Author:

trackstand2

Message:

Changes to allow jpk to be modified to deepest level within a subdomain. jpkorig holds original value.

File:

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

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

@@ -133 +133 @@
    
    ! North fold condition in mpp_mpi with jpni > 1
-   INTEGER ::   ngrp_world        ! group ID for the world processors
-   INTEGER ::   ngrp_opa          ! group ID for the opa processors
-   INTEGER ::   ngrp_north        ! group ID for the northern processors (to be fold)
-   INTEGER ::   ncomm_north       ! communicator made by the processors belonging to ngrp_north
-   INTEGER ::   ndim_rank_north   ! number of 'sea' processor in the northern line (can be /= jpni !)
-   INTEGER ::   njmppmax          ! value of njmpp for the processors of the northern line
-   INTEGER ::   north_root        ! number (in the comm_opa) of proc 0 in the northern comm
+   INTEGER, SAVE ::   ngrp_world      ! group ID for the world processors
+   INTEGER, SAVE ::   ngrp_opa        ! group ID for the opa processors
+   INTEGER, SAVE ::   ngrp_north      ! group ID for the northern processors (to be fold)
+   INTEGER, SAVE ::   ncomm_north     ! communicator made by the processors belonging to ngrp_north
+   INTEGER, SAVE ::   ndim_rank_north ! number of 'sea' processor in the northern line (can be /= jpni !)
+   INTEGER, SAVE ::   njmppmax        ! value of njmpp for the processors of the northern line
+   INTEGER, SAVE ::   north_root      ! number (in the comm_opa) of proc 0 in the northern comm
    INTEGER, DIMENSION(:), ALLOCATABLE, SAVE ::   nrank_north   ! dimension ndim_rank_north
 
@@ -453 +453 @@
 !! DCSE_NEMO: work around a deficiency in ftrans
 !     REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   ptab3d   ! 3D array on which the boundary condition is applied
-      REAL(wp),                         INTENT(inout) ::   ptab3d(jpi,jpj,jpk)
+      REAL(wp),                         INTENT(inout) ::   ptab3d(jpi,jpj,jpkorig)
       CHARACTER(len=1)                , INTENT(in   ) ::   cd_type  ! define the nature of ptab array grid-points
       !                                                             ! = T , U , V , F , W points
@@ -890 +890 @@
 !     REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   ptab1     ! first and second 3D array on which 
 !     REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   ptab2     ! the boundary condition is applied
-      REAL(wp),                         INTENT(inout) ::   ptab1(jpi,jpj,jpk)
-      REAL(wp),                         INTENT(inout) ::   ptab2(jpi,jpj,jpk)
+      REAL(wp),                         INTENT(inout) ::   ptab1(jpi,jpj,jpkorig)
+      REAL(wp),                         INTENT(inout) ::   ptab2(jpi,jpj,jpkorig)
       CHARACTER(len=1)                , INTENT(in   ) ::   cd_type1  ! nature of ptab1 and ptab2 arrays 
       CHARACTER(len=1)                , INTENT(in   ) ::   cd_type2  ! i.e. grid-points = T , U , V , F or W points
@@ -1721 +1721 @@
 !     REAL(wp), DIMENSION (jpi,jpj,jpk), INTENT(in   ) ::   ptab3d       ! Local 3D array
 !     REAL(wp), DIMENSION (jpi,jpj,jpk), INTENT(in   ) ::   pmask3d      ! Local mask
-      REAL(wp), INTENT(in   )                          ::   ptab3d(jpi,jpj,jpk)
-      REAL(wp), INTENT(in   )                          ::   pmask3d(jpi,jpj,jpk)
+      REAL(wp), INTENT(in   )                          ::   ptab3d(jpi,jpj,jpkorig)
+      REAL(wp), INTENT(in   )                          ::   pmask3d(jpi,jpj,jpkorig)
       REAL(wp)                         , INTENT(  out) ::   pmin         ! Global minimum of ptab
       INTEGER                          , INTENT(  out) ::   ki, kj, kk   ! index of minimum in global frame
@@ -1813 +1813 @@
 !     REAL(wp), DIMENSION (jpi,jpj,jpk), INTENT(in   ) ::   ptab3d       ! Local 2D array
 !     REAL(wp), DIMENSION (jpi,jpj,jpk), INTENT(in   ) ::   pmask3d      ! Local mask
-      REAL(wp), INTENT(in   )                          ::   ptab3d(jpi,jpj,jpk)       ! Local 2D array
-      REAL(wp), INTENT(in   )                          ::   pmask3d(jpi,jpj,jpk)      ! Local mask
+      REAL(wp), INTENT(in   )                          ::   ptab3d(jpi,jpj,jpkorig)       ! Local 2D array
+      REAL(wp), INTENT(in   )                          ::   pmask3d(jpi,jpj,jpkorig)      ! Local mask
       REAL(wp)                         , INTENT(  out) ::   pmax         ! Global maximum of ptab
       INTEGER                          , INTENT(  out) ::   ki, kj, kk   ! index of maximum in global frame
@@ -2368 +2368 @@
 !! DCSE_NEMO: work around a deficiency in ftrans
 !     REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   pt3d      ! 3D array on which the b.c. is applied
-      REAL(wp),                         INTENT(inout) ::   pt3d(jpi,jpj,jpk)
+      REAL(wp),                         INTENT(inout) ::   pt3d(jpi,jpj,jpkorig)
       CHARACTER(len=1)                , INTENT(in   ) ::   cd_type   ! nature of pt3d grid-points
       !                                                              !   = T ,  U , V , F or W  gridpoints
@@ -2873 +2873 @@
          IF( PRESENT(cd10) )   WRITE(numout,*) cd10
       ENDIF
-                               CALL FLUSH(numout    )
-      IF( numstp     /= -1 )   CALL FLUSH(numstp    )
-      IF( numsol     /= -1 )   CALL FLUSH(numsol    )
-      IF( numevo_ice /= -1 )   CALL FLUSH(numevo_ice)
+                                FLUSH(numout    )
+      IF( numstp     /= -1 )    FLUSH(numstp    )
+      IF( numsol     /= -1 )    FLUSH(numsol    )
+      IF( numevo_ice /= -1 )    FLUSH(numevo_ice)
       !
       IF( cd1 == 'STOP' ) THEN
@@ -2912 +2912 @@
          IF( PRESENT(cd10) ) WRITE(numout,*) cd10
       ENDIF
-      CALL FLUSH(numout)
+      FLUSH(numout)
       !
    END SUBROUTINE ctl_warn