Merge pull request #560 from bbuzz31/reinstate_test3b

Reinstate test3b

CHANGELOG.md

@@ -7,8 +7,11 @@ and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Latest updates:
++ If the processed weather file exists use it; otherwise check if raw exists and covers study area; otherwise download new
++ Update the integration height for raytracing from 50 km to 80 km
++ Reinstate test 3 (slant proj and ray trace), remove unused calls with ZREF
++ Add buffer to W/E for ERA5
 + Add buffer to HRES when downloading as with the other models
-+ Only reuse weather file if the cropped one exists
 + Refactor to pass a weather file directly to fetch
 + Update staged weather models to reflect update to aligned grid
 + Correctly pass buffered bounds when aligning grid

test/__init__.py

@@ -1,6 +1,7 @@
 import os
 import pytest
 import subprocess
+import shutil
 from contextlib import contextmanager
 from pathlib import Path
 
@@ -13,6 +14,7 @@
 DATA_DIR = os.path.join(TEST_DIR, 'data')
 GEOM_DIR = os.path.join(TEST_DIR, 'test_geom')
 WM_DIR   = os.path.join(TEST_DIR, 'weather_files')
+ORB_DIR  = os.path.join(TEST_DIR, 'orbit_files')
 
 WM = 'GMAO'
 
@@ -70,4 +72,9 @@ def makeLatLonGrid(bbox, reg, out_dir, spacing=0.1):
     da_lat.to_netcdf(dst_lat)
     da_lon.to_netcdf(dst_lon)
 
-    return dst_lat, dst_lon
+    return dst_lat, dst_lon
+
+
+def make_delay_name(weather_model_name, date, time, kind='ztd'):
+    assert kind in 'ztd std ray'.split(), 'Incorrect type of delays.'
+    return f'{weather_model_name}_tropo_{date}T{time.replace(":", "")}_{kind}.nc'