Changes in / [cda0919:6c2627f] in flexpart.git


Ignore:
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed

  • README_PARALLEL.md

    • Property mode changed from 100644 to 100755
    r5f42c27 r1d207bb  
    11
    2                 FLEXPART VERSION 10.0 beta (MPI)
     2                FLEXPART VERSION 9.2.0 (MPI)
    33
    44Description
    … …  
    6262  'numpart' are complemented by variables 'maxpart_mpi' and 'numpart_mpi'
    6363  which are the run-time determined number of particles per process, i.e,
    64   maxpart_mpi = maxpart/np, where np are the number of processes. The variable 'numpart'
     64  maxpart_mpi = maxpart/[number of processes]. The variable 'numpart'
    6565  is still used in the code, but redefined to mean 'number of particles
    6666  per MPI process'
    … …  
    7979  But it is also possible that the
    8080  program will run even faster if the 4th process is participating in
    81   the calculation of particle trajectories instead. This will largely depend on
     81  the calculation of particle trajectories. This will largely depend on
    8282  the problem size (total number of particles in the simulation, resolution
    8383  of grids etc) and hardware being used (disk speed/buffering, memory
    … …  
    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.
     122  in the 'getfields'-routine (ECMWF).
    123123
    124124  A) Running without dedicated reader process
    … …  
    173173    * Nested wind fields
    174174
    175  -The following will most probably not work (untested/under developement):
     175 -The following will probably/possibly not work (untested/under developement):
    176176
    177177    * Backward runs

  • options/AGECLASSES

    • Property mode changed from 100644 to 100755

  • options/COMMAND

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

  • options/COMMAND.alternative

    • Property mode changed from 100644 to 100755

  • options/COMMAND.reference

    • Property mode changed from 100644 to 100755

  • options/IGBP_int1.dat

    • Property mode changed from 100644 to 100755

  • options/OH_7lev_agl.dat

    • Property mode changed from 100644 to 100755

  • options/OUTGRID

    • Property mode changed from 100644 to 100755
    r5f42c27 r60403cd  
    66********************************************************************************
    77
    8 1.  ------.----       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)
    118
    12 2.  ------.----       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 
    16 3.  -----             4X,I5
    17      720               NUMBER OF GRID POINTS IN X DIRECTION (= No. of cells + 1)
    18     NUMXGRID
    19 
    20 4.  -----             4X,I5
    21      360             NUMBER OF GRID POINTS IN Y DIRECTION (= No. of cells + 1)
    22     NUMYGRID
    23 
    24 5.  ------.---        4X,F10.3
    25          0.50        GRID DISTANCE IN X DIRECTION
    26     DXOUTLON
    27 
    28 6.  ------.---        4X,F10.3
    29          0.50        GRID DISTANCE IN Y DIRECTION
    30     DYOUTLAT
    31 
    32 10. -----.-           4X, F7.1
    33      1000.0
    34     LEVEL 1           HEIGHT OF LEVEL (UPPER BOUNDARY)
    35 
    36 10. -----.-           4X, F7.1
    37      2000.0
    38     LEVEL 2           HEIGHT OF LEVEL (UPPER BOUNDARY)
    39 
    40 10. -----.-           4X, F7.1
    41      3000.0
    42     LEVEL 3           HEIGHT OF LEVEL (UPPER BOUNDARY)
    43 
    44 10. -----.-           4X, F7.1
    45      4000.0
    46     LEVEL 4           HEIGHT OF LEVEL (UPPER BOUNDARY)
    47 
    48 10. -----.-           4X, F7.1
    49      5000.0
    50     LEVEL 5           HEIGHT OF LEVEL (UPPER BOUNDARY)
    51 
    52 10. -----.-           4X, F7.1
    53      6000.0
    54     LEVEL 6           HEIGHT OF LEVEL (UPPER BOUNDARY)
    55 
    56 10. -----.-           4X, F7.1
    57      7000.0
    58     LEVEL 7           HEIGHT OF LEVEL (UPPER BOUNDARY)
    59 
    60 10. -----.-           4X, F7.1
    61      8000.0
    62     LEVEL 8           HEIGHT OF LEVEL (UPPER BOUNDARY)
    63 
    64 10. -----.-           4X, F7.1
    65      9000.0
    66     LEVEL 9           HEIGHT OF LEVEL (UPPER BOUNDARY)
    67 
    68 10. -----.-           4X, F7.1
    69     10000.0
    70     LEVEL10           HEIGHT OF LEVEL (UPPER BOUNDARY)
    71 
    72 10. -----.-           4X, F7.1
    73     11000.0
    74     LEVEL11           HEIGHT OF LEVEL (UPPER BOUNDARY)
    75 
    76 10. -----.-           4X, F7.1
    77     12000.0
    78     LEVEL12           HEIGHT OF LEVEL (UPPER BOUNDARY)
    79 
    80 10. -----.-           4X, F7.1
    81     13000.0
    82     LEVEL13           HEIGHT OF LEVEL (UPPER BOUNDARY)
    83 
    84 10. -----.-           4X, F7.1
    85     14000.0
    86     LEVEL14           HEIGHT OF LEVEL (UPPER BOUNDARY)
    87 
    88 10. -----.-           4X, F7.1
    89     15000.0
    90     LEVEL15           HEIGHT OF LEVEL (UPPER BOUNDARY)
    91 
    92 10. -----.-           4X, F7.1
    93     16000.0
    94     LEVEL16           HEIGHT OF LEVEL (UPPER BOUNDARY)
    95 
    96 10. -----.-           4X, F7.1
    97     17000.0
    98     LEVEL17           HEIGHT OF LEVEL (UPPER BOUNDARY)
    99 
    100 10. -----.-           4X, F7.1
    101     18000.0
    102     LEVEL18           HEIGHT OF LEVEL (UPPER BOUNDARY)
    103 
    104 10. -----.-           4X, F7.1
    105     19000.0
    106     LEVEL19           HEIGHT OF LEVEL (UPPER BOUNDARY)
    107 
    108 10. -----.-           4X, F7.1
    109     20000.0
    110     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    111 
    112 10. -----.-           4X, F7.1
    113     21000.0
    114     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    115 
    116 10. -----.-           4X, F7.1
    117     22000.0
    118     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    119 
    120 10. -----.-           4X, F7.1
    121     23000.0
    122     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    123 
    124 10. -----.-           4X, F7.1
    125     24000.0
    126     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    127 
    128 10. -----.-           4X, F7.1
    129     25000.0
    130     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    131 
    132 10. -----.-           4X, F7.1
    133     26000.0
    134     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    135 
    136 10. -----.-           4X, F7.1
    137     27000.0
    138     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    139 
    140 10. -----.-           4X, F7.1
    141     28000.0
    142     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    143 
    144 10. -----.-           4X, F7.1
    145     29000.0
    146     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    147 
    148 10. -----.-           4X, F7.1
    149     30000.0
    150     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
    151 
    152 10. -----.-           4X, F7.1
    153     40000.0
    154     LEVEL20           HEIGHT OF LEVEL (UPPER BOUNDARY)
     9      -179.0000
    15510
    15611
     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/RECEPTORS

    • Property mode changed from 100644 to 100755

  • options/RELEASES.alternative

    • Property mode changed from 100644 to 100755

  • options/RELEASES.reference

    • Property mode changed from 100644 to 100755

  • options/SPECIES/spec_overview

    • Property mode changed from 100644 to 100755

  • options/surfdata.t

    • Property mode changed from 100644 to 100755

  • options/surfdepo.t

    • Property mode changed from 100644 to 100755

  • src/makefile

    r5f42c27 r5f9d14a  
    3333FLEXPART-GFS            = FP_gfs_gfortran
    3434FLEXPART-GFS-MPI        = FP_gfs_MPI
    35 
    3635
    3736## COMPILERS
    … …  
    5150
    5251## 1) System libraries at NILU
    53 INCPATH1 = /usr/include
    54 #INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
     52# INCPATH1 = /usr/include
     53INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
    5554LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
    56 #LIBPATH2 = /usr/lib/x86_64-linux-gnu
     55# LIBPATH2 = /usr/lib/x86_64-linux-gnu
    5756
    5857## 2) Home-made libraries
    59 # INCPATH1  = ${HOME}/include
    60 INCPATH2  = /homevip/flexpart/include/
    61 LIBPATH2 = /homevip/flexpart/lib/
    62 # LIBPATH1 = ${HOME}/lib
    63 
    64 FFLAGS   = -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
    65 
    66 DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace -Warray-bounds  -Wall -fcheck=all $(FUSER)  #  -ffpe-trap=invalid,overflow,denormal,underflow,zero -fdump-core
     58#INCPATH2  = ${HOME}/include
     59INCPATH2  = /homevip/flexpart/include
     60LIBPATH2 = /homevip/flexpart/lib
     61#INCPATH2 = ${HOME}/lib
     62
     63FFLAGS   = -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 $(FUSER) # -march=native
     64DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace -Warray-bounds  -Wall -fcheck=all $(FUSER)  # -ffpe-trap=invalid,overflow,denormal,underflow,zero -fdump-core
    6765
    6866LDFLAGS  = $(FFLAGS) -L$(LIBPATH1) -L$(LIBPATH2) $(LIBS)
    … …  
    190188%.o: %.mod
    191189
    192 ecmwf: $(FLEXPART-ECMWF)
    193 ecmwf: FC := $(F90)
    194 
    195190ecmwf-mpi: $(FLEXPART-ECMWF-MPI)
    196191ecmwf-mpi: FC := $(MPIF90)
    … …  
    201196ecmwf-mpi-dbg: FC := $(MPIF90)
    202197
     198ecmwf: $(FLEXPART-ECMWF)
     199ecmwf: FC := $(F90)
     200
    203201gfs: $(FLEXPART-GFS)
    204202gfs: FC := $(F90)
    … …  
    209207#all: $(FLEXPART-ECMWF-MPI)
    210208
    211 $(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)
    212         +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)
    213 
    214209$(FLEXPART-ECMWF-MPI): $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) $(OBJECTS_ECMWF_MPI)
    215210        +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \
    … …  
    221216        +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \
    222217        $(OBJECTS_ECMWF_MPI) $(LDFLAGS)
     218
     219$(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)
     220        +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)
    223221
    224222$(FLEXPART-GFS): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_GFS)
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG