Changeset a756649 in flexpart.git


Ignore:
Timestamp:
Aug 10, 2020, 10:21:22 AM (4 years ago)
Author:
Espen Sollum <eso@…>
Branches:
GFS_025, dev
Children:
f3054ea
Parents:
c56da45
Message:

Minor modifications in dev branch

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • pathnames

    ra263405 ra756649  
    1 ./options/
    2 ./output/
    3 ./preprocess/flex_extract/work/
    4 ./AVAILABLE
     1./options_test/
     2./output_test/
     3/
     4/xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global

  • src/FLEXPART.f90

    r7952ca4 ra756649  
    8383  verbosity=0
    8484
     85  write(*,*) "flexversion: ", flexversion
     86
    8587  ! Read the pathnames where input/output files are stored
    8688  !*******************************************************

  • src/com_mod.f90

    r07c3e71 ra756649  
    2525  !****************************************************************
    2626
    27   character :: path(numpath+2*maxnests)*120
     27  character :: path(numpath+2*maxnests)*200
    2828  integer :: length(numpath+2*maxnests)
    2929  character(len=256) :: pathfile, flexversion, flexversion_major, arg1, arg2

  • src/gributils/class_gribfile_mod.f90

    r61e07ba ra756649  
    7878        ! module
    7979
    80         USE grib_api
     80        use grib_api
    8181
    8282        IMPLICIT NONE

  • src/gridcheck_ecmwf.f90

    r61e07ba ra756649  
    7373  !**********************************************************************
    7474
    75   use grib_api
     75  use eccodes
    7676  use par_mod
    7777  use com_mod

  • src/gridcheck_gfs.f90

    rd8eed02 ra756649  
    7474  !**********************************************************************
    7575
    76   use grib_api
     76  use eccodes
    7777  use par_mod
    7878  use com_mod

  • src/gridcheck_nests.f90

    rdb712a8 ra756649  
    3737  !*****************************************************************************
    3838
    39   use grib_api
     39  use eccodes
    4040  use par_mod
    4141  use com_mod

  • src/par_mod.f90

    r25b4532 ra756649  
    151151  ! ECMWF
    152152! integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=359 ! 1.0 degree 92 level
    153 !  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=0 ! 1.0 degree 138 level
     153  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=0 ! 1.0 degree 138 level
    154154!   integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
    155155! integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359  ! 0.5 degree 138 level
    … …  
    157157
    158158! GFS
    159    integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138
    160    integer :: nxshift=0 ! shift not fixed for the executable
     159   ! integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138
     160   ! integer :: nxshift=0 ! shift not fixed for the executable
    161161
    162162
    … …  
    223223  !**************************************************
    224224
    225   integer,parameter :: maxpart=100000
    226   integer,parameter :: maxspec=1
     225  integer,parameter :: maxpart=10000000
     226  integer,parameter :: maxspec=6
    227227
    228228  real,parameter :: minmass=0.0001

  • src/readwind_ecmwf.f90

    re199b83 ra756649  
    6666!**********************************************************************
    6767
    68   use grib_api
     68  use eccodes
    6969  use par_mod
    7070  use com_mod

  • src/readwind_gfs.f90

    r5d74ed9 ra756649  
    6565  !***********************************************************************
    6666
    67   use grib_api
     67  use eccodes
    6868  use par_mod
    6969  use com_mod

  • src/readwind_nests.f90

    re199b83 ra756649  
    4040  !*****************************************************************************
    4141
    42   use grib_api
     42  use eccodes
    4343  use par_mod
    4444  use com_mod

  • src/timemanager.f90

    r2eefa58 ra756649  
    112112! integer :: ksp
    113113  integer :: loutnext,loutstart,loutend
    114   integer :: ix,jy,ldeltat,itage,nage,idummy
     114  integer :: ix,jy,ldeltat,itage,nage,idummy,idummy2
    115115  integer :: i_nan=0,ii_nan,total_nan_intl=0  !added by mc to check instability in CBL scheme
    116116  real :: outnum,weight,prob_rec(maxspec),prob(maxspec),decfact,wetscav
    … …  
    599599       do ks=1,nspec
    600600         if  ((xscav_frac1(j,ks).lt.0)) then
    601             call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy,wetscav)
     601            call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy2,wetscav)
    602602            if (wetscav.gt.0) then
    603603                xscav_frac1(j,ks)=wetscav* &

  • src/writeheader.f90

    r6ecb30a ra756649  
    100100  !*****************************************************************************
    101101
     102  write(*,*) "writeheader/nspec", nspec
     103 
    102104  write(unitheader) 3*nspec,maxpointspec_act
    103105  do i=1,nspec
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG