Changeset 2668


Ignore:
Timestamp:
2011-03-07T20:14:16+01:00 (10 years ago)
Author:
trackstand2
Message:

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

Location:
branches/dev_r2586_dynamic_mem/NEMOGCM
Files:
5 edited

Legend:

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

    r2528 r2668  
    672672!!====================================================================== 
    673673!!   nammpp            Massively Parallel Processing                    ("key_mpp_mpi) 
    674 !!   nammpp_dyndist    Massively Parallel domain decomposition          ("key_agrif" && "key_mpp_dyndist") 
    675674!!   namctl            Control prints & Benchmark 
    676675!!   namsol            elliptic solver / island / free surface  
     
    696695                           !  buffer blocking send or immediate non-blocking sends, resp. 
    697696   nn_buffer   =   0       !  size in bytes of exported buffer ('B' case), 0 no exportation 
    698 / 
    699 !----------------------------------------------------------------------- 
    700 &nammpp_dyndist !   Massively Parallel Distribution for AGRIF zoom      ("key_agrif" && "key_mpp_dyndist") 
    701 !----------------------------------------------------------------------- 
    702    jpni        =    1      !  jpni   number of processors following i 
    703    jpnj        =    1      !  jpnj   number of processors following j 
    704    jpnij       =    1      !  jpnij  number of local domains 
     697   jpni        =   0       !  jpni   number of processors following i (set automatically if < 1)      
     698   jpnj        =   0       !  jpnj   number of processors following j (set automatically if < 1)      
     699   jpnij       =   0       !  jpnij  number of local domains (set automatically if < 1)               
    705700/ 
    706701!----------------------------------------------------------------------- 
  • branches/dev_r2586_dynamic_mem/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist

    r2551 r2668  
    669669 
    670670!!====================================================================== 
    671 !!                  ***  Miscelaneous namelists  *** 
     671!!                  ***  Miscellaneous namelists  *** 
    672672!!====================================================================== 
    673673!!   nammpp            Massively Parallel Processing                    ("key_mpp_mpi) 
    674 !!   nammpp_dyndist    Massively Parallel domain decomposition          ("key_agrif" && "key_mpp_dyndist") 
    675674!!   namctl            Control prints & Benchmark 
    676675!!   namsol            elliptic solver / island / free surface  
     
    696695                           !  buffer blocking send or immediate non-blocking sends, resp. 
    697696   nn_buffer   =   0       !  size in bytes of exported buffer ('B' case), 0 no exportation 
    698 / 
    699 !----------------------------------------------------------------------- 
    700 &nammpp_dyndist !   Massively Parallel Distribution for AGRIF zoom      ("key_agrif" && "key_mpp_dyndist") 
    701 !----------------------------------------------------------------------- 
    702    jpni        =    1      !  jpni   number of processors following i 
    703    jpnj        =    1      !  jpnj   number of processors following j 
    704    jpnij       =    1      !  jpnij  number of local domains 
     697   jpni        =   0       !  jpni   number of processors following i (set automatically if < 1) 
     698   jpnj        =   0       !  jpnj   number of processors following j (set automatically if < 1) 
     699   jpnij       =   0       !  jpnij  number of local domains (set automatically if < 1) 
    705700/ 
    706701!----------------------------------------------------------------------- 
  • branches/dev_r2586_dynamic_mem/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist

    r2528 r2668  
    686686!!====================================================================== 
    687687!!   nammpp            Massively Parallel Processing                    ("key_mpp_mpi) 
    688 !!   nammpp_dyndist    Massively Parallel domain decomposition          ("key_agrif" && "key_mpp_dyndist") 
    689688!!   namctl            Control prints & Benchmark 
    690689!!   namsol            elliptic solver / island / free surface  
     
    710709                           !  buffer blocking send or immediate non-blocking sends, resp. 
    711710   nn_buffer   =   0       !  size in bytes of exported buffer ('B' case), 0 no exportation 
    712 / 
    713 !----------------------------------------------------------------------- 
    714 &nammpp_dyndist !   Massively Parallel Distribution for AGRIF zoom      ("key_agrif" && "key_mpp_dyndist") 
    715 !----------------------------------------------------------------------- 
    716    jpni        =    1      !  jpni   number of processors following i 
    717    jpnj        =    1      !  jpnj   number of processors following j 
    718    jpnij       =    1      !  jpnij  number of local domains 
     711   jpni        =   0       !  jpni   number of processors following i (set automatically if < 1) 
     712   jpnj        =   0       !  jpnj   number of processors following j (set automatically if < 1) 
     713   jpnij       =   0       !  jpnij  number of local domains (set automatically if < 1) 
    719714/ 
    720715!----------------------------------------------------------------------- 
  • branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r2636 r2668  
    232232      LOGICAL ::   mpi_was_called 
    233233      ! 
    234       NAMELIST/nammpp/ cn_mpi_send, nn_buffer 
     234      NAMELIST/nammpp/ cn_mpi_send, nn_buffer, jpni, jpnj, jpnij 
    235235      !!---------------------------------------------------------------------- 
    236236      ! 
     
    240240      WRITE(ldtxt(ii),*) '~~~~~~ '                                                                ;   ii = ii + 1 
    241241      ! 
     242      jpni = -1; jpnj = -1; jpnij = -1 
    242243      REWIND( kumnam )               ! Namelist namrun : parameters of the run 
    243244      READ  ( kumnam, nammpp ) 
     
    246247      WRITE(ldtxt(ii),*) '      mpi send type                      cn_mpi_send = ', cn_mpi_send   ;   ii = ii + 1 
    247248      WRITE(ldtxt(ii),*) '      size in bytes of exported buffer   nn_buffer   = ', nn_buffer     ;   ii = ii + 1 
     249 
     250      IF(jpnij < 1)THEN 
     251         ! If jpnij is not specified in namelist then we calculate it - this 
     252         ! means there will be no land cutting out. 
     253         jpnij = jpni * jpnj 
     254      END IF 
     255 
     256      IF( (jpni < 1) .OR. (jpnj < 1) )THEN 
     257         WRITE(ldtxt(ii),*) '      jpni, jpnj and jpnij will be calculated automatically'; ii = ii + 1 
     258      ELSE 
     259         WRITE(ldtxt(ii),*) '      processor grid extent in i         jpni = ',jpni; ii = ii + 1 
     260         WRITE(ldtxt(ii),*) '      processor grid extent in j         jpnj = ',jpnj; ii = ii + 1 
     261         WRITE(ldtxt(ii),*) '      number of local domains           jpnij = ',jpnij; ii = ii +1 
     262      END IF 
    248263 
    249264      CALL mpi_initialized ( mpi_was_called, code ) 
  • branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r2664 r2668  
    184184      INTEGER ::   ji            ! dummy loop indices 
    185185      INTEGER ::   ilocal_comm   ! local integer 
    186       CHARACTER(len=80), DIMENSION(10) ::   cltxt 
     186      CHARACTER(len=80), DIMENSION(16) ::   cltxt 
    187187      !! 
    188188      NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   & 
     
    223223      lwp = (narea == 1) .OR. ln_ctl                        ! control of all listing output print 
    224224 
    225       ! Decide on size of grid now that we have our communicator size 
    226  
     225      ! If dimensions of processor grid weren't specified in the namelist file  
     226      ! then we calculate them here now that we have our communicator size 
     227      IF( (jpni < 1) .OR. (jpnj < 1) )THEN 
    227228#if   defined key_mpp_mpi   ||   defined key_mpp_shmem 
    228       CALL nemo_partition(mppsize) 
     229         CALL nemo_partition(mppsize) 
    229230#else 
    230       jpni = 1 
    231       jpnj = 1 
    232       jpnij = jpni*jpnj 
    233 #endif 
     231         jpni = 1 
     232         jpnj = 1 
     233         jpnij = jpni*jpnj 
     234#endif 
     235      END IF 
     236 
    234237      ! Calculate domain dimensions given calculated jpni and jpnj 
    235238      ! This used to be done in par_oce.F90 when they were parameters rather 
     
    537540         jpni = ifact(imin + 1) 
    538541      ENDIF 
     542      ! 
    539543      jpnij = jpni*jpnj 
    540  
    541       WRITE(*,*) 'ARPDBG: jpni = ',jpni,'jpnj = ',jpnj,'jpnij = ',jpnij 
    542544      ! 
    543545   END SUBROUTINE nemo_partition 
Note: See TracChangeset for help on using the changeset viewer.