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:
4 edited
2 copied

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/filtrez/filtreg_mod.F90

    r1707 r1864  
    1010
    1111  SUBROUTINE inifilr
     12#ifdef CPP_PARA
    1213  USE mod_filtre_fft, ONLY : use_filtre_fft,Init_filtre_fft
    1314  USE mod_filtre_fft_loc, ONLY : Init_filtre_fft_loc=>Init_filtre_fft    !
     15#endif
    1416    !    ... H. Upadhyaya, O.Sharma   ...
    1517    !
    … …  
    538540    ENDDO ! of DO j = jfiltsu, jjm
    539541
     542#ifdef CPP_PARA
    540543    IF (use_filtre_fft) THEN
    541544       CALL Init_filtre_fft(coefilu,modfrstu,jfiltnu,jfiltsu,  &
    … …  
    544547                           coefilv,modfrstv,jfiltnv,jfiltsv)
    545548    ENDIF
    546 
     549#endif
    547550    !   ...................................................................
    548551

  • LMDZ5/branches/testing/libf/filtrez/mod_filtre_fft.F90

    r1403 r1864  
    118118    USE mod_fft
    119119#ifdef CPP_PARA
    120     USE parallel,ONLY : OMP_CHUNK
     120    USE parallel_lmdz,ONLY : OMP_CHUNK
    121121#endif
    122122    IMPLICIT NONE
    … …  
    179179    USE mod_fft
    180180#ifdef CPP_PARA
    181     USE parallel,ONLY : OMP_CHUNK
     181    USE parallel_lmdz,ONLY : OMP_CHUNK
    182182#endif
    183183    IMPLICIT NONE
    … …  
    241241    USE mod_fft
    242242#ifdef CPP_PARA
    243     USE parallel,ONLY : OMP_CHUNK
     243    USE parallel_lmdz,ONLY : OMP_CHUNK
    244244#endif
    245245    IMPLICIT NONE

  • LMDZ5/branches/testing/libf/filtrez/mod_filtre_fft_loc.F90

    r1707 r1864  
    107107    USE mod_fft
    108108#ifdef CPP_PARA
    109     USE parallel,ONLY : OMP_CHUNK
     109    USE parallel_lmdz,ONLY : OMP_CHUNK
    110110#endif
    111111    IMPLICIT NONE
    … …  
    187187    USE mod_fft
    188188#ifdef CPP_PARA
    189     USE parallel,ONLY : OMP_CHUNK
     189    USE parallel_lmdz,ONLY : OMP_CHUNK
    190190#endif
    191191    IMPLICIT NONE
    … …  
    250250    USE mod_fft
    251251#ifdef CPP_PARA
    252     USE parallel,ONLY : OMP_CHUNK
     252    USE parallel_lmdz,ONLY : OMP_CHUNK
    253253#endif
    254254    IMPLICIT NONE
Note: See TracChangeset for help on using the changeset viewer.