Merge branch 'dev' into sss_dfbug

dbekaert · Aug 15, 2023 · c73b1c7 · c73b1c7
2 parents 147fc97 + 097205f
commit c73b1c7
Show file tree

Hide file tree

Showing 39 changed files with 121 additions and 343 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 + Fix bug in fillna3D for NaNs at elevations higher than present in the weather model
 + write delays even if they contain nans
 + check that the aoi is contained within HRRR extent
++ streamline some unit tests to remove downloading
 + move the ray building out of the _build_cube_ray and into its own function for cleaner testing
 + update the tests to use the new build_ray function
 + If the processed weather file exists use it; otherwise check if raw exists and covers study area; otherwise download new

diff --git a/test/scenario_5/hgt.hdr b/test/scenario_5/hgt.hdr
diff --git a/test/scenario_5/hgt.rdr b/test/scenario_5/hgt.rdr
diff --git a/test/scenario_5/hgt.rdr.aux.xml b/test/scenario_5/hgt.rdr.aux.xml
diff --git a/test/scenario_5/lat.hdr b/test/scenario_5/lat.hdr
diff --git a/test/scenario_5/lat.rdr b/test/scenario_5/lat.rdr
diff --git a/test/scenario_5/lat.rdr.aux.xml b/test/scenario_5/lat.rdr.aux.xml
diff --git a/test/scenario_5/lat.rdr.vrt b/test/scenario_5/lat.rdr.vrt
diff --git a/test/scenario_5/lon.hdr b/test/scenario_5/lon.hdr
diff --git a/test/scenario_5/lon.rdr b/test/scenario_5/lon.rdr
diff --git a/test/scenario_5/lon.rdr.aux.xml b/test/scenario_5/lon.rdr.aux.xml
diff --git a/test/scenario_5/lon.rdr.vrt b/test/scenario_5/lon.rdr.vrt
diff --git a/test/scenario_5/los.hdr b/test/scenario_5/los.hdr
diff --git a/test/scenario_5/los.rdr b/test/scenario_5/los.rdr
diff --git a/test/scenario_5/los.rdr.vrt b/test/scenario_5/los.rdr.vrt
diff --git a/test/scenario_5/warpedDEM.dem b/test/scenario_5/warpedDEM.dem
diff --git a/test/scenario_5/warpedDEM.dem.vrt b/test/scenario_5/warpedDEM.dem.vrt
diff --git a/test/scenario_5/warpedDEM.hdr b/test/scenario_5/warpedDEM.hdr
diff --git a/test/scenario_5/wmtype b/test/scenario_5/wmtype
diff --git a/test/scenario_5/wrfout_d01_2010-06-25 b/test/scenario_5/wrfout_d01_2010-06-25
diff --git a/test/scenario_5/wrfplev_d01_2010-06-25 b/test/scenario_5/wrfplev_d01_2010-06-25
diff --git a/test/scenario_6/lat.hdr b/test/scenario_6/lat.hdr
@@ -1,9 +1,14 @@
 ENVI
-samples = 226
-lines   = 45
+description = {
+lat.rdr}
+samples = 7
+lines   = 7
 bands   = 1
 header offset = 0
 file type = ENVI Standard
-data type = 5
+data type = 4
 interleave = bsq
 byte order = 0
+band names = {
+Band 1}
+data ignore value = -9999
diff --git a/test/scenario_6/lat.rdr b/test/scenario_6/lat.rdr
diff --git a/test/scenario_6/lat.rdr.aux.xml b/test/scenario_6/lat.rdr.aux.xml
@@ -0,0 +1,31 @@
+<PAMDataset>
+  <Metadata domain="IMAGE_STRUCTURE">
+    <MDI key="INTERLEAVE">BAND</MDI>
+  </Metadata>
+  <Metadata>
+    <MDI key="Band_1">Band 1</MDI>
+  </Metadata>
+  <Metadata domain="ENVI">
+    <MDI key="bands">1</MDI>
+    <MDI key="band_names">{Band 1}</MDI>
+    <MDI key="byte_order">0</MDI>
+    <MDI key="data_ignore_value">-9999</MDI>
+    <MDI key="data_type">4</MDI>
+    <MDI key="description">{lat.rdr}</MDI>
+    <MDI key="file_type">ENVI Standard</MDI>
+    <MDI key="header_offset">0</MDI>
+    <MDI key="interleave">bsq</MDI>
+    <MDI key="lines">7</MDI>
+    <MDI key="samples">7</MDI>
+  </Metadata>
+  <PAMRasterBand band="1">
+    <NoDataValue>-9.99900000000000E+03</NoDataValue>
+    <Metadata>
+      <MDI key="STATISTICS_MAXIMUM">16.536458969116</MDI>
+      <MDI key="STATISTICS_MEAN">16.150135176522</MDI>
+      <MDI key="STATISTICS_MINIMUM">15.763768196106</MDI>
+      <MDI key="STATISTICS_STDDEV">0.25285638219246</MDI>
+      <MDI key="STATISTICS_VALID_PERCENT">100</MDI>
+    </Metadata>
+  </PAMRasterBand>
+</PAMDataset>
diff --git a/test/scenario_6/lat.rdr.vrt b/test/scenario_6/lat.rdr.vrt
diff --git a/test/scenario_6/lon.hdr b/test/scenario_6/lon.hdr
@@ -1,9 +1,14 @@
 ENVI
