Ignore:
Timestamp:
Sep 11, 2013, 11:45:01 AM (11 years ago)
Author:
Laurent Fairhead
Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860


New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/dyn3dmem/conf_gcm.F

    r1795 r1864  
    1717      use mod_filtre_fft_loc, ONLY : use_filtre_fft_loc=>use_filtre_fft
    1818      use mod_hallo, ONLY : use_mpi_alloc
    19       use parallel, ONLY : omp_chunk
    2019      USE infotrac, ONLY : type_trac
    2120      use assert_m, only: assert
     
    908907      use_mpi_alloc=.FALSE.
    909908      CALL getin('use_mpi_alloc',use_mpi_alloc)
    910 
    911 !Config  Key  = omp_chunk
    912 !Config  Desc = taille des blocs openmp
    913 !Config  Def  = 1
    914 !Config  Help = defini la taille des packets d'it�ration openmp
    915 !Config         distribu�e � chaque t�che lors de l'entr�e dans une
    916 !Config         boucle parall�lis�e
    917  
    918       omp_chunk=1
    919       CALL getin('omp_chunk',omp_chunk)
    920909
    921910!Config key = ok_strato
     
    1006995      write(lunout,*)' use_filtre_fft = ', use_filtre_fft
    1007996      write(lunout,*)' use_mpi_alloc = ', use_mpi_alloc
    1008       write(lunout,*)' omp_chunk = ', omp_chunk
    1009997      write(lunout,*)' ok_strato = ', ok_strato
    1010998      write(lunout,*)' ok_gradsfile = ', ok_gradsfile
Note: See TracChangeset for help on using the changeset viewer.