Changeset 4409 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/nemogcm.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/nemogcm.F90 (modified) (5 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -241 +241 @@
          jpk = jpkdta                                             ! third dim
          jpkm1 = jpk-1                                            ! inner domain indices
+         jpkorig = jpk                        ! Copy of jpk that is NOT modified
+         jpkf    = jpk                        ! Max depth of this sub-domain. Initially set to jpk here
+                                              ! but altered later in domzgr
       ENDIF
 
@@ -263 +266 @@
 #if   defined key_mpp_rkpart
       ELSE
-         CALL ctl_stop( 'STOP', 'nemo_init : invalid inputs in namelist - cannot specify jpn{i,j}>0 when using recursive k-section paritioning!' )
+         CALL ctl_stop( 'STOP', &
+                        'nemo_init : invalid inputs in namelist - cannot specify jpn{i,j}>0 &
+                        & when using recursive k-section paritioning!' )
 #endif
       END IF
@@ -593 +598 @@
    SUBROUTINE nemo_recursive_partition( num_pes )
       USE in_out_manager, ONLY: numnam
-      USE dom_oce,        ONLY: ln_zco, ntopo
+      USE dom_oce,        ONLY: ln_zco
       USE dom_oce,        ONLY: gdepw_0, gdept_0, e3w_0, e3t_0, &
                                 mig, mjg, mi0, mi1, mj0, mj1,  mbathy, bathy
@@ -626 +631 @@
       INTEGER :: inum                          ! temporary logical unit
       INTEGER :: ii,jj,iproc                   ! Loop index
-      INTEGER :: jparray(2)                    ! Small array for gathering 
       CHARACTER(LEN=8) :: lstr                 ! Local string for reading env. var.
       INTEGER          :: lztrim               ! Local int for      "      "    "
@@ -653 +657 @@
                                     STATUS=ierr)
       IF( ierr == 0)THEN
-         READ(lstr,FMT="(I)",IOSTAT=ierr) lztrim
+         READ(lstr,FMT="(I10)",IOSTAT=ierr) lztrim
          IF(ierr == 0)THEN
             IF (lztrim == 0) msgtrim_z = .FALSE.