Changeset 0ca4976 in flexpart.git


Ignore:
Timestamp:
Mar 4, 2019, 12:39:08 PM (5 months ago)
Author:
Ignacio Pisso <ip@…>
Branches:
release-10
Children:
3cd0f17, 941db73
Parents:
a2e9de4 (diff), 77783e3 (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' into release-10

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/readspecies.f90

    rd6a245b rcc6abaa  
    101101
    102102  do j=1,24           ! initialize everything to no variation
     103    parea_hour(j)=1.
     104    ppoint_hour(j)=1.
    103105    area_hour(pos_spec,j)=1.
    104106    point_hour(pos_spec,j)=1.
    105107  end do
    106108  do j=1,7
     109    parea_dow(j)=1.
     110    ppoint_dow(j)=1.
    107111    area_dow(pos_spec,j)=1.
    108112    point_dow(pos_spec,j)=1.
    109113  end do
    110114
    111   if (readerror.ne.0) then ! text format input
    112115! Open the SPECIES file and read species names and properties
    113116!************************************************************
     
    348351
    349352
    350   endif
    351 
    35235322 close(unitspecies)
    353354
  • create_tarball.sh

    ra816416 ra2e9de4  
    22
    33#define version number
    4 version=10.3beta5
     4
     5githash=$(git rev-parse --short --verify HEAD)
     6
     7
     8version=10.3beta5_$githash
    59
    610# define tarball name
    711targetdir=../flexpart_distribution/
    812tarball_tmp=${targetdir}flexpart_v$version
     13#tarball=${targetdir}flexpart_v$version.tar
     14tarball=${tarball_tmp}.tar
    915
    1016# clean old package
    1117if [ -d $tarball_tmp ]; then
    12   echo $tarball_tmp exists: move to $tarball_tmp.bk   
    13   mv $tarball_tmp ${tarball_tmp}.bk
     18  echo $tarball_tmp exists: move to $tarball_tmp.bk and exit 
     19  mkdir $tarball_tmp.bk
     20  mv $tarball_tmp ${tarball_tmp}.bk/
     21  mv $tarball ${tarball_tmp}.bk/
    1422  exit
    1523fi
     
    7987#cp -r flex_ecmwf_src/* $tarball_tmp/preprocess/flex_extract/
    8088## cp -r flex_extract/work/EA* $tarball_tmp/preprocess/flex_extract/work   
     89
     90echo include flex_extract v7.0.4 b7c1c04a204c91e53759ef590504bf52dfaece64
     91flex_extract=../flex_extract_v7.0.4/
     92cp $flex_extract/README.md $tarball_tmp/preprocess/flex_extract
     93cp -r $flex_extract/docs $tarball_tmp/preprocess/flex_extract
     94cp -r $flex_extract/grib_templates $tarball_tmp/preprocess/flex_extract
     95cp -r $flex_extract/python $tarball_tmp/preprocess/flex_extract
     96cp -r $flex_extract/src $tarball_tmp/preprocess/flex_extract
     97
    8198
    8299
     
    175192# cp -r tests/default_cases $tarball_tmp/tests/
    176193
    177 
     194tar cvf  $tarball  $tarball_tmp 
     195
     196echo  $tarball complete
     197echo exported untarred files in $tarball_tmp
    178198exit
    179199#return
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG