Merge pull request #15267 from johodges/master

Python: improve cross-platform support for FDS_validation_script.py

Author: rmcdermo

Utilities/Python/FDS_validation_script.py

@@ -3,6 +3,7 @@
 import subprocess
 import fdsplotlib
 import importlib
+import os, runpy
 importlib.reload(fdsplotlib) # use for development (while making changes to fdsplotlib.py)
 
 # # Scripts to run prior to dataplot
@@ -41,16 +42,15 @@
 #                     plot_range=["all"]) # see notes below on plot_range
 
 # Special cases
-
-print("Beyler_Hood...");                 subprocess.run(["python","./scripts/Beyler_Hood.py"])
-print("BRE_LEMTA_Sprays...");            subprocess.run(["python","./scripts/BRE_LEMTA_Sprays.py"])
-print("FM_FPRF_Datacenter...");          subprocess.run(["python","./scripts/FM_FPRF_Datacenter.py"])
-print("Heskestad_Flame_Height_2...");    subprocess.run(["python","./scripts/Heskestad_Flame_Height_2.py"])
-print("McCaffrey_Plume...");             subprocess.run(["python","./scripts/McCaffrey_Plume.py"])
-print("Sandia_Pools...");                subprocess.run(["python","./scripts/Sandia_Pools.py"])
-print("TUS_Facade...");                  subprocess.run(["python","./scripts/TUS_Facade_contours.py"])
-print("USFS_Deep_Fuel_Beds...");         subprocess.run(["python","./scripts/USFS_Deep_Fuel_Beds.py"])
-print("Wu_Bakar_Tunnels...");            subprocess.run(["python","./scripts/Wu_Bakar_Tunnels.py"])
+print("Beyler_Hood...");                  runpy.run_path("./scripts/Beyler_Hood.py", run_name="__main__")
+print("BRE_LEMTA_Sprays...");             runpy.run_path("./scripts/BRE_LEMTA_Sprays.py", run_name="__main__")
+print("FM_FPRF_Datacenter...");           runpy.run_path("./scripts/FM_FPRF_Datacenter.py", run_name="__main__")
+print("Heskestad_Flame_Height_2...");     runpy.run_path("./scripts/Heskestad_Flame_Height_2.py", run_name="__main__")
+print("McCaffrey_Plume...");              runpy.run_path("./scripts/McCaffrey_Plume.py", run_name="__main__")
+print("Sandia_Pools...");                 runpy.run_path("./scripts/Sandia_Pools.py", run_name="__main__")
+print("TUS_Facade...");                   runpy.run_path("./scripts/TUS_Facade_contours.py", run_name="__main__")
+print("USFS_Deep_Fuel_Beds...");          runpy.run_path("./scripts/USFS_Deep_Fuel_Beds.py", run_name="__main__")
+print("Wu_Bakar_Tunnels...");             runpy.run_path("./scripts/Wu_Bakar_Tunnels.py", run_name="__main__")
 
 print("Python validation scripts completed successfully!")