Changeset 5f42c27 in flexpart.git


Ignore:
Timestamp:
May 13, 2015, 1:42:50 PM (9 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:
598e9da
Parents:
fb0d416
Message:

Changed path to OH binaries

Files:
2 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • README_PARALLEL.md

    rfb0d416 r5f42c27  
    120120  FLEXPART-MPI is run with no (or just a few) particles, no performance
    121121  improvement is possible. In this case, most processing time is spent
    122   in the 'getfields'-routine (ECMWF).
     122  in the 'getfields'-routine.
    123123
    124124  A) Running without dedicated reader process

  • options/COMMAND

    r5f9d14a r5f42c27  
    1212 CTL= -5.0000000    ,
    1313 IFINE=          4,
    14  IOUT=          1,
     14 IOUT=          9,
    1515 IPOUT=          0,
    1616 LSUBGRID=          1,
    … …  
    2828 SURF_ONLY=          0,
    2929 CBLFLAG=          0,
     30 OHFIELDS_PATH=          "../../flexin/",
    3031 /

  • options/OUTGRID

    rf9ce123 r5f42c27  
    66********************************************************************************
    77
     81.  ------.----       4X,F11.4
     9      -179.0000       GEOGRAFICAL LONGITUDE OF LOWER LEFT CORNER OF OUTPUT GRID
     10    OUTLONLEFT        (left boundary of the first grid cell - not its centre)
    811
    9       -179.0000
     122.  ------.----       4X,F11.4
     13       -90.0000       GEOGRAFICAL LATITUDE OF LOWER LEFT CORNER OF OUTPUT GRID
     14    OUTLATLOWER       (lower boundary of the first grid cell - not its centre)
     15
     163.  -----             4X,I5
     17     720               NUMBER OF GRID POINTS IN X DIRECTION (= No. of cells + 1)
     18    NUMXGRID
     19
     204.  -----             4X,I5
     21     360             NUMBER OF GRID POINTS IN Y DIRECTION (= No. of cells + 1)
     22    NUMYGRID
     23
     245.  ------.---        4X,F10.3
     25         0.50        GRID DISTANCE IN X DIRECTION
     26    DXOUTLON
     27
     286.  ------.---        4X,F10.3
     29         0.50        GRID DISTANCE IN Y DIRECTION
     30    DYOUTLAT
     31
     3210. -----.-           4X, F7.1
     33     1000.0
     34    LEVEL 1           HEIGHT OF LEVEL (UPPER BOUNDARY)
     35
     3610. -----.-           4X, F7.1
     37     2000.0
     38    LEVEL 2           HEIGHT OF LEVEL (UPPER BOUNDARY)
     39
     4010. -----.-           4X, F7.1
     41     3000.0
     42    LEVEL 3           HEIGHT OF LEVEL (UPPER BOUNDARY)
     43
     4410. -----.-           4X, F7.1
     45     4000.0
     46    LEVEL 4           HEIGHT OF LEVEL (UPPER BOUNDARY)
     47
     4810. -----.-           4X, F7.1
     49     5000.0
     50    LEVEL 5           HEIGHT OF LEVEL (UPPER BOUNDARY)
     51
     5210. -----.-           4X, F7.1
     53     6000.0
     54    LEVEL 6           HEIGHT OF LEVEL (UPPER BOUNDARY)
     55
     5610. -----.-           4X, F7.1
     57     7000.0
     58    LEVEL 7           HEIGHT OF LEVEL (UPPER BOUNDARY)
     59
     6010. -----.-           4X, F7.1
     61     8000.0
     62    LEVEL 8           HEIGHT OF LEVEL (UPPER BOUNDARY)
     63
     6410. -----.-           4X, F7.1
     65     9000.0
     66    LEVEL 9           HEIGHT OF LEVEL (UPPER BOUNDARY)
     67
     6810. -----.-           4X, F7.1
     69    10000.0
     70    LEVEL10           HEIGHT OF LEVEL (UPPER BOUNDARY)
     71
     7210. -----.-           4X, F7.1
     73    11000.0
     74    LEVEL11           HEIGHT OF LEVEL (UPPER BOUNDARY)
     75
     7610. -----.-           4X, F7.1
     77    12000.0
     78    LEVEL12           HEIGHT OF LEVEL (UPPER BOUNDARY)
     79
     8010. -----.-           4X, F7.1
     81    13000.0
     82    LEVEL13           HEIGHT OF LEVEL (UPPER BOUNDARY)
     83
     8410. -----.-           4X, F7.1
     85    14000.0
     86    LEVEL14           HEIGHT OF LEVEL (UPPER BOUNDARY)
     87
     8810. -----.-           4X, F7.1
     89    15000.0
     90    LEVEL15           HEIGHT OF LEVEL (UPPER BOUNDARY)
     91
     9210. -----.-           4X, F7.1
     93    16000.0
     94    LEVEL16           HEIGHT OF LEVEL (UPPER BOUNDARY)
     95
     9610. -----.-           4X, F7.1
     97    17000.0
     98    LEVEL17           HEIGHT OF LEVEL (UPPER BOUNDARY)
     99
     10010. -----.-           4X, F7.1
     101    18000.0
     102    LEVEL18           HEIGHT OF LEVEL (UPPER BOUNDARY)
     103
     10410. -----.-           4X, F7.1
     105    19000.0
     106    LEVEL19           HEIGHT OF LEVEL (UPPER BOUNDARY)
     107
     10810. -----.-           4X, F7.1
     109    20000.0
     110    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     111
     11210. -----.-           4X, F7.1
     113    21000.0
     114    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     115
     11610. -----.-           4X, F7.1
     117    22000.0
     118    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     119
     12010. -----.-           4X, F7.1
     121    23000.0
     122    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     123
     12410. -----.-           4X, F7.1
     125    24000.0
     126    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     127
     12810. -----.-           4X, F7.1
     129    25000.0
     130    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     131
     13210. -----.-           4X, F7.1
     133    26000.0
     134    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     135
     13610. -----.-           4X, F7.1
     137    27000.0
     138    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     139
     14010. -----.-           4X, F7.1
     141    28000.0
     142    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     143
     14410. -----.-           4X, F7.1
     145    29000.0
     146    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     147
     14810. -----.-           4X, F7.1
     149    30000.0
     150    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     151
     15210. -----.-           4X, F7.1
     153    40000.0
     154    LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    10155
    11156
    12 
    13        -90.0000
    14 
    15 
    16 
    17       360
    18 
    19 
    20 
    21       180
    22 
    23 
    24 
    25          1.000
    26 
    27 
    28 
    29          1.000
    30 
    31 
    32 
    33       400.0
    34 
    35 
    36 
    37      1000.0
    38 
    39 
    40 
    41      2000.0
    42 
    43 
    44 
    45      3000.0
    46 
    47 
    48 
    49      5000.0
    50 
    51 
    52 
    53      7000.0
    54 
    55 
    56 
    57      9000.0
    58 
    59 
    60 
    61     12000.0
    62 
    63 
    64 
    65     15000.0
    66 
    67 
    68 
    69     20000.0
    70 
    71 
    72 
    73     50000.0
    74 
    75 
    76 

  • options/RELEASES

    rfb0d416 r5f42c27  
    1616 ZKIND=     1,
    1717 MASS=  2.0000E8    ,
    18  PARTS=   20000000
     18 PARTS=   2000000
    1919 COMMENT="TEST1                          ",
    2020 /
    … …  
    3232 ZKIND=     1,
    3333 MASS=  2.0000E8    ,
    34  PARTS=   20000000
     34 PARTS=   2000000
    3535 COMMENT="TEST2                          ",
    3636 /

  • options/SPECIES/SPECIES_108

    rf9ce123 r5f42c27  
    33*     Input file for the Lagrangian particle dispersion model FLEXPART     *
    44*               Definition file of chemical species/radionuclides          *
    5 * ESO: edited to work with Rona's changes+Henrik                           *
     5*     This file is on the format required by version 10 (05/2015)          *
    66****************************************************************************
    77SO2                Tracer name
    … …  
    1919-9.99              Alternative: dry deposition velocity
    2020 64.00             molweight
    21 -1.35E-14           OH Reaction rate - C [cm^3/molecule/sec]
     211.35E-14           OH Reaction rate - C [cm^3/molecule/sec]
    2222120.0              OH Reaction rate - D [K]
    23232.0                OH Reaction rate - N (no unit)

  • src/FLEXPART.f90

    r8a65cb0 r5f42c27  
    6969
    7070  ! FLEXPART version string
    71   flexversion='Version 10.0pre  (2015-03-01)'
     71  flexversion='Version 10.0beta (2015-05-01)'
    7272  verbosity=0
    7373

  • src/FLEXPART_MPI.f90

    rfb0d416 r5f42c27  
    7777
    7878  ! FLEXPART version string
    79   flexversion='Ver. 10.0pre MPI (2015-03-01)'
     79  flexversion='Ver. 10 Beta MPI (2015-05-01)'
    8080  verbosity=0
    8181
    … …  
    337337
    338338  if (mp_measure_time) call mpif_mtime('iotime',0)
    339 ! :DEV: was a bug here (all processes writing)?
    340339  if (lroot) then ! MPI: this part root process only
    341340

  • src/com_mod.f90

    rf9ce123 r5f42c27  
    2626  integer :: length(numpath+2*maxnests)
    2727  character(len=256) :: pathfile, flexversion, arg1, arg2
     28  character(len=256) :: ohfields_path
    2829 
    2930  ! path                    path names needed for trajectory model
    … …  
    3233  ! flexversion             version of flexpart
    3334  ! arg                     input arguments from launch at command line
     35  ! ohfields_path           path to binary files for OH fields
    3436
    3537  !********************************************************

  • src/makefile

    rfb0d416 r5f42c27  
    3636
    3737## COMPILERS
    38 #F90       = /usr/bin/gfortran
    39 F90       = ${HOME}/gcc-4.9.1/bin/gfortran
     38F90       = /usr/bin/gfortran
     39#F90      = ${HOME}/gcc-4.9.1/bin/gfortran
    4040#MPIF90    = ${HOME}/opt/bin/mpifort
    4141#MPIF90    = mpif90.mpich
    42 #MPIF90    = mpif90.openmpi
    43 MPIF90    = mpifort
     42MPIF90    = mpif90.openmpi
     43#MPIF90    = mpifort
    4444
    4545## OPTIMIZATION LEVEL
    … …  
    5151
    5252## 1) System libraries at NILU
    53 # INCPATH1 = /usr/include
    54 # INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
    55 # LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
    56 # LIBPATH2 = /usr/lib/x86_64-linux-gnu
     53INCPATH1 = /usr/include
     54#INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
     55LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
     56#LIBPATH2 = /usr/lib/x86_64-linux-gnu
    5757
    5858## 2) Home-made libraries
    59 INCPATH1  = ${HOME}/include
     59# INCPATH1  = ${HOME}/include
    6060INCPATH2  = /homevip/flexpart/include/
    6161LIBPATH2 = /homevip/flexpart/lib/
    62 LIBPATH1 = ${HOME}/lib
    63 #LIBPATH2 = ${HOME}/lib
     62# LIBPATH1 = ${HOME}/lib
    6463
    6564FFLAGS   = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) -mtune=native -fuse-linker-plugin $(FUSER) # -march=native
    … …  
    191190%.o: %.mod
    192191
     192ecmwf: $(FLEXPART-ECMWF)
     193ecmwf: FC := $(F90)
     194
    193195ecmwf-mpi: $(FLEXPART-ECMWF-MPI)
    194196ecmwf-mpi: FC := $(MPIF90)
    … …  
    199201ecmwf-mpi-dbg: FC := $(MPIF90)
    200202
    201 ecmwf: $(FLEXPART-ECMWF)
    202 ecmwf: FC := $(F90)
    203 
    204203gfs: $(FLEXPART-GFS)
    205204gfs: FC := $(F90)
    … …  
    210209#all: $(FLEXPART-ECMWF-MPI)
    211210
     211$(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)
     212        +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)
     213
    212214$(FLEXPART-ECMWF-MPI): $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) $(OBJECTS_ECMWF_MPI)
    213215        +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \
    … …  
    219221        +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \
    220222        $(OBJECTS_ECMWF_MPI) $(LDFLAGS)
    221 
    222 $(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)
    223         +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)
    224223
    225224$(FLEXPART-GFS): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_GFS)

  • src/mpi_mod.f90

    rfb0d416 r5f42c27  
    117117  logical, parameter :: mp_dbg_out = .false.
    118118  logical, parameter :: mp_time_barrier=.true.
    119   logical, parameter :: mp_measure_time=.true.
     119  logical, parameter :: mp_measure_time=.false.
    120120
    121121! for measuring CPU/Wall time
    … …  
    139139  real(dp) :: mp_conccalc_time_beg, mp_conccalc_time_end, mp_conccalc_time_total=0.
    140140  real(dp) :: mp_total_wtime_beg, mp_total_wtime_end, mp_total_wtime_total=0.
     141  real(dp) :: mp_vt_wtime_beg, mp_vt_wtime_end, mp_vt_wtime_total
     142  real(sp) :: mp_vt_time_beg, mp_vt_time_end, mp_vt_time_total
    141143
    142144! dat_lun           logical unit number for i/o
    … …  
    418420
    419421
    420 
    421422! redefine numpart as 'numpart per process' throughout the code
    422423!**************************************************************
    … …  
    438439
    439440    integer :: i
    440 
    441 
    442 !***********************************************************************
    443 
    444441
    445442! Time for MPI communications
    … …  
    17341731    end if
    17351732
    1736 
    17371733    if ((WETDEP).and.(ldirect.gt.0)) then
    17381734      call MPI_Reduce(wetgriduncn, wetgriduncn0, grid_size2d, mp_pp, MPI_SUM, id_root, &
    … …  
    18521848        mp_io_time_total = mp_io_time_total + (mp_io_time_end - &
    18531849             & mp_io_time_beg)
     1850      end if
     1851
     1852    case ('verttransform')
     1853      if (imode.eq.0) then
     1854        mp_vt_wtime_beg = mpi_wtime()
     1855        call cpu_time(mp_vt_time_beg)
     1856      else
     1857        mp_vt_wtime_end = mpi_wtime()
     1858        call cpu_time(mp_vt_time_end)
     1859
     1860        mp_vt_wtime_total = mp_vt_wtime_total + (mp_vt_wtime_end - &
     1861             & mp_vt_wtime_beg)
     1862        mp_vt_time_total = mp_vt_time_total + (mp_vt_time_end - &
     1863             & mp_vt_time_beg)
    18541864      end if
    18551865
    … …  
    19561966          write(*,FMT='(A60,TR1,F9.2)') 'TOTAL WALL TIME FOR CONCCALC:',&
    19571967               & mp_conccalc_time_total
     1968          ! write(*,FMT='(A60,TR1,F9.2)') 'TOTAL WALL TIME FOR VERTTRANSFORM:',&
     1969          !      & mp_vt_wtime_total
     1970          ! write(*,FMT='(A60,TR1,F9.2)') 'TOTAL CPU TIME FOR VERTTRANSFORM:',&
     1971          !      & mp_vt_time_total
    19581972! NB: the 'flush' function is possibly a gfortran-specific extension
    19591973          call flush()
    … …  
    20212035    subroutine write_data_dbg(array_in, array_name, tstep, ident)
    20222036!***********************************************************************
    2023 ! Write one-dimensional arrays to disk (for debugging purposes)
     2037! Write one-dimensional arrays to file (for debugging purposes)
    20242038!***********************************************************************
    20252039      implicit none

  • src/readOHfield.f90

    rfb0d416 r5f42c27  
    6868    ! open netcdf file
    6969    write(mm,fmt='(i2.2)') m
    70     thefile=trim(path(1))//'OH_FIELDS/'//'geos-chem.OH.2005'//mm//'01.nc'
     70!    thefile=trim(path(1))//'OH_FIELDS/'//'geos-chem.OH.2005'//mm//'01.nc'
     71    thefile=trim(ohfields_path)//'OH_FIELDS/'//'geos-chem.OH.2005'//mm//'01.nc'
    7172    ierr=nf_open(trim(thefile),NF_NOWRITE,nid)
    7273    if(ierr.ne.0) then
    … …  
    162163
    163164  ! open netcdf file
    164   thefile=trim(path(1))//'OH_FIELDS/jrate_average.nc'
     165!  thefile=trim(path(1))//'OH_FIELDS/jrate_average.nc'
     166  thefile=trim(ohfields_path)//'OH_FIELDS/jrate_average.nc'
    165167  ierr=nf_open(trim(thefile),NF_NOWRITE,nid)
    166168  if(ierr.ne.0) then

  • src/readcommand.f90

    r8a65cb0 r5f42c27  
    111111  lnetcdfout, &
    112112  surf_only, &
    113   cblflag
     113  cblflag, &
     114  ohfields_path
    114115
    115116  ! Presetting namelist command
    … …  
    143144  surf_only=0
    144145  cblflag=0
     146  ohfields_path="../../flexin/"
    145147
    146148  ! Open the command file and read user options
    … …  
    232234    if (old) call skplin(3,unitcommand)  !added by mc
    233235    read(unitcommand,*) cblflag          !added by mc
     236
    234237    close(unitcommand)
    235238

  • src/readreleases.f90

    r5f9d14a r5f42c27  
    385385    if (ohcconst(i).gt.0.) then
    386386      OHREA=.true.
    387       write (*,*) 'OHreaction switched on: ',ohcconst(i),i
     387      if (lroot) write (*,*) 'OHreaction switched on: ',ohcconst(i),i
    388388    endif
    389389

  • src/timemanager.f90

    r8a65cb0 r5f42c27  
    657657  if (linit_cond.ge.1) call initial_cond_output(itime)   ! dump initial cond. field
    658658
    659   close(104)
     659  !close(104)
    660660
    661661  ! De-allocate memory and end
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG