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/dyn3dpar/gcm.F

    r1795 r1864  
    1010#endif
    1111
     12
    1213      USE mod_const_mpi, ONLY: init_const_mpi
    13       USE parallel
     14      USE parallel_lmdz
    1415      USE infotrac
    1516      USE mod_interface_dyn_phys
    … …  
    186187c   Initialisation partie parallele
    187188c------------------------------------
     189
    188190      CALL init_const_mpi
    189 
    190191      call init_parallel
    191192      call ini_getparam("out.def")
    … …  
    213214c$OMP END PARALLEL
    214215#endif
     216
     217!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     218! Initialisation de XIOS
     219!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     220
    215221
    216222c-----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.