Ignore:
Timestamp:
Nov 28, 2014, 4:36:29 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/dyn3dpar/leapfrog_p.F

    r2056 r2160  
    717717           CALL exner_milieu_p( ip1jmp1, ps, p, pks, pk, pkf )
    718718         endif
     719c$OMP BARRIER
    719720! Appel a geopot ajoute le 2014/05/08 pour garantir la convergence numerique
    720721! avec dyn3dmem
    721       CALL geopot  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
    722 c$OMP BARRIER
     722      CALL geopot_p  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
     723
    723724           jD_cur = jD_ref + day_ini - day_ref
    724725     $        + itau/day_step
Note: See TracChangeset for help on using the changeset viewer.