Skip to content

Commit aef4939

Browse files
authored
Merge pull request #15555 from mcgratta/master
FDS Verification: Convert fds_timing_stats.sh and Make_FDS_Pictures.sh
2 parents 710cfde + 1b5995a commit aef4939

File tree

11 files changed

+3
-443
lines changed

11 files changed

+3
-443
lines changed

Utilities/Python/FDS_verification_script.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
print("fan_curve..."); runpy.run_path("./scripts/fan_curve.py", run_name="__main__")
5050
print("favre_test..."); runpy.run_path("./scripts/favre_test.py", run_name="__main__")
5151
print("fds_moody_chart..."); runpy.run_path("./scripts/fds_moody_chart.py", run_name="__main__")
52+
print("fds_timing_stats..."); runpy.run_path("./scripts/fds_timing_stats.py", run_name="__main__")
5253
print("fluid_part..."); runpy.run_path("./scripts/fluid_part.py", run_name="__main__")
5354
print("freecon_sphere..."); runpy.run_path("./scripts/freecon_sphere.py", run_name="__main__")
5455
print("geom_channel_test..."); runpy.run_path("./scripts/geom_channel_test.py", run_name="__main__")
@@ -61,6 +62,7 @@
6162
print("law_of_the_wall..."); runpy.run_path("./scripts/law_of_the_wall.py", run_name="__main__")
6263
print("level_set_ellipse..."); runpy.run_path("./scripts/level_set_ellipse.py", run_name="__main__")
6364
print("mesh_transformation..."); runpy.run_path("./scripts/mesh_transformation.py", run_name="__main__")
65+
print("make_smv_images..."); runpy.run_path("./scripts/make_smv_images.py", run_name="__main__")
6466
print("mass_balance..."); runpy.run_path("./scripts/mass_balance.py", run_name="__main__")
6567
print("mass_balance_gas_volume..."); runpy.run_path("./scripts/mass_balance_gas_volume.py", run_name="__main__")
6668
print("mass_balance_reac..."); runpy.run_path("./scripts/mass_balance_reac.py", run_name="__main__")

Utilities/Python/scripts/make_smv_images.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
smokeview_path = shutil.which(shell_command)
3737

3838
for i in range(len(folder)):
39-
print(case[i])
39+
print('generating smokeview image ' + case[i])
4040
os.chdir(outdir + folder[i])
4141
if os_name == "Linux":
4242
subprocess.run(['xvfb-run','-a',smokeview_path,'-runscript',case[i]], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

Utilities/Scripts/fds_timing_stats.sh

Lines changed: 0 additions & 46 deletions
This file was deleted.

Utilities/Scripts/get_download_count.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

Utilities/Scripts/killXservers.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

Utilities/Scripts/startXserver.sh

Lines changed: 0 additions & 29 deletions
This file was deleted.

Utilities/Scripts/stopXserver.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

Utilities/Scripts/timing_stats.sh

Lines changed: 0 additions & 107 deletions
This file was deleted.

Verification/FDS_Pictures.sh

Lines changed: 0 additions & 82 deletions
This file was deleted.

Verification/scripts/Make_FDS_Pictures.bat

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)