FireX: Merging with firemodels/master

Source/part.f90

@@ -1013,9 +1013,9 @@ SUBROUTINE INSERT_VOLUMETRIC_PARTICLES
 ! If the INIT volume is outside the current mesh, return
 
 IF (IN%SHAPE/='RING' .AND. IN%SHAPE/='LINE') THEN
-   IF ((IN_X1-XF)>-50._EB*TWO_EPSILON_EB .OR. (IN_X2-XS)<50._EB*TWO_EPSILON_EB .OR. &
-       (IN_Y1-YF)>-50._EB*TWO_EPSILON_EB .OR. (IN_Y2-YS)<50._EB*TWO_EPSILON_EB .OR. &
-       (IN_Z1-ZF)>-50._EB*TWO_EPSILON_EB .OR. (IN_Z2-ZS)<50._EB*TWO_EPSILON_EB) RETURN
+   IF ((IN_X1-XF)>50._EB*TWO_EPSILON_EB .OR. (IN_X2-XS)<-50._EB*TWO_EPSILON_EB .OR. &
+       (IN_Y1-YF)>50._EB*TWO_EPSILON_EB .OR. (IN_Y2-YS)<-50._EB*TWO_EPSILON_EB .OR. &
+       (IN_Z1-ZF)>50._EB*TWO_EPSILON_EB .OR. (IN_Z2-ZS)<-50._EB*TWO_EPSILON_EB) RETURN
 ELSEIF (IN%SHAPE=='RING') THEN
    IF (RING_MESH_INTERSECTION_ARC(NM,IN%X0,IN%Y0,IN%RADIUS)<TWO_EPSILON_EB) RETURN
 ELSE

Source/read.f90

@@ -6545,7 +6545,7 @@ SUBROUTINE PROC_PART
 
       DO NN=1,SF%N_MATL
          ML => MATERIAL(NN)
-         IF ( ANY(ML%N_O2>0._EB) ) OXPYRO_MODEL = .TRUE.
+         IF ( ANY(ML%N_O2>0._EB) .AND. (ML%PYROLYSIS_MODEL /= PYROLYSIS_SURFACE_OXIDATION) ) OXPYRO_MODEL = .TRUE.
       ENDDO
 
    ENDIF THERMALLY_THICK_IF
@@ -9956,7 +9956,7 @@ SUBROUTINE PROC_WALL
             ML => MATERIAL(SF%LAYER_CHILD_INDEX(NL,N))
             IF (ANY(ML%NU_RESIDUE>0._EB)) CAN_SWELL = .TRUE.
             IF (ML%ALLOW_SWELLING) DENSITY_MIN = MIN(DENSITY_MIN,ML%RHO_S)
-            IF ( ANY(ML%N_O2>0._EB) ) OXPYRO_MODEL = .TRUE.
+            IF ( ANY(ML%N_O2>0._EB) .AND. (ML%PYROLYSIS_MODEL /= PYROLYSIS_SURFACE_OXIDATION) ) OXPYRO_MODEL = .TRUE.
          ENDDO
 
          IF (DENSITY_MIN>TWO_EPSILON_EB .AND. CAN_SWELL) SF%SWELL_RATIO(NL) = MAX(1._EB,SF%LAYER_DENSITY(NL)/DENSITY_MIN)

Utilities/Matlab/FDS_validation_script.m

@@ -76,7 +76,6 @@
 backward_facing_step
 sandia_helium_plume
 sandia_methane_fire
-flame_height2
 purdue_flames
 NIST_NRC_Parallel_Panels
 Memorial_Tunnel

Utilities/Matlab/scripts/FM_Burner.m

@@ -20,7 +20,7 @@
       HRR = importdata([outdir,'FM_15cm_Burner_',fuel_name{i_fuel},'_',res_name{fds_resolution},'_hrr.csv'],',',2);
 
       Time_FDS = DEV.data(:,find(strcmp(DEV.colheaders,'Time')));
-      XO2_FDS  = DEV.data(:,find(strcmp(DEV.colheaders,'"XO2"')));
+      XO2_FDS  = DEV.data(:,find(strcmp(DEV.colheaders,'XO2')));
       Qdot_FDS = HRR.data(:,find(strcmp(HRR.colheaders,'HRR')));
       Qrad_FDS = HRR.data(:,find(strcmp(HRR.colheaders,'Q_RADI')));
       ntp      = length(Time_FDS);

Utilities/Matlab/scripts/umd_line_burner_process.m

@@ -22,12 +22,12 @@
       HRR = importdata([outdir,fuel_name{i_fuel},'_dx_',res_name{fds_resolution},'_hrr.csv'],',',2);
 
       Time_FDS = DEV.data(:,find(strcmp(DEV.colheaders,'Time')));
-      XO2_FDS  = DEV.data(:,find(strcmp(DEV.colheaders,'"XO2"')));
+      XO2_FDS  = DEV.data(:,find(strcmp(DEV.colheaders,'XO2')));
       Qdot_FDS = HRR.data(:,find(strcmp(HRR.colheaders,'HRR')));
       Qrad_FDS = HRR.data(:,find(strcmp(HRR.colheaders,'Q_RADI')));
