Merge pull request #76 from johodges/dev

Change verification shape files to gpkg
firetools · Aug 9, 2023 · f35cc76 · f35cc76
2 parents 6e72eb4 + da69f8b
commit f35cc76
Show file tree

Hide file tree

Showing 38 changed files with 2,643 additions and 2,466 deletions.
diff --git a/verification/tests/test_cern_meyrin/cern_meyrin.qgs b/verification/tests/test_cern_meyrin/cern_meyrin.qgs
diff --git a/verification/tests/test_cern_meyrin/cern_meyrin_attachments.zip b/verification/tests/test_cern_meyrin/cern_meyrin_attachments.zip
diff --git a/verification/tests/test_cern_meyrin/data_layers/Extent.dbf b/verification/tests/test_cern_meyrin/data_layers/Extent.dbf
diff --git a/verification/tests/test_cern_meyrin/data_layers/Extent.gpkg b/verification/tests/test_cern_meyrin/data_layers/Extent.gpkg
diff --git a/verification/tests/test_cern_meyrin/data_layers/Extent.prj b/verification/tests/test_cern_meyrin/data_layers/Extent.prj
diff --git a/verification/tests/test_cern_meyrin/data_layers/Extent.shp b/verification/tests/test_cern_meyrin/data_layers/Extent.shp
diff --git a/verification/tests/test_cern_meyrin/data_layers/Extent.shx b/verification/tests/test_cern_meyrin/data_layers/Extent.shx
diff --git a/verification/tests/test_golden_gate_local/data_layers/Extent.gpkg b/verification/tests/test_golden_gate_local/data_layers/Extent.gpkg
diff --git a/verification/tests/test_golden_gate_local/data_layers/extent.dbf b/verification/tests/test_golden_gate_local/data_layers/extent.dbf
diff --git a/verification/tests/test_golden_gate_local/data_layers/extent.prj b/verification/tests/test_golden_gate_local/data_layers/extent.prj
diff --git a/verification/tests/test_golden_gate_local/data_layers/extent.shp b/verification/tests/test_golden_gate_local/data_layers/extent.shp
diff --git a/verification/tests/test_golden_gate_local/data_layers/extent.shx b/verification/tests/test_golden_gate_local/data_layers/extent.shx
diff --git a/verification/tests/test_golden_gate_local/data_layers/fire.cpg b/verification/tests/test_golden_gate_local/data_layers/fire.cpg
diff --git a/verification/tests/test_golden_gate_local/data_layers/fire.dbf b/verification/tests/test_golden_gate_local/data_layers/fire.dbf
diff --git a/verification/tests/test_golden_gate_local/data_layers/fire.gpkg b/verification/tests/test_golden_gate_local/data_layers/fire.gpkg
diff --git a/verification/tests/test_golden_gate_local/data_layers/fire.prj b/verification/tests/test_golden_gate_local/data_layers/fire.prj
diff --git a/verification/tests/test_golden_gate_local/data_layers/fire.shp b/verification/tests/test_golden_gate_local/data_layers/fire.shp
diff --git a/verification/tests/test_golden_gate_local/data_layers/fire.shx b/verification/tests/test_golden_gate_local/data_layers/fire.shx
diff --git a/verification/tests/test_golden_gate_local/golden_gate_local.qgs b/verification/tests/test_golden_gate_local/golden_gate_local.qgs
diff --git a/verification/tests/test_golden_gate_local/golden_gate_local_attachments.zip b/verification/tests/test_golden_gate_local/golden_gate_local_attachments.zip
diff --git a/verification/tests/test_golden_gate_local/test_golden_gate_local_geom.sh b/verification/tests/test_golden_gate_local/test_golden_gate_local_geom.sh
@@ -1,5 +1,5 @@
 
-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.shx|layername=fire" --text_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_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
 cd output
 fds golden_gate_local_geom.fds
 smokeview -runscript golden_gate_local_geom

diff --git a/verification/tests/test_golden_gate_local/test_golden_gate_local_obst.sh b/verification/tests/test_golden_gate_local/test_golden_gate_local_obst.sh
@@ -1,5 +1,5 @@
 
-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.shx|layername=fire" --text_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_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
 cd output
 fds golden_gate_local_obst.fds
 smokeview -runscript golden_gate_local_obst

diff --git a/verification/tests/test_golden_gate_remote/data_layers/extent.dbf b/verification/tests/test_golden_gate_remote/data_layers/extent.dbf
diff --git a/verification/tests/test_golden_gate_remote/data_layers/extent.gpkg b/verification/tests/test_golden_gate_remote/data_layers/extent.gpkg
diff --git a/verification/tests/test_golden_gate_remote/data_layers/extent.prj b/verification/tests/test_golden_gate_remote/data_layers/extent.prj
diff --git a/verification/tests/test_golden_gate_remote/data_layers/extent.shp b/verification/tests/test_golden_gate_remote/data_layers/extent.shp
diff --git a/verification/tests/test_golden_gate_remote/data_layers/extent.shx b/verification/tests/test_golden_gate_remote/data_layers/extent.shx
diff --git a/verification/tests/test_golden_gate_remote/data_layers/fire.cpg b/verification/tests/test_golden_gate_remote/data_layers/fire.cpg
diff --git a/verification/tests/test_golden_gate_remote/data_layers/fire.dbf b/verification/tests/test_golden_gate_remote/data_layers/fire.dbf
diff --git a/verification/tests/test_golden_gate_remote/data_layers/fire.gpkg b/verification/tests/test_golden_gate_remote/data_layers/fire.gpkg
diff --git a/verification/tests/test_golden_gate_remote/data_layers/fire.prj b/verification/tests/test_golden_gate_remote/data_layers/fire.prj
diff --git a/verification/tests/test_golden_gate_remote/data_layers/fire.shp b/verification/tests/test_golden_gate_remote/data_layers/fire.shp
diff --git a/verification/tests/test_golden_gate_remote/data_layers/fire.shx b/verification/tests/test_golden_gate_remote/data_layers/fire.shx
diff --git a/verification/tests/test_golden_gate_remote/golden_gate_attachments.zip b/verification/tests/test_golden_gate_remote/golden_gate_attachments.zip