From 74352ada03de2c32b9e577936b8d60bd1642a390 Mon Sep 17 00:00:00 2001 From: mcgratta Date: Thu, 24 Jul 2025 17:29:05 -0400 Subject: [PATCH 1/6] FDS Source: Fix bug PART_UVWMAX --- Source/part.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/part.f90 b/Source/part.f90 index 216df51b5ec..b58f3229f80 100644 --- a/Source/part.f90 +++ b/Source/part.f90 @@ -2979,7 +2979,7 @@ SUBROUTINE MOVE_IN_GAS ACCEL_Y = 0._EB DRAG_MAX(2) = 0._EB ENDIF - IF (ANY(ABS(DRAG_MAX)>PART_UVWMAX)) PART_UVWMAX = MAX(PART_UVWMAX,MAXVAL(DRAG_MAX)) + IF (ANY(ABS(DRAG_MAX)>PART_UVWMAX) .AND. PARTICLE_CFL) PART_UVWMAX = MAX(PART_UVWMAX,MAXVAL(DRAG_MAX)) ENDIF PARTICLE_NON_STATIC_IF From 7f3d3d5eeeac5fca8718a0aefd52da2cb43426b2 Mon Sep 17 00:00:00 2001 From: Jason Floyd Date: Fri, 25 Jul 2025 06:45:56 -0400 Subject: [PATCH 2/6] FDS Verification: Add HEAT_OF_REACTION = 0 --- Verification/Flowfields/species_conservation_3.fds | 1 + Verification/Flowfields/species_conservation_4.fds | 1 + Verification/Pyrolysis/cell_burn_away.fds | 1 + Verification/Pyrolysis/enthalpy.fds | 2 ++ Verification/Pyrolysis/two_step_solid_reaction.fds | 2 ++ Verification/Radiation/emissivity.fds | 1 + 6 files changed, 8 insertions(+) diff --git a/Verification/Flowfields/species_conservation_3.fds b/Verification/Flowfields/species_conservation_3.fds index d46a955763f..db246e7e817 100644 --- a/Verification/Flowfields/species_conservation_3.fds +++ b/Verification/Flowfields/species_conservation_3.fds @@ -17,6 +17,7 @@ N_REACTIONS = 1 SPEC_ID(1:4,1) ='CARBON DIOXIDE','NITRIC OXIDE','NITROGEN DIOXIDE','CHLORINE', NU_SPEC(1:4,1) = 0.4, 0.27, 0.13,0.2, + HEAT_OF_REACTION = 0 REFERENCE_TEMPERATURE=400. / &SURF ID = 'CUBO' diff --git a/Verification/Flowfields/species_conservation_4.fds b/Verification/Flowfields/species_conservation_4.fds index fa298761734..7d4354ba0d8 100644 --- a/Verification/Flowfields/species_conservation_4.fds +++ b/Verification/Flowfields/species_conservation_4.fds @@ -18,6 +18,7 @@ N_REACTIONS = 1 SPEC_ID(1:4,1) = 'CARBON DIOXIDE','NITRIC OXIDE','NITROGEN DIOXIDE','CHLORINE', NU_SPEC(1:4,1) = 0.25, 0.25, 0.25,0.25, + HEAT_OF_REACTION = 0 REFERENCE_TEMPERATURE=330. / &SURF ID = 'PATCH' diff --git a/Verification/Pyrolysis/cell_burn_away.fds b/Verification/Pyrolysis/cell_burn_away.fds index 7c18a5f8097..4671ceaff59 100644 --- a/Verification/Pyrolysis/cell_burn_away.fds +++ b/Verification/Pyrolysis/cell_burn_away.fds @@ -28,6 +28,7 @@ DENSITY = 50. SPEC_ID = 'PROPANE' NU_SPEC = 1. + HEAT_OF_REACTION = 0 CONDUCTIVITY = 0.5 SPECIFIC_HEAT = 1. / diff --git a/Verification/Pyrolysis/enthalpy.fds b/Verification/Pyrolysis/enthalpy.fds index 52588fc44df..c31ecabe0f4 100644 --- a/Verification/Pyrolysis/enthalpy.fds +++ b/Verification/Pyrolysis/enthalpy.fds @@ -30,6 +30,8 @@ curve after 80 degC. E = 0. N_S = 0. NU_MATL = 1.0 + HEAT_OF_REACTION = 0. + ADJUST_H = F MATL_ID = 'MAT_B' / &RAMP ID = 'c_ramp' T = 20 F = 1.0 / diff --git a/Verification/Pyrolysis/two_step_solid_reaction.fds b/Verification/Pyrolysis/two_step_solid_reaction.fds index 37689172482..6c3d57868d0 100644 --- a/Verification/Pyrolysis/two_step_solid_reaction.fds +++ b/Verification/Pyrolysis/two_step_solid_reaction.fds @@ -107,6 +107,7 @@ I = 1,2,3 in any of the internal wall points. A = 0.389 E = 0. NU_MATL = 1.0 + HEAT_OF_REACTION = 0 MATL_ID = 'MAT_B'/ &MATL ID = 'MAT_B' @@ -116,6 +117,7 @@ I = 1,2,3 in any of the internal wall points. A = 0.262 E = 0. NU_MATL = 1.0 + HEAT_OF_REACTION = 0 MATL_ID = 'MAT_C'/ &MATL ID = 'MAT_C' diff --git a/Verification/Radiation/emissivity.fds b/Verification/Radiation/emissivity.fds index 2f8b8b2a261..c1ee256e9ac 100644 --- a/Verification/Radiation/emissivity.fds +++ b/Verification/Radiation/emissivity.fds @@ -29,6 +29,7 @@ The emissivity is measured using EMISSIVITY output quantity. A = 1. E = 0. N_S = 0. + HEAT_OF_REACTION = 0. NU_MATL = 1.0 MATL_ID = 'MAT_B'/ From ddc1f4a0842845af8c37e65d75ae8b6774144957 Mon Sep 17 00:00:00 2001 From: rmcdermo Date: Fri, 25 Jul 2025 11:13:53 -0400 Subject: [PATCH 3/6] Python: add comment for plot_range and plot_list to example call to fdsplotlib.dataplot --- Utilities/Python/FDS_verification_script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/Python/FDS_verification_script.py b/Utilities/Python/FDS_verification_script.py index 32208eb5998..dfbb77ff6c8 100644 --- a/Utilities/Python/FDS_verification_script.py +++ b/Utilities/Python/FDS_verification_script.py @@ -26,7 +26,7 @@ pltdir='../../Manuals/', close_figs=True, verbose=True, - plot_range=[2]) + plot_range=[2,2]) # plot_range[start, end], optionally instead use plot_list['Dataname'] # Special cases From 27df6a65bb04f61b2f3db6043fcfce33f7d8db29 Mon Sep 17 00:00:00 2001 From: rmcdermo Date: Fri, 25 Jul 2025 15:52:45 -0400 Subject: [PATCH 4/6] FDS Verification: add case to FDS_Cases.sh list --- Verification/FDS_Cases.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Verification/FDS_Cases.sh b/Verification/FDS_Cases.sh index 44b9cdf7596..affef9088d4 100755 --- a/Verification/FDS_Cases.sh +++ b/Verification/FDS_Cases.sh @@ -322,6 +322,7 @@ $QFDS -d Heat_Transfer ht3d_slab.fds $QFDS -d Heat_Transfer ht3d_sphere_24.fds $QFDS -p 4 -d Heat_Transfer ht3d_sphere_48.fds $QFDS -p 64 -d Heat_Transfer ht3d_sphere_96.fds +$QFDS -p Heat_Transfer back_wall.fds $QFDS -p 4 -d Heat_Transfer back_wall_test.fds $QFDS -p 3 -d Heat_Transfer back_wall_test_2.fds $QFDS -d Heat_Transfer SFPE_Case_1.fds From 71227b81959c5897320698e1cf0014a120e5f988 Mon Sep 17 00:00:00 2001 From: Jason Floyd Date: Sat, 26 Jul 2025 05:41:21 -0400 Subject: [PATCH 5/6] FDS Verification: fix typo in FDS_Cases.sh --- Verification/FDS_Cases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Verification/FDS_Cases.sh b/Verification/FDS_Cases.sh index affef9088d4..8cd4dfe8cff 100755 --- a/Verification/FDS_Cases.sh +++ b/Verification/FDS_Cases.sh @@ -322,7 +322,7 @@ $QFDS -d Heat_Transfer ht3d_slab.fds $QFDS -d Heat_Transfer ht3d_sphere_24.fds $QFDS -p 4 -d Heat_Transfer ht3d_sphere_48.fds $QFDS -p 64 -d Heat_Transfer ht3d_sphere_96.fds -$QFDS -p Heat_Transfer back_wall.fds +$QFDS -d Heat_Transfer back_wall.fds $QFDS -p 4 -d Heat_Transfer back_wall_test.fds $QFDS -p 3 -d Heat_Transfer back_wall_test_2.fds $QFDS -d Heat_Transfer SFPE_Case_1.fds From 64c5d804f4020f4d880c7a0a6c2383b5a5f576b2 Mon Sep 17 00:00:00 2001 From: mcgratta Date: Sun, 27 Jul 2025 14:14:36 -0400 Subject: [PATCH 6/6] Revert "FDS Source: Fix bug PART_UVWMAX" This reverts commit 74352ada03de2c32b9e577936b8d60bd1642a390. --- Source/part.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/part.f90 b/Source/part.f90 index b58f3229f80..216df51b5ec 100644 --- a/Source/part.f90 +++ b/Source/part.f90 @@ -2979,7 +2979,7 @@ SUBROUTINE MOVE_IN_GAS ACCEL_Y = 0._EB DRAG_MAX(2) = 0._EB ENDIF - IF (ANY(ABS(DRAG_MAX)>PART_UVWMAX) .AND. PARTICLE_CFL) PART_UVWMAX = MAX(PART_UVWMAX,MAXVAL(DRAG_MAX)) + IF (ANY(ABS(DRAG_MAX)>PART_UVWMAX)) PART_UVWMAX = MAX(PART_UVWMAX,MAXVAL(DRAG_MAX)) ENDIF PARTICLE_NON_STATIC_IF