-      q_R_FDS  = 0.5*( DEV.data(:,find(strcmp(DEV.colheaders,'"qrad1"'))) + DEV.data(:,find(strcmp(DEV.colheaders,'"qrad2"'))) );
+      q_R_FDS  = 0.5*( DEV.data(:,find(strcmp(DEV.colheaders,'qrad1'))) + DEV.data(:,find(strcmp(DEV.colheaders,'qrad2'))) );
       ntp      = length(Time_FDS);
-      Lf_FDS   = DEV.data(:,find(strcmp(DEV.colheaders,'"L_F"')));
+      Lf_FDS   = DEV.data(:,find(strcmp(DEV.colheaders,'L_F')));
 
       Lf_tmp = Lf_FDS;
       for n=1:ntp

Utilities/Python/FDS_validation_script.py

@@ -1,30 +1,30 @@
 #!$FIREMODELS/fds/.github/fds_python_env/bin/python
 
-import subprocess
 import fdsplotlib
 import importlib
+import runpy
 importlib.reload(fdsplotlib) # use for development (while making changes to fdsplotlib.py)
 
-# # Scripts to run prior to dataplot
+# Scripts to run prior to dataplot
 
-# print("catchpole_spread_rates...");       subprocess.run(["python","./scripts/catchpole_spread_rates.py"])
-# print("NIST_deposition_gauge...");        subprocess.run(["python","./scripts/NIST_deposition_gauge.py"])
-# print("flame_height...");                 subprocess.run(["python","./scripts/flame_height.py"])
-# print("NIST_RSE...");                     subprocess.run(["python","./scripts/NIST_RSE.py"])
-# print("sippola_aerosol_deposition...");   subprocess.run(["python","./scripts/sippola_aerosol_deposition.py"])
-# print("layer_height...");                 subprocess.run(["python","./scripts/layer_height.py"])
-# print("NIST_NRC_Corner_Effects...");      subprocess.run(["python","./scripts/NIST_NRC_Corner_Effects.py"])
-# # print("fm_data_center...");               subprocess.run(["python","./scripts/fm_data_center.py"])
-# print("LNG_Dispersion...");               subprocess.run(["python","./scripts/LNG_Dispersion.py"])
-# print("LNG_wind_profiles...");            subprocess.run(["python","./scripts/LNG_wind_profiles.py"])
-# print("FM_Vertical_Wall_Flames...");      subprocess.run(["python","./scripts/FM_Vertical_Wall_Flames.py"])
-# print("umd_line_burner_process...");      subprocess.run(["python","./scripts/umd_line_burner_process.py"])
-# # print("Askervein_Hill...");               subprocess.run(["python","./scripts/Askervein_Hill.py"])
-# print("UWO_Wind_Tunnel...");              subprocess.run(["python","./scripts/UWO_Wind_Tunnel.py"])
-# print("FM_Burner...");                    subprocess.run(["python","./scripts/FM_Burner.py"])
-# print("Crown_Fires...");                  subprocess.run(["python","./scripts/Crown_Fires.py"])
-# print("Ranz_Marshall...");                subprocess.run(["python","./scripts/Ranz_Marshall.py"])
-# print("Phoenix_LNG_Fires...");            subprocess.run(["python","./scripts/Phoenix_LNG_Fires.py"])
+print("catchpole_spread_rates...");       runpy.run_path("./scripts/catchpole_spread_rates.py", run_name="__main__")
+print("NIST_deposition_gauge...");        runpy.run_path("./scripts/NIST_deposition_gauge.py", run_name="__main__")
+print("flame_height...");                 runpy.run_path("./scripts/flame_height.py", run_name="__main__")
+print("NIST_RSE...");                     runpy.run_path("./scripts/NIST_RSE.py", run_name="__main__")
+print("sippola_aerosol_deposition...");   runpy.run_path("./scripts/sippola_aerosol_deposition.py", run_name="__main__")
+print("layer_height...");                 runpy.run_path("./scripts/layer_height.py", run_name="__main__")
+print("NIST_NRC_Corner_Effects...");      runpy.run_path("./scripts/NIST_NRC_Corner_Effects.py", run_name="__main__")
+# print("fm_data_center...");               runpy.run_path("./scripts/fm_data_center.py", run_name="__main__")
+print("LNG_Dispersion...");               runpy.run_path("./scripts/LNG_Dispersion.py", run_name="__main__")
+print("LNG_wind_profiles...");            runpy.run_path("./scripts/LNG_wind_profiles.py", run_name="__main__")
+print("FM_Vertical_Wall_Flames...");      runpy.run_path("./scripts/FM_Vertical_Wall_Flames.py", run_name="__main__")
+print("umd_line_burner_process...");      runpy.run_path("./scripts/umd_line_burner_process.py", run_name="__main__")
+# print("Askervein_Hill...");               runpy.run_path("./scripts/Askervein_Hill.py", run_name="__main__")
+print("UWO_Wind_Tunnel...");              runpy.run_path("./scripts/UWO_Wind_Tunnel.py", run_name="__main__")
+print("FM_Burner...");                    runpy.run_path("./scripts/FM_Burner.py", run_name="__main__")
+print("Crown_Fires...");                  runpy.run_path("./scripts/Crown_Fires.py", run_name="__main__")
+print("Ranz_Marshall...");                runpy.run_path("./scripts/Ranz_Marshall.py", run_name="__main__")
+print("Phoenix_LNG_Fires...");            runpy.run_path("./scripts/Phoenix_LNG_Fires.py", run_name="__main__")
 
 # Dataplot and scatplot options
 
@@ -41,15 +41,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("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!")