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/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
Note: See TracChangeset for help on using the changeset viewer.