Skip to content

FDS Source: Fix order of operations issue with prior commit. #16049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drjfloyd merged 1 commit into from
Mar 14, 2026
+5 −2
Merged

FDS Source: Fix order of operations issue with prior commit. #16049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Source/hvac.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1442,8 +1442,8 @@ SUBROUTINE HVAC_CALC(T,DT,FIRST_PASS)
DO NN=1,N_DUCTNODES
DUCTNODE(NN)%ZZ_OLD = DUCTNODE(NN)%ZZ
ENDDO
CALL ADJUST_LEAKAGE_AREA
CALL FIND_NETWORKS(CHANGE,T) ! calls determined fixed elements (which calls update fan for fixed fans)
CALL ADJUST_LEAKAGE_AREA
IF (N_NETWORKS == 0) RETURN
IF (HVAC_QFAN .OR. HVAC_MASS_TRANSPORT) CALL FIND_DUCTRUNS(CHANGE)
ELSE FIRST_PASS_IF !Not FIRST_PASS, reset variables to old solution
Expand Down Expand Up @@ -2816,6 +2816,7 @@ SUBROUTINE FIND_NETWORKS(CHANGE,T)
DO ND = 1, N_DUCTS
IF(DUCT_COUNTER(ND) > 0) NETWORK(DUCT_COUNTER(ND))%N_DUCTS = NETWORK(DUCT_COUNTER(ND))%N_DUCTS + 1
ENDDO

DO NN = 1, N_DUCTNODES
IF(NODE_COUNTER(NN) > 0) NETWORK(NODE_COUNTER(NN))%N_DUCTNODES = NETWORK(NODE_COUNTER(NN))%N_DUCTNODES + 1
ENDDO
Expand Down Expand Up @@ -2847,6 +2848,7 @@ SUBROUTINE FIND_NETWORKS(CHANGE,T)

END SUBROUTINE FIND_NETWORKS


!> \brief For each HVAC network the routine defines which ducts and nodes belowng to which element of the HVAC matrix

SUBROUTINE SETUP_SOLUTION_POINTERS
Expand Down Expand Up @@ -3695,6 +3697,7 @@ SUBROUTINE ADJUST_LEAKAGE_AREA
DO ND=1,N_DUCTS
DU => DUCT(ND)
IF (.NOT.DU%LEAKAGE .AND. .NOT.DU%LOCALIZED_LEAKAGE) CYCLE
IF (DU%AREA<TWENTY_EPSILON_EB) CYCLE
DELTA_P = ABS(DUCTNODE(DU%NODE_INDEX(1))%P-DUCTNODE(DU%NODE_INDEX(2))%P)
IF (DU%LOCALIZED_LEAKAGE) THEN
DELTA_P_REF = DU%LEAK_REFERENCE_PRESSURE
Expand All @@ -3705,7 +3708,7 @@ SUBROUTINE ADJUST_LEAKAGE_AREA
N = P_ZONE(DUCTNODE(DU%NODE_INDEX(2))%ZONE_INDEX)%LEAK_PRESSURE_EXPONENT(DUCTNODE(DU%NODE_INDEX(1))%ZONE_INDEX)
C_D = P_ZONE(DUCTNODE(DU%NODE_INDEX(2))%ZONE_INDEX)%DISCHARGE_COEFFICIENT(DUCTNODE(DU%NODE_INDEX(1))%ZONE_INDEX)
ENDIF
DU%AREA = C_D * DU%AREA_INITIAL * (DELTA_P/DELTA_P_REF)**(N-0.5_EB)
DU%AREA = C_D * DU%AREA * (DELTA_P/DELTA_P_REF)**(N-0.5_EB)
ENDDO

END SUBROUTINE ADJUST_LEAKAGE_AREA
Expand Down
Loading