Changeset 8e85db7 in flexpart.git


Ignore:
Timestamp:
Nov 12, 2019, 12:51:47 PM (4 years ago)
Author:
Ignacio Pisso <ip@…>
Branches:
master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug
Children:
1bed61d
Parents:
adead08 (diff), c56da45 (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 ​https://git.nilu.no/flexpart/flexpart

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • src/advance.f90

    r5184a7c r7abd262  
    123123  real :: rhoa,rhograd,delz,dtf,rhoaux,dtftlw,uxscale,wpscale
    124124  integer(kind=2) :: icbt
    125   real,parameter :: eps=nxmax/3.e5,eps2=1.e-9
     125  real,parameter :: eps=nxmax/3.e5,eps2=1.e-9,eps3=tiny(1.0)
    126126  real :: ptot_lhh,Q_lhh,phi_lhh,ath,bth !modified by mc
    127127  real :: old_wp_buf,dcas,dcas1,del_test !added by mc
    … …  
    537537        if (lsettling) then
    538538          do nsp=1,nspec
    539             if (xmass(nrelpoint,nsp).gt.eps2) exit
     539            if (xmass(nrelpoint,nsp).gt.eps3) exit
    540540          end do
    541541          if (nsp.gt.nspec) then
    542   ! This should never happen         
    543             write(*,*) 'advance.f90: ERROR: could not find releasepoint'
    544             stop
     542            nsp=nspec
    545543          end if
    546544          if (density(nsp).gt.0.) then
    … …  
    707705    if (lsettling) then
    708706      do nsp=1,nspec
    709         if (xmass(nrelpoint,nsp).gt.eps2) exit
     707        if (xmass(nrelpoint,nsp).gt.eps3) exit
    710708      end do
    711709      if (nsp.gt.nspec) then
    712   ! This should never happen         
    713         write(*,*) 'advance.f90: ERROR: could not find releasepoint'
    714         stop
     710        nsp=nspec
    715711      end if
    716712      if (density(nsp).gt.0.) then
    … …  
    917913    if (lsettling) then
    918914      do nsp=1,nspec
    919         if (xmass(nrelpoint,nsp).gt.eps2) exit
     915        if (xmass(nrelpoint,nsp).gt.eps3) exit
    920916      end do
    921917      if (nsp.gt.nspec) then
    922   ! This should never happen         
    923         write(*,*) 'advance.f90: ERROR: could not find releasepoint'
    924         stop
     918        nsp=nspec
    925919      end if
    926920      if (density(nsp).gt.0.) then

  • src/makefile

    r2eefa58 rc56da45  
    251251
    252252## DEPENDENCIES
    253 get_vdep_prob.o: cmapf_mod.o com_mod.o hanna_mod.o interpol_mod.o par_mod.o \
    254         point_mod.o random_mod.o
    255253advance.o: cmapf_mod.o com_mod.o hanna_mod.o interpol_mod.o par_mod.o \
    256254        point_mod.o random_mod.o
    … …  
    260258        random_mod.o
    261259calcfluxes.o: com_mod.o flux_mod.o outg_mod.o par_mod.o
    262 calcmatrix.o: com_mod.o conv_mod.o par_mod.o class_gribfile_mod.o
    263 calcpar.o: com_mod.o par_mod.o class_gribfile_mod.o
     260calcmatrix.o: com_mod.o conv_mod.o par_mod.o
     261calcpar.o: com_mod.o par_mod.o
    264262calcpar_nests.o: com_mod.o par_mod.o
    265263calcpv.o: com_mod.o par_mod.o
    … …  
    273271conccalc.o: com_mod.o outg_mod.o par_mod.o unc_mod.o
    274272conccalc_mpi.o: com_mod.o mpi_mod.o outg_mod.o par_mod.o unc_mod.o
    275 concoutput.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o mean_mod.o
    276 concoutput_inversion.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o mean_mod.o
    277 concoutput_mpi.o: com_mod.o mpi_mod.o outg_mod.o par_mod.o point_mod.o \
    278         unc_mod.o mean_mod.o
    279 concoutput_nest.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o mean_mod.o
    280 concoutput_inversion_nest.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o mean_mod.o
    281 concoutput_nest_mpi.o: com_mod.o mpi_mod.o outg_mod.o par_mod.o point_mod.o \
    282         unc_mod.o mean_mod.o
    283 concoutput_surf.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o mean_mod.o
    284 concoutput_surf_mpi.o: com_mod.o mpi_mod.o outg_mod.o par_mod.o point_mod.o \
    285         unc_mod.o mean_mod.o
    286 concoutput_surf_nest.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o mean_mod.o
    287 concoutput_surf_nest_mpi.o: com_mod.o mpi_mod.o outg_mod.o par_mod.o \
    288         point_mod.o unc_mod.o mean_mod.o
     273concoutput.o: com_mod.o mean_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o
     274concoutput_inversion.o: com_mod.o mean_mod.o outg_mod.o par_mod.o point_mod.o \
     275        unc_mod.o
     276concoutput_inversion_nest.o: com_mod.o mean_mod.o outg_mod.o par_mod.o \
     277        point_mod.o unc_mod.o
     278concoutput_mpi.o: com_mod.o mean_mod.o mpi_mod.o outg_mod.o par_mod.o \
     279        point_mod.o unc_mod.o
     280concoutput_nest.o: com_mod.o mean_mod.o outg_mod.o par_mod.o point_mod.o \
     281        unc_mod.o
     282concoutput_nest_mpi.o: com_mod.o mean_mod.o mpi_mod.o outg_mod.o par_mod.o \
     283        point_mod.o unc_mod.o
     284concoutput_surf.o: com_mod.o mean_mod.o outg_mod.o par_mod.o point_mod.o \
     285        unc_mod.o
     286concoutput_surf_mpi.o: com_mod.o mean_mod.o mpi_mod.o outg_mod.o par_mod.o \
     287        point_mod.o unc_mod.o
     288concoutput_surf_nest.o: com_mod.o mean_mod.o outg_mod.o par_mod.o point_mod.o \
     289        unc_mod.o
     290concoutput_surf_nest_mpi.o: com_mod.o mean_mod.o mpi_mod.o outg_mod.o \
     291        par_mod.o point_mod.o unc_mod.o
    289292conv_mod.o: par_mod.o
    290293convect43c.o: conv_mod.o par_mod.o
    291 convmix.o: com_mod.o conv_mod.o flux_mod.o par_mod.o class_gribfile_mod.o
     294convmix.o: com_mod.o conv_mod.o flux_mod.o par_mod.o
    292295coordtrafo.o: com_mod.o par_mod.o point_mod.o
    293 detectformat.o: com_mod.o par_mod.o class_gribfile_mod.o
     296detectformat.o: com_mod.o par_mod.o
    294297distance.o: par_mod.o
    295298distance2.o: par_mod.o
    … …  
    297300drydepokernel_nest.o: com_mod.o par_mod.o unc_mod.o
    298301erf.o: par_mod.o
    299 FLEXPART.o: com_mod.o conv_mod.o par_mod.o point_mod.o random_mod.o netcdf_output_mod.o class_gribfile_mod.o
    300 FLEXPART_MPI.o: com_mod.o conv_mod.o mpi_mod.o par_mod.o point_mod.o \
    301         random_mod.o netcdf_output_mod.o class_gribfile_mod.o
     302FLEXPART.o: com_mod.o conv_mod.o netcdf_output_mod.o par_mod.o point_mod.o \
     303        random_mod.o
     304FLEXPART_MPI.o: com_mod.o conv_mod.o mpi_mod.o netcdf_output_mod.o par_mod.o \
     305        point_mod.o random_mod.o
    302306fluxoutput.o: com_mod.o flux_mod.o outg_mod.o par_mod.o
    303307get_settling.o: com_mod.o par_mod.o
    304 getfields.o: com_mod.o par_mod.o class_gribfile_mod.o
    305 getfields_mpi.o: com_mod.o par_mod.o mpi_mod.o class_gribfile_mod.o
     308get_vdep_prob.o: com_mod.o interpol_mod.o par_mod.o point_mod.o
     309get_wetscav.o: com_mod.o par_mod.o point_mod.o
     310getfields.o: com_mod.o par_mod.o
     311getfields_mpi.o: com_mod.o mpi_mod.o par_mod.o
    306312gethourlyOH.o: com_mod.o oh_mod.o par_mod.o
    307313getrb.o: par_mod.o
    … …  
    309315getvdep.o: com_mod.o par_mod.o
    310316getvdep_nests.o: com_mod.o par_mod.o
     317grib2check.o: com_mod.o par_mod.o
    311318gridcheck_ecmwf.o: cmapf_mod.o com_mod.o conv_mod.o par_mod.o
    312 gridcheck_emos.o: com_mod.o conv_mod.o par_mod.o
    313 gridcheck_fnl.o: cmapf_mod.o com_mod.o conv_mod.o par_mod.o
    314319gridcheck_gfs.o: cmapf_mod.o com_mod.o conv_mod.o par_mod.o
    315 gridcheck_gfs_emos.o: com_mod.o conv_mod.o par_mod.o
    316320gridcheck_nests.o: com_mod.o par_mod.o
    317 gridcheck_nests_emos.o: com_mod.o par_mod.o
    318 gridcheck_orig_ecmwf.o: cmapf_mod.o com_mod.o conv_mod.o par_mod.o
    319321hanna.o: com_mod.o hanna_mod.o par_mod.o
    320322hanna1.o: com_mod.o hanna_mod.o par_mod.o
    321323hanna_short.o: com_mod.o hanna_mod.o par_mod.o
    322324init_domainfill.o: com_mod.o par_mod.o point_mod.o random_mod.o
    323 init_domainfill_mpi.o: com_mod.o mpi_mod.o par_mod.o point_mod.o \
    324         random_mod.o
     325init_domainfill_mpi.o: com_mod.o mpi_mod.o par_mod.o point_mod.o random_mod.o
    325326initial_cond_calc.o: com_mod.o outg_mod.o par_mod.o unc_mod.o
    326327initial_cond_output.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o
    327 initial_cond_output_inversion.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o
     328initial_cond_output_inversion.o: com_mod.o outg_mod.o par_mod.o point_mod.o \
     329        unc_mod.o
    328330initialize.o: com_mod.o hanna_mod.o interpol_mod.o par_mod.o random_mod.o
    329331initialize_cbl_vel.o: com_mod.o par_mod.o random_mod.o
    … …  
    344346mean_mod.o: par_mod.o
    345347mpi_mod.o: com_mod.o par_mod.o unc_mod.o
    346 netcdf_output_mod.o: com_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o mean_mod.o
    347 obukhov.o: par_mod.o class_gribfile_mod.o
     348netcdf_output_mod.o: com_mod.o mean_mod.o outg_mod.o par_mod.o point_mod.o \
     349        unc_mod.o
     350obukhov.o: par_mod.o
    348351ohreaction.o: com_mod.o oh_mod.o par_mod.o
    349352openouttraj.o: com_mod.o par_mod.o point_mod.o
    … …  
    353356outgrid_init_nest.o: com_mod.o outg_mod.o par_mod.o unc_mod.o
    354357part0.o: par_mod.o
    355 partdep.o: par_mod.o
    356 partpos_average.o: com_mod.o par_mod.o
     358partdep.o: com_mod.o par_mod.o
    357359partoutput.o: com_mod.o par_mod.o
    358360partoutput_average.o: com_mod.o par_mod.o
    359 partoutput_average_mpi.o: com_mod.o par_mod.o mpi_mod.o
     361partoutput_average_mpi.o: com_mod.o mpi_mod.o par_mod.o
    360362partoutput_mpi.o: com_mod.o mpi_mod.o par_mod.o
    361363partoutput_short.o: com_mod.o par_mod.o
    362364partoutput_short_mpi.o: com_mod.o mpi_mod.o par_mod.o
     365partpos_average.o: com_mod.o par_mod.o
    363366pbl_profile.o: par_mod.o
    364 plumetraj.o: com_mod.o par_mod.o point_mod.o mean_mod.o
     367plumetraj.o: com_mod.o mean_mod.o par_mod.o point_mod.o
    365368psih.o: par_mod.o
    366369psim.o: par_mod.o
    … …  
    372375readdepo.o: com_mod.o par_mod.o
    373376readlanduse.o: com_mod.o par_mod.o
    374 #readlanduse_int1.o: com_mod.o par_mod.o
    375377readOHfield.o: com_mod.o oh_mod.o par_mod.o
    376378readoutgrid.o: com_mod.o outg_mod.o par_mod.o
    … …  
    383385readspecies.o: com_mod.o par_mod.o
    384386readwind_ecmwf.o: com_mod.o par_mod.o
     387readwind_ecmwf_mpi.o: com_mod.o mpi_mod.o par_mod.o
    385388readwind_emos.o: com_mod.o par_mod.o
    386389readwind_gfs.o: com_mod.o par_mod.o
    387 readwind_gfs_emos.o: com_mod.o par_mod.o
    388 readwind_ecmwf_mpi.o: com_mod.o mpi_mod.o par_mod.o
    389390readwind_nests.o: com_mod.o par_mod.o
    390 readwind_nests_emos.o: com_mod.o par_mod.o
    391391redist.o: com_mod.o conv_mod.o par_mod.o random_mod.o
    392392redist_mpi.o: com_mod.o conv_mod.o mpi_mod.o par_mod.o random_mod.o
    393 releaseparticles.o: com_mod.o par_mod.o point_mod.o random_mod.o \
    394         xmass_mod.o
     393releaseparticles.o: com_mod.o par_mod.o point_mod.o random_mod.o xmass_mod.o
    395394releaseparticles_mpi.o: com_mod.o mpi_mod.o par_mod.o point_mod.o \
    396395        random_mod.o xmass_mod.o
    397 richardson.o: par_mod.o class_gribfile_mod.o
     396richardson.o: par_mod.o
    398397scalev.o: par_mod.o
    399398shift_field.o: par_mod.o
    … …  
    401400timemanager.o: com_mod.o flux_mod.o netcdf_output_mod.o oh_mod.o outg_mod.o \
    402401        par_mod.o point_mod.o unc_mod.o xmass_mod.o
    403 timemanager_mpi.o: com_mod.o flux_mod.o mpi_mod.o oh_mod.o outg_mod.o \
    404         par_mod.o point_mod.o unc_mod.o xmass_mod.o netcdf_output_mod.o
     402timemanager_mpi.o: com_mod.o flux_mod.o mpi_mod.o netcdf_output_mod.o \
     403        oh_mod.o outg_mod.o par_mod.o point_mod.o unc_mod.o xmass_mod.o
    405404unc_mod.o: par_mod.o
    406 verttransform_ecmwf.o: cmapf_mod.o com_mod.o par_mod.o 
     405verttransform_ecmwf.o: cmapf_mod.o com_mod.o par_mod.o
    407406verttransform_gfs.o: cmapf_mod.o com_mod.o par_mod.o
    408407verttransform_nests.o: com_mod.o par_mod.o
    409 get_wetscav.o: com_mod.o par_mod.o point_mod.o
    410408wetdepo.o: com_mod.o par_mod.o point_mod.o
    411409wetdepokernel.o: com_mod.o par_mod.o unc_mod.o
    412410wetdepokernel_nest.o: com_mod.o par_mod.o unc_mod.o
    413411writeheader.o: com_mod.o outg_mod.o par_mod.o point_mod.o
    414 writeprecip.o: com_mod.o par_mod.o point_mod.o
    415412writeheader_nest.o: com_mod.o outg_mod.o par_mod.o point_mod.o
    416413writeheader_nest_surf.o: com_mod.o outg_mod.o par_mod.o point_mod.o
    417414writeheader_surf.o: com_mod.o outg_mod.o par_mod.o point_mod.o
    418415writeheader_txt.o: com_mod.o outg_mod.o par_mod.o point_mod.o
     416writeprecip.o: com_mod.o par_mod.o point_mod.o
    419417zenithangle.o: par_mod.o

  • create_tarball.sh

    r941db73 re4925fb  
    11#!/bin/bash
     2# Ignacio Pisso, May 2017
    23
    34echo CREATE A NEW FLEXPART DISTRIBUTION
    45
    5 #define version number
     6# get current commit hash
    67githash=$(git rev-parse --short --verify HEAD)
    78echo githash $githash
    8 
    9 version=10.3.1_$githash
     9#define version number with hash
     10version=10.4_$githash
    1011echo version $version 
    1112
    … …  
    1415echo targetdir $targetdir
    1516
     17# name distribution version
    1618distribution_name=flexpart_v$version
    1719
     20# name distribution temporary dir
    1821tarball_tmp=${targetdir}flexpart_v$version
    1922echo tarball_tmp $tarball_tmp
    2023
     24# name distribution tarball file
    2125#tarball=${targetdir}flexpart_v$version.tar
    2226tarball=${tarball_tmp}.tar
    2327echo tarball $tarball
    2428
    25 # clean old package
     29# if needed clean old package
    2630if [ -d $tarball_tmp ]; then
    2731  echo
    … …  
    3842fi
    3943
     44# start packing
     45
     46
     47## needs in addition to the git repo ANCILLARY git repos
     48# VERIFY THESE RESOURCES EXIST BEFORE PACKING DISTRIBUTION
     49#1 OH file OH_variables.bin || OH_variables=../flexin/OH_FIELDS/OH_variables.bin
     50#2 flex_extract || flex_extract=../flex_extract_v7.0.4/
     51#3 flex_read_fortran from ../flex_read_matlab/export_basic  TODO: add functions to ../flex_read_matlab/export/
     52#  flex_read_matlab_src=../flex_read_matlab/export_basic
     53#4 tests/examples ../flex_tests_examples/examples3/*
     54#5 
     55#6
     56
     57
     58
     59
     60# mkdir container
    4061echo ---------------------------------------------------------
    4162echo ')' create basis dir $tarball_tmp
    … …  
    4566echo
    4667
     68# patnames
    4769echo ---------------------------------------------------------
    4870echo ')' copy pathnames
    … …  
    5375echo
    5476
     77# fortran source files
    5578echo ---------------------------------------------------------
    5679echo ')' copy src/
    … …  
    6285#cp src/makefile.gfs $tarball_tmp/src
    6386echo ---------------------------------------------------------
    64 ################################################################
    65 
    66 echo
    67 
     87
     88echo
     89
     90# options dir
    6891echo ---------------------------------------------------------
    6992echo ')' copy options/
     93echo ---------------------------------------------------------
    7094# (for the distribution they work with the defult flex_ecmwf test winds)
    7195#cp -r options_flex_ecmwf_EA $tarball_tmp/options
    7296mkdir $tarball_tmp/options
    73 
    7497user_input_files="AGECLASSES     COMMAND        IGBP_int1.dat  OUTGRID        OUTGRID_NEST   RECEPTORS      RELEASES       surfdata.t     surfdepo.t"
    75 
    7698for i in $user_input_files
    7799do
    … …  
    80102  #echo copy $i to $tarball_tmp/options
    81103done
    82 
    83 
    84104mkdir $tarball_tmp/options/SPECIES
    85105cp options/SPECIES/SPECIES* $tarball_tmp/options/SPECIES/
    86106cp options/SPECIES/specoverview.f90 $tarball_tmp/options/SPECIES/
    87107echo copy options/SPECIES/ to $tarball_tmp/options/SPECIES/
    88 
    89 echo ---------------------------------------------------------
    90 
    91 echo
    92 
     108echo ---------------------------------------------------------
     109
     110echo
     111
     112# OH file
     113echo ---------------------------------------------------------
     114echo ')' copy OH_variables.bin to flexin
     115mkdir $tarball_tmp/flexin
     116OH_variables=../flexin/OH_FIELDS/OH_variables.bin
     117cp $OH_variables $tarball_tmp/flexin/
     118echo ---------------------------------------------------------
     119
     120echo
     121
     122# AVAILABLE
    93123echo ---------------------------------------------------------
    94124echo ')' copy AVAILABLE
    … …  
    99129echo
    100130
     131# output
    101132echo ---------------------------------------------------------
    102133echo  ')' create output/ #  mkdir $tarball_tmp/output
    103134mkdir $tarball_tmp/output
    104135echo ---------------------------------------------------------
    105 ################################################################
    106 
    107 echo
    108 
     136echo output reference?
     137echo ---------------------------------------------------------
     138
     139echo
     140
     141# preprocess
    109142echo ---------------------------------------------------------
    110143echo ')' preprocess/
    111144mkdir $tarball_tmp/preprocess
    112 
    113 echo
    114 
    115145echo -----------------flex_extract-------------------
    116146#echo '6)'  mkdir $tarball_tmp/flex_extract [a separate repository]
    … …  
    118148#mkdir $tarball_tmp/preprocess/flex_ecmwf
    119149mkdir $tarball_tmp/preprocess/flex_extract
    120 
    121150#echo '7)  add ECMWF retrieve routines (change EA wind files for latest source code)'
    122151#mkdir $tarball_tmp/preprocess/flex_extract
    … …  
    125154#cp -r flex_ecmwf_src/* $tarball_tmp/preprocess/flex_extract/
    126155## cp -r flex_extract/work/EA* $tarball_tmp/preprocess/flex_extract/work   
    127 
    128156flex_extract=../flex_extract_v7.0.4/
    129157echo include flex_extract v7.0.4 b7c1c04a204c91e53759ef590504bf52dfaece64
    130158echo from $flex_extract [use git modules?] IP 3/2018
    131 
    132159cp $flex_extract/README.md $tarball_tmp/preprocess/flex_extract
    133160cp -r $flex_extract/docs $tarball_tmp/preprocess/flex_extract
    … …  
    137164echo flex_extract copied
    138165echo ---------------------------------------------------------
    139 
     166echo AVAILABLE generation scripts?
     167echo ---------------------------------------------------------
    140168
    141169#echo '10)' cp example generating scripts [a separate repository]
    142170#echo moved below
    143 
    144171#mkdir $tarball_tmp/examples
    145172#cp -r examples/*.sh $tarball_tmp/examples/
    … …  
    148175echo
    149176
    150 echo ---------------------------------------------------------
    151 ################################################################
     177# postprocess
     178echo ---------------------------------------------------------
    152179echo ')' postprocess/
    153180
    … …  
    155182mkdir $tarball_tmp/$postprocess
    156183echo -----------------flex_read_fortran-------------------
     184flex_read_fortran_src=$postprocess/flex_read_fortran/
    157185#echo ')'  directory for reading routines
    158186#echo '12)'  add fortran reading routines [a separate repository]
    … …  
    161189cp $postprocess/flex_read_fortran/*.f90 $tarball_tmp/$postprocess/flex_read_fortran
    162190cp $postprocess/flex_read_fortran/makefile $tarball_tmp/$postprocess/flex_read_fortran
    163 echo flex_read_fortran copied
     191echo flex_read_fortran copied from $flex_read_fortran_src
    164192
    165193echo -----------------flex_read_matlab-------------------
    166 echo flex_read_fortran NOT copied
    167 
     194flex_read_matlab_src=../flex_read_matlab/export_basic
     195mkdir $tarball_tmp/$postprocess/flex_read_matlab
     196cp -r $flex_read_matlab_src/* $tarball_tmp/$postprocess/flex_read_matlab
     197echo flex_read_fortran from $flex_read_matlab_src  # NOT copied
    168198# add matlab reading routines
    169199#mkdir $tarball_tmp/postprocess/flex_read_matlab
    … …  
    178208#echo '13) tests'
    179209mkdir $tarball_tmp/tests
    180 echo -----------------flex_read_fortran-------------------
     210#echo -----------------flex_read_fortran-------------------
    181211#echo 'b) ./tests/flex_read_fortran/'
    182 echo fixme
     212#echo fixme
    183213#mkdir $tarball_tmp/tests/flex_read_fortran
    184214#cp tests/flex_read_fortran/test_read_default.sh  $tarball_tmp/tests/flex_read_fortran
    … …  
    186216
    187217###############################################################
    188 echo -----------------examples-------------------
     218echo ----------------- examples -------------------
    189219
    190220#echo ') ./tests/examples/'
    191221mkdir $tarball_tmp/tests/examples
    192 echo ') scripts'
    193 cp -r ./tests/examples/*.sh $tarball_tmp/tests/examples/
    194 echo ') makefile'
    195 cp -r ./tests/examples/Makefile $tarball_tmp/tests/examples/
    196 
     222#echo ') scripts'
     223#cp -r ./tests/examples/*.sh $tarball_tmp/tests/examples/
     224#echo ') makefile'
     225#cp -r ./tests/examples/Makefile $tarball_tmp/tests/examples/
    197226# echo USAGE: ~/repos/flexpart/tests/examples'$' make run
    198 
    199 
    200 ###############################################################
    201 echo -----------------postprocess examples-------------------
    202 echo --read examples-------------------
     227cp -r ../flex_tests_examples/examples3/* $tarball_tmp/tests/examples/
     228
     229echo ----------------- examples_reference -------------------
     230cp -r ./tests/examples_reference $tarball_tmp/tests/
     231
     232
     233
     234###############################################################
     235# echo -----------------postprocess examples-------------------
     236echo -----------------read examples-------------------
    203237
    204238#echo '13 c) ./tests/read_examples/'
    205239mkdir $tarball_tmp/tests/read_examples
     240
     241cp tests/read_examples/declare_examples $tarball_tmp/tests/read_examples/
     242cp tests/read_examples/display_examples.sh $tarball_tmp/tests/read_examples/
     243cp tests/read_examples/examples_output.txt $tarball_tmp/tests/read_examples/
     244cp tests/read_examples/read_examples.sh $tarball_tmp/tests/read_examples/
    206245cp tests/read_examples/read_grids.sh $tarball_tmp/tests/read_examples/
     246cp tests/read_examples/read_parts.sh $tarball_tmp/tests/read_examples/
     247cp tests/read_examples/set_examples_all $tarball_tmp/tests/read_examples/
     248cp tests/read_examples/set_examples_3.sh $tarball_tmp/tests/read_examples/
    207249cp tests/read_examples/read_headers.sh $tarball_tmp/tests/read_examples/
    208 
     250cp tests/read_examples/read_examples_output.txt $tarball_tmp/tests/ #read_examples/
    209251# echo USAGE ~/repos/flexpart/tests/read_examples'$'./read_grids.sh
    210252
    211253###############################################################
    212 echo --compare examples-------------------
     254echo ------------compare examples-------------------
    213255#echo tests/compare_examples.sh
     256mkdir $tarball_tmp/tests/compare_examples
     257
    214258
    215259#mkdir $tarball_tmp/tests/compare_examples
    216260#cp tests/compare_examples/compare_grids.sh $tarball_tmp/tests/compare_examples
    217 cp tests/compare_grids.sh $tarball_tmp/tests/
     261#cp tests/compare_grids.sh $tarball_tmp/tests/
     262cp tests/compare_examples/*.sh $tarball_tmp/tests/compare_examples
     263cp tests/compare_examples/compare_grids_output.txt $tarball_tmp/tests/ #compare_examples
    218264# list of examples with units
    219 cp tests/declare_examples $tarball_tmp/tests/
     265#cp tests/declare_examples $tarball_tmp/tests/
    220266
    221267echo
    … …  
    249295echo  tarball $tarball complete
    250296echo exported untarred files in $tarball_tmp
     297
     298echo cp -r preprocess/flex_extract/work $tarball_tmp/preprocess/flex_extract/
     299echo cd $tarball_tmp/src
     300echo $HOME/repos/flexpart/src/make_in_laptop.sh
     301echo cd .. ';' ./src/FLEXPART
     302echo cd postprocess/flex_read_fortran
     303echo make test
     304echo  max:  0.115784094     mean:   4.70877676E-05
     305#echo cd $tarball_tmp/tests/examples ';'   make run
     306echo cd ../../tests/examples ';'   make run
     307#echo cd $tarball_tmp/tests/read_examples
     308echo cd ../read_examples
     309echo ./read_examples.sh
     310echo ./read_examples.sh '>' ../read_examples_output.txt
     311echo cd ../compare_examples
     312echo ./compare_grids.sh
     313echo ./compare_grids.sh '>' ../compare_grids_output.txt
     314
     315echo e.g. tar --append --file=$tarball_tmp/ ../compare_grids_output.txt ../read_examples_output.txt
     316 
     317 
     318
     319
    251320exit
    252321#return

  • src/FLEXPART.f90

    r7952ca4 radead08  
    8080  ! FLEXPART version string
    8181  flexversion_major = '10' ! Major version number, also used for species file names
    82   flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-23)'
     82  flexversion='Version '//trim(flexversion_major)//'.4 (2019-11-12)'
    8383  verbosity=0
    8484
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG