Ignore:
Timestamp:
Mar 18, 2016, 12:09:23 PM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2434:2457 into testing branch

Location:
LMDZ5/branches/testing
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/dyn3dpar/conf_gcm.F90

    r2258 r2471  
    324324  CALL getin('dissip_deltaz',dissip_deltaz )
    325325  CALL getin('dissip_zref',dissip_zref )
     326
     327  ! ngroup
     328  ngroup=3
     329  CALL getin('ngroup',ngroup)
    326330
    327331  ! top_bound sponge: only active if ok_strato=.true. and iflag_top_bound!=0

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

    r1910 r2471  
    2020#include "comvert.h"
    2121
    22       integer ngroup
    23       parameter (ngroup=3)
     22!     integer ngroup
     23!     parameter (ngroup=3)
    2424
    2525

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

    r1910 r2471  
    1212      REAL q(iip1,jjmax,llmax)
    1313
    14       INTEGER ngroup
    15       PARAMETER (ngroup=3)
     14!     INTEGER ngroup
     15!     PARAMETER (ngroup=3)
    1616
    1717      REAL airecn,qn
    … …  
    3838      LOGICAL, SAVE :: first = .TRUE.
    3939!$OMP THREADPRIVATE(first)
    40       INTEGER,SAVE :: i_index(iim,ngroup)
     40!     INTEGER,SAVE :: i_index(iim,ngroup)
    4141      INTEGER      :: offset
    42       REAL         :: qsum(iim/ngroup)
     42!     REAL         :: qsum(iim/ngroup)
    4343
    4444      IF (first) THEN
    … …  
    143143#include "comgeom2.h"
    144144
    145       INTEGER ngroup
    146       PARAMETER (ngroup=3)
     145!     INTEGER ngroup
     146!     PARAMETER (ngroup=3)
    147147
    148148      REAL airen,airecn
Note: See TracChangeset for help on using the changeset viewer.