Ignore:
Timestamp:
Sep 29, 2016, 11:26:46 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2593:2640 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2160 r2641  
    77      USE parallel_lmdz
    88      USE control_mod, only : planet_type
     9      USE comconst_mod, ONLY: pi
     10      USE logic_mod, ONLY: leapf
     11      USE comvert_mod, ONLY: ap, bp
     12      USE temps_mod, ONLY: dt
     13     
    914      IMPLICIT NONE
    1015
     
    2732#include "dimensions.h"
    2833#include "paramet.h"
    29 #include "comconst.h"
    3034#include "comgeom.h"
    31 #include "comvert.h"
    32 #include "logic.h"
    33 #include "temps.h"
    34 #include "serre.h"
    3535#include "iniprint.h"
    3636
     
    284284      ije=ij_end
    285285
    286         if (planet_type.eq."earth") then
     286        if (planet_type.eq."earth") then
    287287! Earth-specific treatment of first 2 tracers (water)
    288288c$OMP BARRIER
     
    385385          DO l = 1, llm
    386386            massem1(ijb:ije,l)=massescr(ijb:ije,l)
    387           ENDDO
    388 c$OMP END DO NOWAIT      
     387          ENDDO
     388c$OMP END DO NOWAIT 
    389389      END IF
    390390c$OMP BARRIER
Note: See TracChangeset for help on using the changeset viewer.