Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions Source/hvac.f90
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ MODULE HVAC_ROUTINES
LOGICAL :: DUCT_NODE_INIT !< Flag indicating duct nodes have been initialized
LOGICAL :: TRANSPORT_PARTICLES !< Flag indicating particles should be transferred across a localized leak path

PUBLIC HVAC_CALC,READ_HVAC,PROC_HVAC,HVAC_BC_IN,FIND_NETWORKS,COLLAPSE_HVAC_BC,SET_INIT_HVAC,INIT_DUCT_NODE
PUBLIC HVAC_CALC,READ_HVAC,PROC_HVAC,HVAC_BC_IN,FIND_NETWORKS,COLLAPSE_HVAC_BC,SET_INIT_HVAC,INIT_DUCT_NODE,LEAKAGE_HVAC

REAL(EB),PUBLIC, ALLOCATABLE, DIMENSION(:):: NODE_AREA_EX !< Contain sum of area over all MESHES of all VENTs assigned to each NODE
REAL(EB),PUBLIC, ALLOCATABLE, DIMENSION(:):: NODE_TMP_EX
Expand Down Expand Up @@ -812,7 +812,6 @@ SUBROUTINE PROC_HVAC
TNOW=CURRENT_TIME()

IF (.NOT. HVAC_SOLVE) RETURN
IF (LEAK_DUCTS > 0) CALL LEAKAGE_HVAC

DUCT_LOOP: DO ND = 1, N_DUCTS
DU => DUCT(ND)
Expand Down Expand Up @@ -1069,6 +1068,7 @@ SUBROUTINE PROC_HVAC

NODE_LOOP_2: DO NN=1,N_DUCTNODES
DN=> DUCTNODE(NN)
IF (DN%LEAKAGE) CYCLE NODE_LOOP_2
IF (DN%N_DUCTS==1 .AND. .NOT. (DN%VENT .OR. DN%AMBIENT .OR. DN%GEOM) ) THEN
WRITE(MESSAGE,'(A,I5,A,A)') 'ERROR(547): Internal ductnode must have at least two attached ducts. Ductnode:',NN,&
', Ductnode ID:',TRIM(DN%ID)
Expand Down Expand Up @@ -3311,11 +3311,15 @@ END SUBROUTINE SET_INIT_HVAC_MASS_TRANSPORT
SUBROUTINE LEAKAGE_HVAC

USE PHYSICAL_FUNCTIONS, ONLY: GET_ENTHALPY
REAL(EB) :: ZZ_GET(1:N_TRACKED_SPECIES),HGAS
REAL(EB) :: ZZ_GET(1:N_TRACKED_SPECIES),HGAS,TNOW
INTEGER :: I_DUCT,I_DUCTNODE,NZ1,NZ2
TYPE (DUCTNODE_TYPE), POINTER:: DN1,DN2
TYPE (DUCT_TYPE), POINTER:: DU

IF (LEAK_DUCTS==0) RETURN

TNOW=CURRENT_TIME()

I_DUCT = N_DUCTS - LEAK_DUCTS
I_DUCTNODE = N_DUCTNODES - 2 * LEAK_DUCTS

Expand Down Expand Up @@ -3380,6 +3384,8 @@ SUBROUTINE LEAKAGE_HVAC
ENDDO
ENDDO

T_USED(13)=T_USED(13)+CURRENT_TIME()-TNOW

END SUBROUTINE LEAKAGE_HVAC

!> \brief Updates filter loading and filter flow loss
Expand Down
4 changes: 2 additions & 2 deletions Source/read.f90
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MODULE READ_INPUT
USE MEMORY_FUNCTIONS, ONLY: ChkMemErr,REALLOCATE2D,REALLOCATE
USE COMP_FUNCTIONS, ONLY: GET_INPUT_FILE
USE MISC_FUNCTIONS, ONLY: SEARCH_CONTROLLER,WRITE_SUMMARY_INFO,GET_RAMP_INDEX,GET_SPEC_OR_SMIX_INDEX
USE HVAC_ROUTINES, ONLY: READ_HVAC!,PROC_HVAC
USE HVAC_ROUTINES, ONLY: READ_HVAC,LEAKAGE_HVAC
USE COMPLEX_GEOMETRY, ONLY: READ_GEOM
USE MPI_F08
USE THERMO_PROPS
Expand Down Expand Up @@ -146,7 +146,7 @@ SUBROUTINE READ_DATA(DT)
CALL PROC_REAC_2 ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN
CALL PROC_MATL ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN
CALL PROC_SURF_2 ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN
!CALL PROC_HVAC ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN
IF (HVAC_SOLVE) CALL LEAKAGE_HVAC ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN
CALL READ_CLIP ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN
CALL PROC_WALL ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN
CALL PROC_PART ; CALL CHECK_STOP_STATUS ; IF (STOP_STATUS/=NO_STOP) RETURN
Expand Down
Loading