Changeset cda0919 in flexpart.git


Ignore:
Timestamp:
May 20, 2015, 2:45:16 PM (9 years ago)
Author:
flexpart <>
Branches:
master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
Children:
478e9e6
Parents:
6c2627f (diff), b724ea3 (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 'espen/dev' into dev

Files:
4 added
2 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • README_PARALLEL.md

    • Property mode changed from 100755 to 100644
    r1d207bb r5f42c27  
    11
    2                 FLEXPART VERSION 9.2.0 (MPI)
     2                FLEXPART VERSION 10.0 beta (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/[number of processes]. The variable 'numpart'
     64  maxpart_mpi = maxpart/np, where np are the 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. This will largely depend on
     81  the calculation of particle trajectories instead. 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 (ECMWF).
     122  in the 'getfields'-routine.
    123123
    124124  A) Running without dedicated reader process
     
    173173    * Nested wind fields
    174174
    175  -The following will probably/possibly not work (untested/under developement):
     175 -The following will most probably not work (untested/under developement):
    176176
    177177    * Backward runs
  • options/AGECLASSES

    • Property mode changed from 100755 to 100644
  • 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/COMMAND.alternative

    • Property mode changed from 100755 to 100644
  • options/COMMAND.reference

    • Property mode changed from 100755 to 100644
  • options/IGBP_int1.dat

    • Property mode changed from 100755 to 100644
  • options/OH_7lev_agl.dat

    • Property mode changed from 100755 to 100644
  • options/OUTGRID

    • Property mode changed from 100755 to 100644
    r60403cd 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/RECEPTORS

    • Property mode changed from 100755 to 100644
  • options/RELEASES.alternative

    • Property mode changed from 100755 to 100644
  • options/RELEASES.reference

    • Property mode changed from 100755 to 100644
  • options/SPECIES/spec_overview

    • Property mode changed from 100755 to 100644
  • options/surfdata.t

    • Property mode changed from 100755 to 100644
  • options/surfdepo.t

    • Property mode changed from 100755 to 100644
  • src/makefile

    r5f9d14a r5f42c27  
    3434FLEXPART-GFS-MPI        = FP_gfs_MPI
    3535
     36
    3637## COMPILERS
    3738F90       = /usr/bin/gfortran
     
    5051
    5152## 1) System libraries at NILU
    52 # INCPATH1 = /usr/include
    53 INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
     53INCPATH1 = /usr/include
     54#INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
    5455LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
    55 # LIBPATH2 = /usr/lib/x86_64-linux-gnu
     56#LIBPATH2 = /usr/lib/x86_64-linux-gnu
    5657
    5758## 2) Home-made libraries
    58 #INCPATH2  = ${HOME}/include
    59 INCPATH2  = /homevip/flexpart/include
    60 LIBPATH2 = /homevip/flexpart/lib
    61 #INCPATH2 = ${HOME}/lib
    62 
    63 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 $(FUSER) # -march=native
    64 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
     59# INCPATH1  = ${HOME}/include
     60INCPATH2  = /homevip/flexpart/include/
     61LIBPATH2 = /homevip/flexpart/lib/
     62# LIBPATH1 = ${HOME}/lib
     63
     64FFLAGS   = -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
     66DBGFLAGS = -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
    6567
    6668LDFLAGS  = $(FFLAGS) -L$(LIBPATH1) -L$(LIBPATH2) $(LIBS)
     
    188190%.o: %.mod
    189191
     192ecmwf: $(FLEXPART-ECMWF)
     193ecmwf: FC := $(F90)
     194
    190195ecmwf-mpi: $(FLEXPART-ECMWF-MPI)
    191196ecmwf-mpi: FC := $(MPIF90)
     
    196201ecmwf-mpi-dbg: FC := $(MPIF90)
    197202
    198 ecmwf: $(FLEXPART-ECMWF)
    199 ecmwf: FC := $(F90)
    200 
    201203gfs: $(FLEXPART-GFS)
    202204gfs: FC := $(F90)
     
    207209#all: $(FLEXPART-ECMWF-MPI)
    208210
     211$(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)
     212        +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)
     213
    209214$(FLEXPART-ECMWF-MPI): $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) $(OBJECTS_ECMWF_MPI)
    210215        +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \
     
    216221        +$(FC) -o $@ $(MODOBJS) $(MPI_MODOBJS) $(OBJECTS) $(OBJECTS_MPI) \
    217222        $(OBJECTS_ECMWF_MPI) $(LDFLAGS)
    218 
    219 $(FLEXPART-ECMWF): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF)
    220         +$(FC) -o $@ $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_ECMWF) $(LDFLAGS)
    221223
    222224$(FLEXPART-GFS): $(MODOBJS) $(OBJECTS) $(OBJECTS_SERIAL) $(OBJECTS_GFS)
  • src/readOHfield.f90

    r5f42c27 rd7aab4b  
    7272    ierr=nf_open(trim(thefile),NF_NOWRITE,nid)
    7373    if(ierr.ne.0) then
     74      write (*,*) 'The OH field at: '//thefile// ' could not be opened'
     75      write (*,*) 'please copy the OH fields there, or change the path in the'
     76      write (*,*) 'COMMAND namelist!'
    7477      write(*,*) nf_strerror(ierr)
    7578      stop
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG