Changeset 0ca4976 in flexpart.git

Timestamp:

Mar 4, 2019, 12:39:08 PM (5 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:

3d7eebf, 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:

• src/readspecies.f90 (modified) (2 diffs)
• create_tarball.sh (modified) (3 diffs)

src/readspecies.f90

@@ -101 +101 @@
 
   do j=1,24           ! initialize everything to no variation
+    parea_hour(j)=1.
+    ppoint_hour(j)=1.
     area_hour(pos_spec,j)=1.
     point_hour(pos_spec,j)=1.
   end do
   do j=1,7
+    parea_dow(j)=1.
+    ppoint_dow(j)=1.
     area_dow(pos_spec,j)=1.
     point_dow(pos_spec,j)=1.
   end do
 
-  if (readerror.ne.0) then ! text format input
 ! Open the SPECIES file and read species names and properties
 !************************************************************
@@ -348 +351 @@
 
 
-  endif
-
 22 close(unitspecies)
 

create_tarball.sh

@@ -2 +2 @@
 
 #define version number
-version=10.3beta5
+
+githash=$(git rev-parse --short --verify HEAD)
+
+
+version=10.3beta5_$githash
 
 # define tarball name
 targetdir=../flexpart_distribution/
 tarball_tmp=${targetdir}flexpart_v$version 
+#tarball=${targetdir}flexpart_v$version.tar 
+tarball=${tarball_tmp}.tar 
 
 # clean old package
 if [ -d $tarball_tmp ]; then
-  echo $tarball_tmp exists: move to $tarball_tmp.bk   
-  mv $tarball_tmp ${tarball_tmp}.bk 
+  echo $tarball_tmp exists: move to $tarball_tmp.bk and exit  
+  mkdir $tarball_tmp.bk 
+  mv $tarball_tmp ${tarball_tmp}.bk/ 
+  mv $tarball ${tarball_tmp}.bk/ 
   exit 
 fi
@@ -79 +87 @@
 #cp -r flex_ecmwf_src/* $tarball_tmp/preprocess/flex_extract/
 ## cp -r flex_extract/work/EA* $tarball_tmp/preprocess/flex_extract/work   
+
+echo include flex_extract v7.0.4 b7c1c04a204c91e53759ef590504bf52dfaece64
+flex_extract=../flex_extract_v7.0.4/
+cp $flex_extract/README.md $tarball_tmp/preprocess/flex_extract
+cp -r $flex_extract/docs $tarball_tmp/preprocess/flex_extract
+cp -r $flex_extract/grib_templates $tarball_tmp/preprocess/flex_extract
+cp -r $flex_extract/python $tarball_tmp/preprocess/flex_extract
+cp -r $flex_extract/src $tarball_tmp/preprocess/flex_extract
+
 
 
@@ -175 +192 @@
 # cp -r tests/default_cases $tarball_tmp/tests/
 
-
+tar cvf  $tarball  $tarball_tmp  
+
+echo  $tarball complete
+echo exported untarred files in $tarball_tmp 
 exit
 #return