Changeset 53d3b2a in flex_extract.git

Timestamp:

Jan 31, 2020, 12:32:29 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

eca358d

Parents:

aad03f2

Message:

added more tests for grib file comparison and removed detected BUGS

Files:

• Source/Python/Classes/EcFlexpart.py (modified) (3 diffs)
• Testing/Regression/Compare_gribfiles/7.1/Controls/CONTROL_CERA.compare (modified) (2 diffs)
• Testing/Regression/Compare_gribfiles/7.1/Controls/CONTROL_EI.compare (modified) (1 diff)
• Testing/Regression/Compare_gribfiles/7.1/Controls/CONTROL_OD.OPER.FC.36hours.compare (modified) (1 diff)
• Testing/Regression/Compare_gribfiles/7.1/Controls/CONTROL_OD.OPER.FC.eta.compare (modified) (1 diff)
• Testing/Regression/Compare_gribfiles/Log/log_2020-01-31_13-17-45 (added)
• Testing/Regression/Compare_gribfiles/run_cmp_test.sh (added)
• Testing/Regression/Compare_gribfiles/test_cmp_grib_file.py (modified) (2 diffs)
• Testing/Regression/Mars_request/test_cmp_mars_requests.py (modified) (1 diff)

Source/Python/Classes/EcFlexpart.py

@@ -321 +321 @@
 
         '''
+        if self.purefc:
+            # need to retrieve forecasts for step 000 in case of pure forecast
+            steps = '{}/to/{}/by/{}'.format(0, self.accmaxstep, self.dtime)
+        else:
+            steps = '{}/to/{}/by/{}'.format(self.dtime,
+                                            self.accmaxstep,
+                                            self.dtime)
+
         self.types[str(self.acctype)] = {'times': str(self.acctime),
-                                         'steps': '{}/to/{}/by/{}'.format(
-                                             self.dtime,
-                                             self.accmaxstep,
-                                             self.dtime)}
+                                         'steps': steps}
         return
 
@@ -781 +786 @@
 
                     elif self.basetime == 0:
-                        retr_param_dict['date'] = \
-                            datetime.strftime(elimit - t24h, '%Y%m%d')
+#                        retr_param_dict['date'] = \
+#                            datetime.strftime(elimit - t24h, '%Y%m%d')
 
                         timesave = ''.join(retr_param_dict['time'])
@@ -1602 +1607 @@
 
             # skip all temporary times
-            # which are outside the retrieval period                
+            # which are outside the retrieval period
             if timestamp < start_period or \
                timestamp > end_period:
                 continue
-                
+
 
             # @WRF

Testing/Regression/Compare_gribfiles/7.1/Controls/CONTROL_CERA.compare

@@ -1 @@
-START_DATE 20090809
+START_DATE 20000908
 DTIME 3
 TYPE AN AN AN AN AN AN AN AN
@@ -21 +21 @@
 PREFIX CE
 ECTRANS 1
+FORMAT GRIB2

Testing/Regression/Compare_gribfiles/7.1/Controls/CONTROL_EI.compare

@@ -1 @@
-START_DATE 20090809 
+START_DATE 20150809 
 DTIME 3
 TYPE AN FC FC FC AN FC FC FC

Testing/Regression/Compare_gribfiles/7.1/Controls/CONTROL_OD.OPER.FC.36hours.compare

@@ -21 +21 @@
 PREFIX FC
 ECTRANS 1
+FORMAT GRIB2

Testing/Regression/Compare_gribfiles/7.1/Controls/CONTROL_OD.OPER.FC.eta.compare

@@ -14 +14 @@
 RESOL 799
 ETA 1
+CWC 1
 FORMAT GRIB2
 PREFIX ENE

Testing/Regression/Compare_gribfiles/test_cmp_grib_file.py

@@ -11 +11 @@
 Note
 ----
+
+Licence:
+--------
+    (C) Copyright 2014-2019.
+
+    SPDX-License-Identifier: CC-BY-4.0
+
+    This work is licensed under the Creative Commons Attribution 4.0
+    International License. To view a copy of this license, visit
+    http://creativecommons.org/licenses/by/4.0/ or send a letter to
+    Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 
 
@@ -23 +34 @@
 import os
 import sys
+from datetime import datetime
 from eccodes import GribFile, GribMessage
 

Testing/Regression/Mars_request/test_cmp_mars_requests.py

@@ -23 +23 @@
 It is necessary to have a directory named after the version number of
 flex_extract. For example: "7.0.3" and "7.1".
+
+Licence:
+--------
+    (C) Copyright 2014-2019.
+
+    SPDX-License-Identifier: CC-BY-4.0
+
+    This work is licensed under the Creative Commons Attribution 4.0
+    International License. To view a copy of this license, visit
+    http://creativecommons.org/licenses/by/4.0/ or send a letter to
+    Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 
 Example