Changeset 2668 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2011-03-07T20:14:16+01:00 (13 years ago)

Author:

trackstand2

Message:

Added jpni, jpnj and jpnij to nammpp namelist. Suppressed nammpp_dyndist section.

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -184 +184 @@
       INTEGER ::   ji            ! dummy loop indices
       INTEGER ::   ilocal_comm   ! local integer
-      CHARACTER(len=80), DIMENSION(10) ::   cltxt
+      CHARACTER(len=80), DIMENSION(16) ::   cltxt
       !!
       NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   &
@@ -223 +223 @@
       lwp = (narea == 1) .OR. ln_ctl                        ! control of all listing output print
 
-      ! Decide on size of grid now that we have our communicator size
-
+      ! If dimensions of processor grid weren't specified in the namelist file 
+      ! then we calculate them here now that we have our communicator size
+      IF( (jpni < 1) .OR. (jpnj < 1) )THEN
 #if   defined key_mpp_mpi   ||   defined key_mpp_shmem
-      CALL nemo_partition(mppsize)
+         CALL nemo_partition(mppsize)
 #else
-      jpni = 1
-      jpnj = 1
-      jpnij = jpni*jpnj
-#endif
+         jpni = 1
+         jpnj = 1
+         jpnij = jpni*jpnj
+#endif
+      END IF
+
       ! Calculate domain dimensions given calculated jpni and jpnj
       ! This used to be done in par_oce.F90 when they were parameters rather
@@ -537 +540 @@
          jpni = ifact(imin + 1)
       ENDIF
+      !
       jpnij = jpni*jpnj
-
-      WRITE(*,*) 'ARPDBG: jpni = ',jpni,'jpnj = ',jpnj,'jpnij = ',jpnij
       !
    END SUBROUTINE nemo_partition