Verification clean up

verification/clean.sh

@@ -1,10 +1,16 @@
-rm tests/*/*.tif*
-rm tests/*/*.gpkg
-rm tests/*/output/*.png
-rm tests/*/output/*.fds
-rm tests/*/output/*.bingeom
-rm tests/*/output/*.*info
-rm tests/*/output/*.smv
-rm tests/*/output/*.ge*
-rm tests/*/output/*.txt
-rm tests/*/output/.sinfo
+#!/usr/bin/env bash
+
+rm -f tests/log.txt
+
+rm -f tests/*/*.tif*
+rm -f tests/*/*.gpkg
+
+rm -f tests/*/output/*.png
+rm -f tests/*/output/*.fds
+rm -f tests/*/output/*.bingeom
+rm -f tests/*/output/*.*info
+rm -f tests/*/output/*.smv
+rm -f tests/*/output/*.ge*
+rm -f tests/*/output/*.txt
+rm -f tests/*/output/*.sinfo
+rm -f tests/*/output/*.end

verification/compare_images.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 #BASE_DIR=$1
 #NEW_DIR=$2
 #DIFF_DIR=$3

verification/evaluate.sh

@@ -1,15 +1,22 @@
+#!/usr/bin/env bash
+
 cd tests/test_cern_meyrin/output
 fds cern_meyrin_geom.fds
 fds cern_meyrin_obst.fds
 smokeview cern_meyrin_geom
 smokeview cern_meyrin_obst
-cd ../../test_golden_gate_local/output
+cd ../../..
+
+cd tests/test_golden_gate_local/output
 fds golden_gate_local_geom.fds
 fds golden_gate_local_obst.fds
 smokeview golden_gate_local_geom
 smokeview golden_gate_local_obst
-cd ../../test_golden_gate_remote/output
+cd ../../..
+
+cd tests/test_golden_gate_remote/output
 fds golden_gate_remote_geom.fds
 fds golden_gate_remote_obst.fds
 smokeview golden_gate_remote_geom
 smokeview golden_gate_remote_obst
+cd ../../..

verification/headless_verify.sh

@@ -1,11 +1,15 @@
+#!/usr/bin/env bash
+
 cd tests/test_cern_meyrin
 bash test_cern_meyrin_geom.sh
 bash test_cern_meyrin_obst.sh
 cd ../..
+
 cd tests/test_golden_gate_local
 bash test_golden_gate_local_geom.sh
 bash test_golden_gate_local_obst.sh
 cd ../..
+
 cd tests/test_golden_gate_remote
 bash test_golden_gate_remote_geom.sh
 bash test_golden_gate_remote_obst.sh

verification/tests/test_cern_meyrin/output/.gitignore

@@ -1,3 +1,9 @@
-*.fds
-*.bingeom
-*.png
+# No files
+*
+
+# but Smokeview initialization file
+!*.ini
+
+# and Smokeview script
+!*.ssf
+

verification/tests/test_cern_meyrin/test_cern_meyrin_geom.sh

@@ -1,6 +1,30 @@
+#!/usr/bin/env bash
+
+qgis_process run "NIST FDS:Export FDS case" \
+    --project_path="cern_meyrin.qgs" \
+    --distance_units=meters \
+    --area_units=m2 \
+    --ellipsoid=EPSG:7030 \
+    --chid=cern_meyrin_geom \
+    --fds_path="output" \
+    --extent="6.048008498,6.049552799,46.232493265,46.233460112 [EPSG:4326]" \
+    --pixel_size=1 \
+    --dem_layer="data_layers/dem_layer.tif" \
+    --landuse_type_filepath= \
+    --text_filepath= \
+    --tex_pixel_size=0.1 \
+    --nmesh=4 \
+    --cell_size=1 \
+    --export_obst=false \
+    --UtmGrid=TEMPORARY_OUTPUT \
+    --ClippedDemLayer=TEMPORARY_OUTPUT \
+    --UtmDemPoints=TEMPORARY_OUTPUT \
+    --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT \
+    --ExtentDebug=TEMPORARY_OUTPUT \
+    --dem_sampling=2
 
-qgis_process run "NIST FDS:Export FDS case" --project_path="cern_meyrin.qgs" --distance_units=meters --area_units=m2 --ellipsoid=EPSG:7030 --chid=cern_meyrin_geom --fds_path="output" --extent="6.048008498,6.049552799,46.232493265,46.233460112 [EPSG:4326]" --pixel_size=1 --dem_layer="data_layers/dem_layer.tif" --landuse_type_filepath= --text_filepath= --tex_pixel_size=0.1 --nmesh=4 --cell_size=1 --export_obst=false --UtmGrid=TEMPORARY_OUTPUT --ClippedDemLayer=TEMPORARY_OUTPUT --UtmDemPoints=TEMPORARY_OUTPUT --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT --ExtentDebug=TEMPORARY_OUTPUT --dem_sampling=2
 cd output
 fds cern_meyrin_geom.fds
 smokeview -runscript cern_meyrin_geom
 cd ..
+

verification/tests/test_cern_meyrin/test_cern_meyrin_obst.sh

@@ -1,6 +1,30 @@
+#!/usr/bin/env bash
 
-qgis_process run "NIST FDS:Export FDS case" --project_path="cern_meyrin.qgs" --distance_units=meters --area_units=m2 --ellipsoid=EPSG:7030 --chid=cern_meyrin_obst --fds_path="output" --extent="6.048008498,6.049552799,46.232493265,46.233460112 [EPSG:4326]" --pixel_size=1 --dem_layer="data_layers/dem_layer.tif" --landuse_type_filepath= --text_filepath= --tex_pixel_size=0.1 --nmesh=4 --cell_size=1 --export_obst=true --UtmGrid=TEMPORARY_OUTPUT --ClippedDemLayer=TEMPORARY_OUTPUT --UtmDemPoints=TEMPORARY_OUTPUT --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT --ExtentDebug=TEMPORARY_OUTPUT --dem_sampling=2
+qgis_process run "NIST FDS:Export FDS case" \
+    --project_path="cern_meyrin.qgs" \
+    --distance_units=meters \
+    --area_units=m2 \
+    --ellipsoid=EPSG:7030 \
+    --chid=cern_meyrin_obst \
+    --fds_path="output" \
+    --extent="6.048008498,6.049552799,46.232493265,46.233460112 [EPSG:4326]" \
+    --pixel_size=1 \
+    --dem_layer="data_layers/dem_layer.tif" \
+    --landuse_type_filepath= \
+    --text_filepath= \
+    --tex_pixel_size=0.1 \
+    --nmesh=4 \
+    --cell_size=1 \
+    --export_obst=true \
+    --UtmGrid=TEMPORARY_OUTPUT \
+    --ClippedDemLayer=TEMPORARY_OUTPUT \
+    --UtmDemPoints=TEMPORARY_OUTPUT \
+    --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT \
+    --ExtentDebug=TEMPORARY_OUTPUT \
+    --dem_sampling=2
+
 cd output
 fds cern_meyrin_obst.fds
 smokeview -runscript cern_meyrin_obst
 cd ..
+

verification/tests/test_golden_gate_local/output/.gitignore

@@ -1,3 +1,9 @@
-*.fds
-*.bingeom
-*.png
+# No files
+*
+
+# but Smokeview initialization file
+!*.ini
+
+# and Smokeview script
+!*.ssf
+

verification/tests/test_golden_gate_local/test_golden_gate_local_geom.sh

@@ -1,6 +1,35 @@
 
-qgis_process run "NIST FDS:Export FDS case" --project_path="golden_gate_local.qgs" --distance_units=meters --area_units=m2 --ellipsoid=EPSG:7030 --chid=golden_gate_local_geom --fds_path="output" --extent="-122.491206899,-122.481181391,37.827810126,37.833676214 [EPSG:4326]" --pixel_size=30 --dem_layer="data_layers/US_DEM2016_local.tif" --landuse_layer="data_layers/US_200F13_20_local.tif" --landuse_type_filepath="Landfire.gov_F13.csv" --fire_layer="data_layers/fire.gpkg" --wind_filepath="wind.csv" -tex_layer="data_layers/OpenStreetMap.tif" --tex_pixel_size=1 --origin="-2279076.207440,1963675.963121 [EPSG:5070]" --nmesh=4 --cell_size=10 --export_obst=false --UtmGrid=TEMPORARY_OUTPUT --ClippedDemLayer=TEMPORARY_OUTPUT --UtmDemPoints=TEMPORARY_OUTPUT --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT --ExtentDebug=TEMPORARY_OUTPUT --dem_sampling=1
+qgis_process run "NIST FDS:Export FDS case" \
+    --project_path="golden_gate_local.qgs" \
+    --distance_units=meters \
+    --area_units=m2 \
+    --ellipsoid=EPSG:7030 \
+    --chid=golden_gate_local_geom \
+    --fds_path="output" \
+    --extent="-122.491206899,-122.481181391,37.827810126,37.833676214 [EPSG:4326]" \
+    --pixel_size=30 \
+    --dem_layer="data_layers/US_DEM2016_local.tif" \
+    --landuse_layer="data_layers/US_200F13_20_local.tif" \
+    --landuse_type_filepath="Landfire.gov_F13.csv" \
+    --fire_layer="data_layers/fire.gpkg" \
+    --wind_filepath="wind.csv" \
+    --tex_pixel_size=1 \
+    --origin="-2279076.207440,1963675.963121 [EPSG:5070]" \
+    --nmesh=4 \
+    --cell_size=10 \
+    --export_obst=false \
+    --UtmGrid=TEMPORARY_OUTPUT \
+    --ClippedDemLayer=TEMPORARY_OUTPUT \
+    --UtmDemPoints=TEMPORARY_OUTPUT \
+    --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT \
+    --ExtentDebug=TEMPORARY_OUTPUT \
+    --dem_sampling=1
+
+# Do not export texture
+#   --tex_layer="data_layers/OpenStreetMap.tif" \
+
 cd output
 fds golden_gate_local_geom.fds
 smokeview -runscript golden_gate_local_geom
 cd ..
+

verification/tests/test_golden_gate_local/test_golden_gate_local_obst.sh

@@ -1,6 +1,35 @@
 
-qgis_process run "NIST FDS:Export FDS case" --project_path="golden_gate_local.qgs" --distance_units=meters --area_units=m2 --ellipsoid=EPSG:7030 --chid=golden_gate_local_obst --fds_path="output" --extent="-122.491206899,-122.481181391,37.827810126,37.833676214 [EPSG:4326]" --pixel_size=30 --dem_layer="data_layers/US_DEM2016_local.tif" --landuse_layer="data_layers/US_200F13_20_local.tif" --landuse_type_filepath="Landfire.gov_F13.csv" --fire_layer="data_layers/fire.gpkg" --wind_filepath="wind.csv" -tex_layer="data_layers/OpenStreetMap.tif" --tex_pixel_size=1 --origin="-2279076.207440,1963675.963121 [EPSG:5070]" --nmesh=4 --cell_size=10 --export_obst=true --UtmGrid=TEMPORARY_OUTPUT --ClippedDemLayer=TEMPORARY_OUTPUT --UtmDemPoints=TEMPORARY_OUTPUT --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT --ExtentDebug=TEMPORARY_OUTPUT --dem_sampling=1
+qgis_process run "NIST FDS:Export FDS case" \
+    --project_path="golden_gate_local.qgs" \
+    --distance_units=meters \
+    --area_units=m2 \
+    --ellipsoid=EPSG:7030 \
+    --chid=golden_gate_local_obst \
+    --fds_path="output" \
+    --extent="-122.491206899,-122.481181391,37.827810126,37.833676214 [EPSG:4326]" \
+    --pixel_size=30 \
+    --dem_layer="data_layers/US_DEM2016_local.tif" \
+    --landuse_layer="data_layers/US_200F13_20_local.tif" \
+    --landuse_type_filepath="Landfire.gov_F13.csv" \
+    --fire_layer="data_layers/fire.gpkg" \
+    --wind_filepath="wind.csv" \
+    --tex_pixel_size=1 \
+    --origin="-2279076.207440,1963675.963121 [EPSG:5070]" \
+    --nmesh=4 \
+    --cell_size=10 \
+    --export_obst=true \
+    --UtmGrid=TEMPORARY_OUTPUT \
+    --ClippedDemLayer=TEMPORARY_OUTPUT \
+    --UtmDemPoints=TEMPORARY_OUTPUT \
+    --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT \
+    --ExtentDebug=TEMPORARY_OUTPUT \
+    --dem_sampling=1
+
+# Do not export texture
+#   --tex_layer="data_layers/OpenStreetMap.tif" \
+
 cd output
 fds golden_gate_local_obst.fds
 smokeview -runscript golden_gate_local_obst
 cd ..
+

verification/tests/test_golden_gate_remote/.gitignore

@@ -1 +1,3 @@
-*.tif*
+# locally saved rasters
+*.tif
+*.xml

verification/tests/test_golden_gate_remote/output/.gitignore

@@ -1,3 +1,9 @@
-*.fds
-*.bingeom
-*.png
+# No files
+*
+
+# but Smokeview initialization file
+!*.ini
+
+# and Smokeview script
+!*.ssf
+

verification/tests/test_golden_gate_remote/test_golden_gate_remote_geom.sh

@@ -1,8 +1,48 @@
 
-qgis_process run "NIST FDS:Extract server layer" --project_path="golden_gate_remote.qgs" --distance_units=meters --area_units=m2 --ellipsoid=EPSG:7030 --chid=golden_gate_remote_geom --fds_path="output" --extent="-122.509448609,-122.467825037,37.817233198,37.849753575 [EPSG:4326]" --pixel_size=30 --dem_layer="dpiMode=7&identifier=landfire_wcs:LC20_Elev_220&url=https://edcintl.cr.usgs.gov/geoserver/landfire_wcs/us_topo/wcs" --landuse_layer="dpiMode=7&identifier=landfire_wcs:LC22_F13_220&url=https://edcintl.cr.usgs.gov/geoserver/landfire_wcs/us_220/wcs" --tex_layer="crs=EPSG:3857&format&type=xyz&url=https://mt1.google.com/vt/lyrs%3Ds%26x%3D%7Bx%7D%26y%3D%7By%7D%26z%3D%7Bz%7D&zmax=19&zmin=0" --tex_pixel_size=1
+qgis_process run "NIST FDS:Extract server layer" \
+    --project_path="golden_gate_remote.qgs" \
+    --distance_units=meters \
+    --area_units=m2 \
+    --ellipsoid=EPSG:7030 \
+    --chid=golden_gate_remote_geom \
+    --fds_path="output" \
+    --extent="-122.509448609,-122.467825037,37.817233198,37.849753575 [EPSG:4326]" \
+    --pixel_size=30 \
+    --dem_layer="dpiMode=7&identifier=landfire_wcs:LC20_Elev_220&url=https://edcintl.cr.usgs.gov/geoserver/landfire_wcs/us_topo/wcs" \
+    --landuse_layer="dpiMode=7&identifier=landfire_wcs:LC22_F13_220&url=https://edcintl.cr.usgs.gov/geoserver/landfire_wcs/us_220/wcs" \
+    --tex_pixel_size=1
+
+qgis_process run "NIST FDS:Export FDS case" \
+    --project_path="golden_gate_remote.qgs" \
+    --distance_units=meters \
+    --area_units=m2 \
+    --ellipsoid=EPSG:7030 \
+    --chid=golden_gate_remote_geom \
+    --fds_path="output" \
+    --extent="-122.509448609,-122.467825037,37.817233198,37.849753575 [EPSG:4326]" \
+    --pixel_size=30 \
+    --dem_layer="golden_gate_remote_geom_DEM_CLIPPED.tif" \
+    --landuse_layer="golden_gate_remote_geom_LAND_CLIPPED.tif" \
+    --landuse_type_filepath="Landfire.gov_F13.csv" \
+    --fire_layer="data_layers/fire.gpkg" \
+    --wind_filepath="wind.csv" \
+    --tex_pixel_size=1 \
+    --origin="-2279076.207440,1963675.963121 [EPSG:5070]" \
+    --nmesh=4 \
+    --cell_size=10 \
+    --export_obst=false \
+    --UtmGrid=TEMPORARY_OUTPUT \
+    --ClippedDemLayer=TEMPORARY_OUTPUT \
+    --UtmDemPoints=TEMPORARY_OUTPUT \
+    --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT \
+    --ExtentDebug=TEMPORARY_OUTPUT \
+    --dem_sampling=1
+
+# Do not export texture
+#   --tex_layer="crs=EPSG:3857&format&type=xyz&url=https://mt1.google.com/vt/lyrs%3Ds%26x%3D%7Bx%7D%26y%3D%7By%7D%26z%3D%7Bz%7D&zmax=19&zmin=0" \
 
-qgis_process run "NIST FDS:Export FDS case" --project_path="golden_gate_remote.qgs" --distance_units=meters --area_units=m2 --ellipsoid=EPSG:7030 --chid=golden_gate_remote_geom --fds_path="output" --extent="-122.509448609,-122.467825037,37.817233198,37.849753575 [EPSG:4326]" --pixel_size=30 --dem_layer="golden_gate_remote_geom_DEM_CLIPPED.tif" --landuse_layer="golden_gate_remote_geom_LAND_CLIPPED.tif" --landuse_type_filepath="Landfire.gov_F13.csv" --fire_layer="data_layers/fire.gpkg" --wind_filepath="wind.csv" -tex_layer="crs=EPSG:3857&format&type=xyz&url=https://mt1.google.com/vt/lyrs%3Ds%26x%3D%7Bx%7D%26y%3D%7By%7D%26z%3D%7Bz%7D&zmax=19&zmin=0" --tex_pixel_size=1 --origin="-2279076.207440,1963675.963121 [EPSG:5070]" --nmesh=4 --cell_size=10 --export_obst=false --UtmGrid=TEMPORARY_OUTPUT --ClippedDemLayer=TEMPORARY_OUTPUT --UtmDemPoints=TEMPORARY_OUTPUT --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT --ExtentDebug=TEMPORARY_OUTPUT --dem_sampling=1
 cd output
 fds golden_gate_remote_geom.fds
 smokeview -runscript golden_gate_remote_geom
 cd ..
+

verification/tests/test_golden_gate_remote/test_golden_gate_remote_obst.sh

@@ -1,8 +1,47 @@
 
-qgis_process run "NIST FDS:Extract server layer" --project_path="golden_gate_remote.qgs" --distance_units=meters --area_units=m2 --ellipsoid=EPSG:7030 --chid=golden_gate_remote_obst --fds_path="output" --extent="-122.509448609,-122.467825037,37.817233198,37.849753575 [EPSG:4326]" --pixel_size=30 --dem_layer="dpiMode=7&identifier=landfire_wcs:LC20_Elev_220&url=https://edcintl.cr.usgs.gov/geoserver/landfire_wcs/us_topo/wcs" --landuse_layer="dpiMode=7&identifier=landfire_wcs:LC22_F13_220&url=https://edcintl.cr.usgs.gov/geoserver/landfire_wcs/us_220/wcs" --tex_layer="crs=EPSG:3857&format&type=xyz&url=https://mt1.google.com/vt/lyrs%3Ds%26x%3D%7Bx%7D%26y%3D%7By%7D%26z%3D%7Bz%7D&zmax=19&zmin=0" --tex_pixel_size=1
+qgis_process run "NIST FDS:Extract server layer" \
+    --project_path="golden_gate_remote.qgs" \
+    --distance_units=meters --area_units=m2 \
+    --ellipsoid=EPSG:7030 \
+    --chid=golden_gate_remote_obst \
+    --fds_path="output" \
+    --extent="-122.509448609,-122.467825037,37.817233198,37.849753575 [EPSG:4326]" \
+    --pixel_size=30 \
+    --dem_layer="dpiMode=7&identifier=landfire_wcs:LC20_Elev_220&url=https://edcintl.cr.usgs.gov/geoserver/landfire_wcs/us_topo/wcs" \
+    --landuse_layer="dpiMode=7&identifier=landfire_wcs:LC22_F13_220&url=https://edcintl.cr.usgs.gov/geoserver/landfire_wcs/us_220/wcs" \
+    --tex_pixel_size=1
+
+qgis_process run "NIST FDS:Export FDS case" \
+    --project_path="golden_gate_remote.qgs" \
+    --distance_units=meters \
+    --area_units=m2 \
+    --ellipsoid=EPSG:7030 \
+    --chid=golden_gate_remote_obst \
+    --fds_path="output" \
+    --extent="-122.509448609,-122.467825037,37.817233198,37.849753575 [EPSG:4326]" \
+    --pixel_size=30 \
+    --dem_layer="golden_gate_remote_obst_DEM_CLIPPED.tif" \
+    --landuse_layer="golden_gate_remote_obst_LAND_CLIPPED.tif" \
+    --landuse_type_filepath="Landfire.gov_F13.csv" \
+    --fire_layer="data_layers/fire.gpkg" \
+    --wind_filepath="wind.csv" \
+    --tex_pixel_size=1 \
+    --origin="-2279076.207440,1963675.963121 [EPSG:5070]" \
+    --nmesh=4 \
+    --cell_size=10 \
+    --export_obst=true \
+    --UtmGrid=TEMPORARY_OUTPUT \
+    --ClippedDemLayer=TEMPORARY_OUTPUT \
+    --UtmDemPoints=TEMPORARY_OUTPUT \
+    --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT \
+    --ExtentDebug=TEMPORARY_OUTPUT \
+    --dem_sampling=1
+
+# Do not export texture
+#   --tex_layer="crs=EPSG:3857&format&type=xyz&url=https://mt1.google.com/vt/lyrs%3Ds%26x%3D%7Bx%7D%26y%3D%7By%7D%26z%3D%7Bz%7D&zmax=19&zmin=0" \
 
-qgis_process run "NIST FDS:Export FDS case" --project_path="golden_gate_remote.qgs" --distance_units=meters --area_units=m2 --ellipsoid=EPSG:7030 --chid=golden_gate_remote_obst --fds_path="output" --extent="-122.509448609,-122.467825037,37.817233198,37.849753575 [EPSG:4326]" --pixel_size=30 --dem_layer="golden_gate_remote_obst_DEM_CLIPPED.tif" --landuse_layer="golden_gate_remote_obst_LAND_CLIPPED.tif" --landuse_type_filepath="Landfire.gov_F13.csv" --fire_layer="data_layers/fire.gpkg" --wind_filepath="wind.csv" -tex_layer="crs=EPSG:3857&format&type=xyz&url=https://mt1.google.com/vt/lyrs%3Ds%26x%3D%7Bx%7D%26y%3D%7By%7D%26z%3D%7Bz%7D&zmax=19&zmin=0" --tex_pixel_size=1 --origin="-2279076.207440,1963675.963121 [EPSG:5070]" --nmesh=4 --cell_size=10 --export_obst=true --UtmGrid=TEMPORARY_OUTPUT --ClippedDemLayer=TEMPORARY_OUTPUT --UtmDemPoints=TEMPORARY_OUTPUT --UtmInterpolatedDemLayer=TEMPORARY_OUTPUT --ExtentDebug=TEMPORARY_OUTPUT --dem_sampling=1
 cd output
 fds golden_gate_remote_obst.fds
 smokeview -runscript golden_gate_remote_obst
 cd ..
+

verification/verify.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import os, difflib, filecmp, tempfile, glob
 
 from qgis.core import QgsProject

verification/verify.sh

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
+
 qgis --code verify.py