Merge pull request #65 from pixalytics-ltd/master

Fix for issue #54
NordicESMhub · Feb 8, 2024 · de74da4 · de74da4
2 parents 1259ec8 + 344dd61
commit de74da4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/tools/c3s/c3s.sh b/tools/c3s/c3s.sh
@@ -7,9 +7,14 @@ if [ -f download.tar.gz ]; then
    cdo -f nc -t ecmwf copy tmpg.grib tmp.nc
 elif [ -f download.zip ]; then
    unzip download.zip
-   cat *.grib > tmp.grib
-   cdo setgridtype,regular tmp.grib tmpg.grib
-   cdo -f nc -t ecmwf copy tmpg.grib tmp.nc
+   files=(*.nc)
+   if [ -e "${files[0]}" ]; then
+     mv ${files[0]} tmp.nc
+   else
+     cat *.grib > tmp.grib
+     cdo setgridtype,regular tmp.grib tmpg.grib
+     cdo -f nc -t ecmwf copy tmpg.grib tmp.nc
+   fi
 elif [ -f download.grib ]; then
    cdo -f nc -t ecmwf copy download.grib tmp.nc
 elif [ -f download.nc ]; then

diff --git a/tools/c3s/c3s.xml b/tools/c3s/c3s.xml
@@ -1,5 +1,5 @@
-<tool id="c3s" name="Copernicus Climate Data Store" version="0.1.0">
-    <description>for retrieveing climate data</description>
+<tool id="c3s" name="Copernicus Climate Data Store" version="0.2.0">
+    <description>for retrieving climate data</description>
     <requirements>
         <requirement type="package" version="3">python</requirement>
         <requirement type="package" version="0.5.1">cdsapi</requirement>