Changeset 838af6d in flex_extract.git for Testing

Timestamp:

Aug 12, 2020, 9:23:10 AM (4 years ago)

Author:

anphi <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

ec89943

Parents:

4f0a73c (diff), 73308e0 (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'

Location:

Testing

Files:

• Installation/Api_testscripts/test_cdsapi_fluxdata.py (modified) (1 prop)
• Installation/Api_testscripts/test_cdsapi_modellevel.py (modified) (1 diff, 1 prop)
• Installation/Api_testscripts/test_cdsapi_modellevel.py~ (added)
• Installation/Api_testscripts/test_cdsapi_pressurelevel.py (modified) (1 diff, 1 prop)
• Installation/Api_testscripts/test_cdsapi_pressurelevel.py~ (added)
• Installation/Api_testscripts/test_ecmwfapi_member.py (modified) (1 diff, 1 prop)
• Installation/Api_testscripts/test_ecmwfapi_member.py~ (added)
• Installation/Api_testscripts/test_ecmwfapi_public.py (modified) (1 diff, 1 prop)
• Installation/Api_testscripts/test_ecmwfapi_public.py~ (added)
• Installation/First_extraction/run.sh (modified) (1 prop)
• Installation/First_extraction/run_local.sh (modified) (1 prop)
• Installation/First_extraction/run_local_public.sh (modified) (1 prop)
• Installation/setup.sh (modified) (1 prop)
• Installation/setup_local.sh (modified) (1 prop)
• Regression/Unit/Dir/test.test (deleted)
• Regression/Unit/Testfiles/CONTROL.test (modified) (1 diff)

Testing/Installation/Api_testscripts/test_cdsapi_modellevel.py

@@ -8 +8 @@
 c.retrieve('reanalysis-era5-complete',
 {
-        'class'   : 'ea',
-        'expver'  : '1',
-        'stream'  : 'oper',
-        'type'    : 'fc',
-        'step'    : '3/to/12/by/3',
-        'param'   : 't',
-        'levtype' : 'ml',
-        'levelist': '135/to/137',
-        'date'    : '2013-01-01',
-        'time'    : '06/18',
-        'area'    : '50/-5/40/5',
-        'grid'    : '1.0/1.0',
-        'format'  : 'grib',
+  'class'   : 'ea',
+  'expver'  : '1',
+  'stream'  : 'oper',
+  'type'    : 'fc',
+  'step'    : '3/to/12/by/3',
+  'param'   : 't',
+  'levtype' : 'ml',
+  'levelist': '135/to/137',
+  'date'    : '2013-01-01',
+  'time'    : '06/18',
+  'area'    : '50/-5/40/5',
+  'grid'    : '1.0/1.0',
+  'format'  : 'grib',
 }, 'download_era5_cdsapi.grib')

Testing/Installation/Api_testscripts/test_cdsapi_pressurelevel.py

@@ -8 +8 @@
 c.retrieve("reanalysis-era5-pressure-levels",
 {
-        "variable": "temperature",
-        "pressure_level": "1000",
-        "product_type": "reanalysis",
-        "year": "2008",
-        "month": "01",
-        "day": "01",
-        "time": "12:00",
-        "format": "grib"
+ "variable": "temperature",
+ "pressure_level": "1000",
+ "product_type": "reanalysis",
+ "year": "2008",
+ "month": "01",
+ "day": "01",
+ "time": "12:00",
+ "format": "grib"
 },
 "download_cdsapi.grib")

Testing/Installation/Api_testscripts/test_ecmwfapi_member.py

@@ -7 +7 @@
 
 server.retrieve({
-        'stream'    : "oper",
-        'levtype'   : "sfc",
-        'param'     : "165.128/166.128/167.128",
-        'dataset'   : "interim",
-        'step'      : "0",
-        'grid'      : "0.75/0.75",
-        'time'      : "00/06/12/18",
-        'date'      : "2014-07-01/to/2014-07-31",
-        'type'      : "an",
-        'class'     : "ei",
-        'target'    : "download_erainterim_ecmwfapi.grib"
+ 'stream'    : "oper",
+ 'levtype'   : "sfc",
+ 'param'     : "165.128/166.128/167.128",
+ 'dataset'   : "interim",
+ 'step'      : "0",
+ 'grid'      : "0.75/0.75",
+ 'time'      : "00/06/12/18",
+ 'date'      : "2014-07-01/to/2014-07-31",
+ 'type'      : "an",
+ 'class'     : "ei",
+ 'target'    : "download_erainterim_ecmwfapi.grib"
 })

Testing/Installation/Api_testscripts/test_ecmwfapi_public.py

@@ -7 +7 @@
 
 server.retrieve({
-        'stream'    : "enda",
-        'levtype'   : "sfc",
-        'param'     : "165.128/166.128/167.128",
-        'dataset'   : "cera20c",
-        'step'      : "0",
-        'grid'      : "1./1.",
-        'time'      : "00/06/12/18",
-        'date'      : "2000-07-01/to/2000-07-31",
-        'type'      : "an",
-        'class'     : "ep",
-    'number'    : "0",
-        'target'    : "download_cera20c_ecmwfapi.grib"
+ 'stream'    : "enda",
+ 'levtype'   : "sfc",
+ 'param'     : "165.128/166.128/167.128",
+ 'dataset'   : "cera20c",
+ 'step'      : "0",
+ 'grid'      : "1./1.",
+ 'time'      : "00/06/12/18",
+ 'date'      : "2000-07-01/to/2000-07-31",
+ 'type'      : "an",
+ 'class'     : "ep",
+ 'number'    : "0",
+ 'target'    : "download_cera20c_ecmwfapi.grib"
 })

Testing/Regression/Unit/Testfiles/CONTROL.test

@@ -1 +1 @@
 DTIME 3
-TYPE AN FC FC FC FC FC AN FC FC FC FC FC AN FC FC FC FC FC AN FC FC FC FC FC
-TIME 00 00 00 00 00 00 06 00 00 00 00 00 12 12 12 12 12 12 18 12 12 12 12 12
-STEP 00 01 02 03 04 05 00 07 08 09 10 11 00 01 02 03 04 05 00 07 08 09 10 11
+TYPE AN FC FC FC FC FC FC FC FC FC FC FC AN FC FC FC FC FC FC FC FC FC FC FC
+TIME 00 00 00 00 00 00 00 00 00 00 00 00 12 12 12 12 12 12 12 12 12 12 12 12
+STEP 00 01 02 03 04 05 06 07 08 09 10 11 00 01 02 03 04 05 06 07 08 09 10 11
 CLASS EI
 STREAM OPER