Changeset 88d8c3d in flexpart.git for src


Ignore:
Timestamp:
Dec 2, 2015, 2:45:23 PM (8 years ago)
Author:
Espen Sollum ATMOS <eso@…>
Branches:
master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
Children:
d6a0977
Parents:
7f9db1f (diff), 28a024c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'espen' into dev

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/par_mod.f90

    r6b22af9 r4c4261c  
    213213!  integer,parameter :: maxpart=60000000
    214214!  integer,parameter :: maxpart=120000000
    215   integer,parameter :: maxspec=1
     215  integer,parameter :: maxspec=6
    216216
    217217  ! maxpart                 Maximum number of particles

  • src/pathnames

    r6b22af9 rde7afbd  
    11../options/
    2 ../out_clwc_leo/
     2../output/
    33/
    4 /xnilu_wrk/flex_wrk/zhg/ECMWF_CLWC/Availables
     4/xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global/
    55============================================
    6 
    7 ../options_nikos_backwards/
    8 /xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global
    9 /xnilu_wrk/flex_wrk/WIND_FIELDS/NCEP/2010_data_05/AVAILABLE
    106
    117
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG