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/call_dissip_mod.F90

    r1707 r1864  
    2222  SUBROUTINE call_dissip_allocate
    2323  USE bands
    24   USE allocate_field
    25   USE parallel
    26   USE dimensions
     24  USE allocate_field_mod
     25  USE parallel_lmdz
     26  USE dimensions_mod
    2727  USE dissip_mod, ONLY : dissip_allocate
    2828  IMPLICIT NONE
     
    5050 
    5151  SUBROUTINE call_dissip_switch_dissip(dist)
    52   USE allocate_field
     52  USE allocate_field_mod
    5353  USE bands
    54   USE parallel
     54  USE parallel_lmdz
    5555  USE dissip_mod, ONLY : dissip_switch_dissip
    5656  IMPLICIT NONE
     
    7878 
    7979  SUBROUTINE call_dissip(ucov_dyn,vcov_dyn,teta_dyn,p_dyn,pk_dyn,ps_dyn)
    80   USE dimensions
    81   USE parallel
     80  USE dimensions_mod
     81  USE parallel_lmdz
    8282  USE times
    8383  USE mod_hallo
     
    9898    REAL  SSUM
    9999    LOGICAL,PARAMETER :: dissip_conservative=.TRUE.
    100     TYPE(Request) :: Request_dissip
    101    
     100    TYPE(Request),SAVE :: Request_dissip
     101!$OMP THREADPRIVATE(Request_dissip )   
    102102    INTEGER :: ij,l,ijb,ije
    103103 
Note: See TracChangeset for help on using the changeset viewer.