-samples = 226
-lines   = 45
+description = {
+lon.rdr}
+samples = 7
+lines   = 7
 bands   = 1
 header offset = 0
 file type = ENVI Standard
-data type = 5
+data type = 4
 interleave = bsq
 byte order = 0
+band names = {
+Band 1}
+data ignore value = -9999
diff --git a/test/scenario_6/lon.rdr b/test/scenario_6/lon.rdr
diff --git a/test/scenario_6/lon.rdr.aux.xml b/test/scenario_6/lon.rdr.aux.xml
@@ -2,22 +2,30 @@
   <Metadata domain="IMAGE_STRUCTURE">
     <MDI key="INTERLEAVE">BAND</MDI>
   </Metadata>
+  <Metadata>
+    <MDI key="Band_1">Band 1</MDI>
+  </Metadata>
   <Metadata domain="ENVI">
     <MDI key="bands">1</MDI>
+    <MDI key="band_names">{Band 1}</MDI>
     <MDI key="byte_order">0</MDI>
-    <MDI key="data_type">5</MDI>
+    <MDI key="data_ignore_value">-9999</MDI>
+    <MDI key="data_type">4</MDI>
+    <MDI key="description">{lon.rdr}</MDI>
     <MDI key="file_type">ENVI Standard</MDI>
     <MDI key="header_offset">0</MDI>
     <MDI key="interleave">bsq</MDI>
-    <MDI key="lines">45</MDI>
-    <MDI key="samples">226</MDI>
+    <MDI key="lines">7</MDI>
+    <MDI key="samples">7</MDI>
   </Metadata>
   <PAMRasterBand band="1">
+    <NoDataValue>-9.99900000000000E+03</NoDataValue>
     <Metadata>
-      <MDI key="STATISTICS_MAXIMUM">0</MDI>
-      <MDI key="STATISTICS_MEAN">-96.050506796609</MDI>
-      <MDI key="STATISTICS_MINIMUM">-101.6383676311</MDI>
-      <MDI key="STATISTICS_STDDEV">19.143507420765</MDI>
+      <MDI key="STATISTICS_MAXIMUM">-100.44786071777</MDI>
+      <MDI key="STATISTICS_MEAN">-100.56314943275</MDI>
+      <MDI key="STATISTICS_MINIMUM">-100.67877960205</MDI>
+      <MDI key="STATISTICS_STDDEV">0.057789502319966</MDI>
+      <MDI key="STATISTICS_VALID_PERCENT">100</MDI>
     </Metadata>
   </PAMRasterBand>
 </PAMDataset>
diff --git a/test/scenario_6/lon.rdr.vrt b/test/scenario_6/lon.rdr.vrt
diff --git a/test/scenario_6/stations.csv b/test/scenario_6/stations.csv
@@ -0,0 +1,4 @@
+ID,Lat,Lon,Hgt_m
+HOOT,33.10514,-116.78536,617.21204
+TORP,33.79780,-118.33060,-5.21643
+
diff --git a/test/scenario_6/warpedDEM.dem b/test/scenario_6/warpedDEM.dem
diff --git a/test/scenario_6/warpedDEM.dem.aux.xml b/test/scenario_6/warpedDEM.dem.aux.xml
diff --git a/test/scenario_6/warpedDEM.hdr b/test/scenario_6/warpedDEM.hdr
diff --git a/test/scenario_6/wmtype b/test/scenario_6/wmtype