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:
5 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

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

    r2298 r2471  
    297297  CALL getin('dissip_deltaz',dissip_deltaz )
    298298  CALL getin('dissip_zref',dissip_zref )
     299
     300  ! ngroup
     301  ngroup=3
     302  CALL getin('ngroup',ngroup)
     303
    299304
    300305  ! top_bound sponge: only active if ok_strato=.true. and iflag_top_bound!=0

  • LMDZ5/branches/testing/libf/dyn3d/gcm.F90

    r2408 r2471  
    157157  use_filtre_fft=.FALSE.
    158158  CALL getin('use_filtre_fft',use_filtre_fft)
    159   IF (use_filtre_fft) call abort_gcm('FFT filter is not available in the ' &
    160           // 'sequential version of the dynamics.', 1)
     159  IF (use_filtre_fft) call abort_gcm("gcm", 'FFT filter is not available in ' &
     160          // 'the sequential version of the dynamics.', 1)
    161161
    162162!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

  • LMDZ5/branches/testing/libf/dyn3d/groupe.F

    r1910 r2471  
    2222#include "comvert.h"
    2323
    24       integer ngroup
    25       parameter (ngroup=3)
     24!     integer ngroup
     25!     parameter (ngroup=3)
    2626
    2727

  • LMDZ5/branches/testing/libf/dyn3d/groupeun.F

    r1910 r2471  
    1313      REAL q(iip1,jjmax,llmax)
    1414
    15       INTEGER ngroup
    16       PARAMETER (ngroup=3)
     15!     INTEGER ngroup
     16!     PARAMETER (ngroup=3)
    1717
    1818      REAL airecn,qn
    … …  
    3737
    3838      LOGICAL, SAVE :: first = .TRUE.
    39       INTEGER,SAVE :: i_index(iim,ngroup)
     39!     INTEGER,SAVE :: i_index(iim,ngroup)
    4040      INTEGER      :: offset
    41       REAL         :: qsum(iim/ngroup)
     41!     REAL         :: qsum(iim/ngroup)
    4242
    4343      IF (first) THEN
    … …  
    142142#include "comgeom2.h"
    143143
    144       INTEGER ngroup
    145       PARAMETER (ngroup=3)
     144!     INTEGER ngroup
     145!     PARAMETER (ngroup=3)
    146146
    147147      REAL airen,airecn
Note: See TracChangeset for help on using the changeset viewer.