--- a/essential_climate_variables.xml	Sun Jul 07 10:06:33 2019 -0400
+++ b/essential_climate_variables.xml	Tue Jun 08 08:57:38 2021 +0000
@@ -1,25 +1,33 @@
-<tool id="cds_essential_variability" name="Copernicus Essential Climate Variables" version="0.1.4">
+<tool id="cds_essential_variability" name="Copernicus Essential Climate Variables" version="0.2.0" profile="20.05">
     <description>for assessing climate variability</description>
     <requirements>
         <requirement type="package" version="3">python</requirement>
-        <requirement type="package" version="0.1.4">cdsapi</requirement>
-        <requirement type="package" version="1.9.6">cdo</requirement>
+        <requirement type="package" version="0.5.1">cdsapi</requirement>
+        <requirement type="package" version="1.9.10">cdo</requirement>
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
-       HOME=`pwd`  &&
-       cp \$COPERNICUS_CDSAPIRC_KEY_FILE .cdsapirc | true &&
+       export HOME=`pwd` &&
+       #set $cdsapirc_file = os.environ.get('COPERNICUS_CDSAPIRC_KEY_FILE', '')
+       #if os.path.isfile(str($cdsapirc_file))
+           echo "xx $cdsapirc_file xx" &&
+           cp $cdsapirc_file .cdsapirc &&
+       #else
+           echo 'use tool cdsapirc file' &&
+           cp '$__tool_directory__/cdsapirc.cfg' .cdsapirc &&
+       #end if
        python3 '$__tool_directory__/ecv_retrieve.py'
             'ecv-for-climate-change' '$variable'
             --month '$month'
         #if str($product_type.product) == 'monthly_mean'
             --year '$product_type.year'
-            --time_aggregation '1_month'
+            --time_aggregation '1_month_mean'
         #else if str($product_type.product) == 'anomaly'
+            --climate_reference_period $product_type.climate_reference_period
             --time_aggregation '$product_type.selector'
             --year '$product_type.year'
         #else
-            --year '2018'
-           --time_aggregation '1_month'
+            --climate_reference_period $product_type.climate_reference_period
+           --time_aggregation '1_month_mean'
         #end if
            --product_type '$product_type.product'
            --format 'tgz' --output 'tmp.tgz'
@@ -43,6 +51,12 @@
                 <option value="climatology">Climatology</option>
                 <option value="anomaly">Anomaly</option>
             </param>
+            <when value="climatology">
+                <param name="climate_reference_period" type="select" multiple="false"  label="Select Climate reference period">
+                    <option value="1981_2010" selected="true">1981-2010</option>
+                    <option value="1991_2020">1991-2020</option>
+                </param>
+            </when>
             <when value="monthly_mean">
                 <param name="year" type="select" multiple="true"  label="Select year(s)">
                     <option value="1979">1979</option>
@@ -85,10 +99,15 @@
                     <option value="2016">2016</option>
                     <option value="2017">2017</option>
                     <option value="2018">2018</option>
-                    <option value="2019" selected="true">2019</option>
+                    <option value="2019">2019</option>
+                    <option value="2020" selected="true">2020</option>
                 </param>
             </when>
             <when value="anomaly">
+                <param name="climate_reference_period" type="select" multiple="false"  label="Select Climate reference period">
+                    <option value="1981_2010" selected="true">1981-2010</option>
+                    <option value="1991_2020">1991-2020</option>
+                </param>
                 <param name="year" type="select" multiple="true"  label="Select year(s)">
                     <option value="1979">1979</option>
                     <option value="1980">1980</option>
@@ -129,11 +148,13 @@
                     <option value="2015">2015</option>
                     <option value="2016">2016</option>
                     <option value="2017">2017</option>
-                    <option value="2018" selected="true">2018</option>
+                    <option value="2018">2018</option>
+                    <option value="2019">2019</option>
+                    <option value="2020" selected="true">2020</option>
                 </param>
                 <param name="selector" type="select" label="Time aggregation">
-                    <option value="12_month" selected="true">yearly</option>
-                    <option value="1_month">monthly</option>
+                    <option value="12_month_running_mean" selected="true">yearly</option>
+                    <option value="1_month_mean">monthly</option>
                 </param>
             </when>
         </conditional>
@@ -205,7 +226,7 @@
 the corresponding anomalies.
 
 
-- ECV Factsheets: https://gcos.wmo.int/en/essential-climate-variables/ecv-factsheets
+- ECV: https://gcos.wmo.int/en/essential-climate-variables
 - Copernicus Climate Data Store documentation on Essential Climate Variables:
   https://cds.climate.copernicus.eu/cdsapp#!/dataset/ecv-for-climate-change?tab=overview
 
@@ -229,4 +250,13 @@
         <citation type="doi">10.1002/qj.828</citation>
         <citation type="doi">10.1002/qj.2949</citation>
     </citations>
+    <edam_topics>
+      <edam_topic>topic_3855</edam_topic>
+      <edam_topic>topic_3318</edam_topic>
+    </edam_topics>
+    <edam_operations>
+      <edam_operation>operation_2422</edam_operation>
+      <edam_operation>operation_3357</edam_operation>
+      <edam_operation>operation_0335</edam_operation>
+    </edam_operations>
 </tool>