Changeset 2669 for branches

Timestamp:

2011-03-08T10:38:20+01:00 (13 years ago)

Author:

cetlod

Message:

offline:minor updates to take into account mpp improvement

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM

Files:

• CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) (1 diff)
• NEMO/OFF_SRC/nemogcm.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist

@@ -132 +132 @@
 &namsbc        !   Surface Boundary Condition (surface module)
 !-----------------------------------------------------------------------
-   nn_fsbc     = 5         !  frequency of surface boundary condition computation 
+   nn_fsbc     =  1        !  frequency of surface boundary condition computation 
                            !     (also = the frequency of sea-ice model call)
    ln_ana      = .false.   !  analytical formulation                    (T => fill namsbc_ana ) 

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

@@ -124 +124 @@
       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,   &
@@ -150 +150 @@
       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 we're not using dynamic memory then mpp_partition does nothing.
-
+      ! 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
+         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
@@ -416 +418 @@
          jpni = ifact(imin + 1)
       ENDIF
+      !
       jpnij = jpni*jpnj
-
-      WRITE(*,*) 'ARPDBG: jpni = ',jpni,'jpnj = ',jpnj,'jpnij = ',jpnij
       !
    END SUBROUTINE nemo_partition