Changeset 2669


Ignore:
Timestamp:
2011-03-08T10:38:20+01:00 (10 years ago)
Author:
cetlod
Message:

offline:minor updates to take into account mpp improvement

Location:
branches/dev_r2586_dynamic_mem/NEMOGCM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev_r2586_dynamic_mem/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist

    r2668 r2669  
    132132&namsbc        !   Surface Boundary Condition (surface module) 
    133133!----------------------------------------------------------------------- 
    134    nn_fsbc     = 5         !  frequency of surface boundary condition computation  
     134   nn_fsbc     =  1        !  frequency of surface boundary condition computation  
    135135                           !     (also = the frequency of sea-ice model call) 
    136136   ln_ana      = .false.   !  analytical formulation                    (T => fill namsbc_ana )  
  • branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

    r2666 r2669  
    124124      INTEGER ::   ji            ! dummy loop indices 
    125125      INTEGER ::   ilocal_comm   ! local integer 
    126       CHARACTER(len=80), DIMENSION(10) ::   cltxt = '' 
     126      CHARACTER(len=80), DIMENSION(16) ::   cltxt = '' 
    127127      !! 
    128128      NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   & 
     
    150150      lwp = (narea == 1) .OR. ln_ctl          ! control of all listing output print 
    151151 
    152       ! Decide on size of grid now that we have our communicator size 
    153       ! If we're not using dynamic memory then mpp_partition does nothing. 
    154  
     152      ! If dimensions of processor grid weren't specified in the namelist file  
     153      ! then we calculate them here now that we have our communicator size 
     154      IF( (jpni < 1) .OR. (jpnj < 1) )THEN 
    155155#if   defined key_mpp_mpi   ||   defined key_mpp_shmem 
    156       CALL nemo_partition(mppsize) 
     156         CALL nemo_partition(mppsize) 
    157157#else 
    158       jpni = 1 
    159       jpnj = 1 
    160       jpnij = jpni*jpnj 
     158         jpni = 1 
     159         jpnj = 1 
     160         jpnij = jpni*jpnj 
    161161#endif 
     162      END IF 
     163 
    162164      ! Calculate domain dimensions given calculated jpni and jpnj 
    163165      ! This used to be done in par_oce.F90 when they were parameters rather 
     
    416418         jpni = ifact(imin + 1) 
    417419      ENDIF 
     420      ! 
    418421      jpnij = jpni*jpnj 
    419  
    420       WRITE(*,*) 'ARPDBG: jpni = ',jpni,'jpnj = ',jpnj,'jpnij = ',jpnij 
    421422      ! 
    422423   END SUBROUTINE nemo_partition 
Note: See TracChangeset for help on using the changeset viewer.