# HG changeset patch
# User climate
# Date 1561302971 14400
# Node ID b9d9fe0c2ce7d2d511f7c1e56686fc5a0079dbc6
# Parent 8b30be2cef817e88461c618f17bd6f4e850a1f83
planemo upload for repository https://github.com/NordicESMhub/galaxy-tools/tree/master/tools/essential_climate_variables commit 6045302c39c9c11fb6a73966a364cc395f2f9b28
diff -r 8b30be2cef81 -r b9d9fe0c2ce7 README.md
--- a/README.md Tue May 07 03:26:08 2019 -0400
+++ b/README.md Sun Jun 23 11:16:11 2019 -0400
@@ -9,9 +9,23 @@
The CDS API Key needs to be:
- located in a file called `.cdsapirc`in the HOME area
- (as defined the `HOME` environment variable).
- - or passed in an enviroment variable called `GALAXY_COPERNICUS_CDSAPIRC`.
- When passed in `GALAXY_COPERNICUS_CDSAPIRC`, make sure the key does not contain
- the string `key: ` but the key itself only (starting with a number). The file
- `.cdsapirc` will then be created and placed in the HOME area (using HOME
- environment variable).
+ (as defined the `HOME` environment variable).
+ The file `.cdsapirc` should look like that:
+
+```
+url: https://cds.climate.copernicus.eu/api/v2
+key: 111:8789787-qwerz4e47-888-not-real
+verify: 0
+```
+ - or passed in an enviroment variable called `GALAXY_COPERNICUS_CDSAPIRC_KEY`.
+ This environment variable should contain a string that looks like that:
+```
+111:8789787-qwerz4e47-888-not-real
+```
+ When passed in `GALAXY_COPERNICUS_CDSAPIRC_KEY`, make sure the key does not
+ contain the string `key: ` but the key itself only (starting with a number).
+ The file `.cdsapirc` will then be created and placed in the HOME area (using
+ HOME environment variable).
+ - or use `GALAXY_COPERNICUS_CDSAPIRC_KEY_FILE` to specify where your key file
+ is stored on your system.
+
diff -r 8b30be2cef81 -r b9d9fe0c2ce7 ecv_retrieve.py
--- a/ecv_retrieve.py Tue May 07 03:26:08 2019 -0400
+++ b/ecv_retrieve.py Sun Jun 23 11:16:11 2019 -0400
@@ -34,7 +34,11 @@
self.time_aggregation = '1_month'
else:
self.time_aggregation = time_aggregation
- self.area = area
+ if area == '':
+ self.area = 'global'
+ else:
+ self.area = area
+
if format == '':
self.format = 'tgz'
else:
@@ -57,6 +61,7 @@
'variable': self.variable,
'year': self.year,
'month': self.month,
+ 'origin': 'era5',
'area': self.area,
'format': self.format,
'product_type': self.product_type,
diff -r 8b30be2cef81 -r b9d9fe0c2ce7 essential_climate_variables.xml
--- a/essential_climate_variables.xml Tue May 07 03:26:08 2019 -0400
+++ b/essential_climate_variables.xml Sun Jun 23 11:16:11 2019 -0400
@@ -7,21 +7,27 @@
/dev/null | true &&
python3 '$__tool_directory__/ecv_retrieve.py'
'ecv-for-climate-change' '$variable'
- --year '$year'
- #if str($time_aggregation.selector) == '1_month'
- --month '$time_aggregation.month'
+ --month '$month'
+ #if str($product_type.product) == 'monthly_mean'
+ --year '$product_type.year'
+ --time_aggregation '1_month'
+ #else if str($product_type.product) == 'anomaly'
+ --time_aggregation '$product_type.selector'
+ --year '$product_type.year'
#else
- --month '01'
+ --year '2018'
+ --time_aggregation '1_month'
#end if
- --time_aggregation '$time_aggregation.selector'
- --product_type '$product_type'
+ --product_type '$product_type.product'
--format 'tgz' --output 'tmp.tgz'
--verbose &&
tar zxvf tmp.tgz &&
- cat *.grib > tmp.grib &&
- cdo -f nc -t ecmwf copy tmp.grib tmp.nc
+ cat *.grib > tmpg.grib &&
+ cdo remapcon,$adv.resol -setgridtype,regular tmpg.grib tmp.grib &&
+ cdo -f nc -t ecmwf copy tmp.grib tmp.nc
]]>
@@ -29,78 +35,129 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -108,17 +165,23 @@
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
diff -r 8b30be2cef81 -r b9d9fe0c2ce7 test-data/prep_seaice.nc
Binary file test-data/prep_seaice.nc has changed
diff -r 8b30be2cef81 -r b9d9fe0c2ce7 test-data/soil_moisture.nc
Binary file test-data/soil_moisture.nc has changed