Changeset d005a67 in flexpart.git for src/readcommand.f90


Ignore:
Timestamp:
May 21, 2019, 1:09:18 PM (5 years ago)
Author:
Sabine <sabine.eckhardt@…>
Branches:
master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug
Children:
f963113, 0a98afe
Parents:
5d74ed9 (diff), 0c8c7f2 (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 remote-tracking branch 'refs/remotes/origin/dev' into dev

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/readcommand.f90

    r20963b1 r0a94e13  
    5050  ! ipin                 1 continue simulation with dumped particle data, 0 no *
    5151  ! ipout                0 no particle dump, 1 every output time, 3 only at end*
     52  ! ipoutfac             increase particle dump interval by factor (default 1) *
    5253  ! itsplit [s]          time constant for particle splitting                  *
    5354  ! loutaver [s]         concentration output is an average over loutaver      *
     
    9798  iout, &
    9899  ipout, &
     100  ipoutfac, &
    99101  lsubgrid, &
    100102  lconvection, &
     
    129131  iout=3
    130132  ipout=0
     133  ipoutfac=1
    131134  lsubgrid=1
    132135  lconvection=1
     
    507510  !****************************************************************
    508511
    509   if ((ipout.ne.0).and.(ipout.ne.1).and.(ipout.ne.2)) then
     512  if ((ipout.ne.0).and.(ipout.ne.1).and.(ipout.ne.2).and.(ipout.ne.3)) then
    510513    write(*,*) ' #### FLEXPART MODEL ERROR! FILE COMMAND:     #### '
    511     write(*,*) ' #### IPOUT MUST BE 1, 2 OR 3!                #### '
     514    write(*,*) ' #### IPOUT MUST BE 0, 1, 2 OR 3!             #### '
    512515    stop
    513516  endif
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG