Changeset 91ce5e7 in flexpart.git


Ignore:
Timestamp:
Mar 1, 2018, 8:42:46 AM (18 months ago)
Author:
Espen Sollum ATMOS <eso@…>
Branches:
dev, release-10, univie
Children:
1e991c1, ae43937
Parents:
7d02c2f (diff), 1f55de1 (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 'dev' of git.nilu.no:flexpart/flexpart into dev

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/makefile

    rfe32dca rccc9ec2  
    5858        LIBPATH1 = ${ROOT_DIR}/lib
    5959
    60 else ifeq ($(gcc), 5.4)
     60else #ifeq ($(gcc), 5.4)
    6161# Compiled libraries under user ~flexpart, gfortran v5.4
    6262        ROOT_DIR = /homevip/flexpart/
     
    6969        LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
    7070
    71 else
     71#else
    7272# Default: System libraries at NILU, gfortran v4.6
    73         F90       = /usr/bin/gfortran
    74         MPIF90    = /usr/bin/mpif90.openmpi
    75 
    76         INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
    77         INCPATH2 = /usr/include
    78         LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
     73#       F90       = /usr/bin/gfortran
     74#       MPIF90    = /usr/bin/mpif90.openmpi
     75
     76#       INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
     77#       INCPATH2 = /usr/include
     78#       LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
    7979endif
    8080
  • src/par_mod.f90

    rc2bd55e r1f55de1  
    148148  ! ECMWF
    149149! integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=359 ! 1.0 degree 92 level
    150    integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
     150  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
    151151! integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359  ! 0.5 degree 138 level
    152152!  integer,parameter :: nxmax=181,nymax=91,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=0  ! CERA 2.0 degree 92 level
     
    160160  !*********************************************
    161161
    162   integer,parameter :: maxnests=1,nxmaxn=451,nymaxn=426
     162  integer,parameter :: maxnests=0,nxmaxn=0,nymaxn=0
    163163
    164164  ! nxmax,nymax        maximum dimension of wind fields in x and y
     
    209209  !integer,parameter :: maxxgrid=361,maxygrid=181,maxxgridn=0,maxygridn=0)
    210210
    211   integer,parameter :: maxreceptor=200
     211  integer,parameter :: maxreceptor=20
    212212
    213213  ! maxreceptor             maximum number of receptor points
     
    218218  !**************************************************
    219219
    220   integer,parameter :: maxpart=30000000
    221   integer,parameter :: maxspec=6
     220  integer,parameter :: maxpart=100000
     221  integer,parameter :: maxspec=1
    222222
    223223  real,parameter :: minmass=0.0001
     
    262262  !*********************************
    263263
    264   integer,parameter :: maxrand=200000000
     264  integer,parameter :: maxrand=1000000
    265265
    266266  ! maxrand                 number of random numbers used
  • src/concoutput_nest.f90

    rdb712a8 r7d02c2f  
    199199
    200200  write(anspec,'(i3.3)') ks
    201   if ((iout.eq.1).or.(iout.eq.3).or.(iout.eq.5)) then
    202     if (ldirect.eq.1) then
    203       open(unitoutgrid,file=path(2)(1:length(2))//'grid_conc_nest_' &
     201 
     202  if (DRYBKDEP.or.WETBKDEP) then !scavdep output
     203      if (DRYBKDEP) &
     204      open(unitoutgrid,file=path(2)(1:length(2))//'grid_drydep_nest_'//adate// &
     205           atime//'_'//anspec,form='unformatted')
     206      if (WETBKDEP) &
     207      open(unitoutgrid,file=path(2)(1:length(2))//'grid_wetdep_nest_'//adate// &
     208           atime//'_'//anspec,form='unformatted')
     209      write(unitoutgrid) itime
     210  else
     211     if ((iout.eq.1).or.(iout.eq.3).or.(iout.eq.5)) then
     212       if (ldirect.eq.1) then
     213         open(unitoutgrid,file=path(2)(1:length(2))//'grid_conc_nest_' &
    204214           //adate// &
    205215           atime//'_'//anspec,form='unformatted')
    206     else
    207       open(unitoutgrid,file=path(2)(1:length(2))//'grid_time_nest_' &
     216       else
     217         open(unitoutgrid,file=path(2)(1:length(2))//'grid_time_nest_' &
    208218           //adate// &
    209219           atime//'_'//anspec,form='unformatted')
    210     endif
    211      write(unitoutgrid) itime
    212    endif
     220       endif
     221       write(unitoutgrid) itime
     222     endif
     223  endif
    213224
    214225  if ((iout.eq.2).or.(iout.eq.3)) then      ! mixing ratio
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG