Changeset f4a4339 in flexpart.git


Ignore:
Timestamp:
Mar 22, 2018, 12:32:12 PM (6 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:
b1e0742, 8d70e43
Parents:
ae43937 (diff), 1e991c1 (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:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • src/netcdf_output_mod.f90

    r0ecc1fe rae43937  
    7676                       ioutputforeachrelease, iflux, mdomainfill, mquasilag, &
    7777                       nested_output, ipout, surf_only, linit_cond, &
    78                        flexversion,mpi_mode
     78                       flexversion,mpi_mode,DRYBKDEP,WETBKDEP
    7979
    8080  use mean_mod
     
    270270  character(len=255)          :: fname
    271271  character(len=15)           :: units
    272   character(len=10)           :: fprefix
     272  character(len=20)           :: fprefix
    273273  character(len=3)            :: anspec
    274274  CHARACTER                   :: adate*8,atime*6,timeunit*32
     
    312312     fprefix = 'grid_time_'
    313313  endif
     314  if (DRYBKDEP) fprefix='grid_drydep_'
     315  if (WETBKDEP) fprefix='grid_wetdep_'
    314316
    315317  if (lnest) then
    316      fname = path(2)(1:length(2))//fprefix//adate//atime//'_nest.nc'
     318     fname = path(2)(1:length(2))//trim(fprefix)//adate//atime//'_nest.nc'
    317319     ncfnamen = fname
    318320     nnx = numxgridn
    319321     nny = numygridn
    320322  else
    321      fname = path(2)(1:length(2))//fprefix//adate//atime//'.nc'
     323     fname = path(2)(1:length(2))//trim(fprefix)//adate//atime//'.nc'
    322324     ncfname = fname
    323325     nnx = numxgrid
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG