Skip to content

Commit fd3e813

Browse files
committed
reorganization of subpackage heat_exchanger due to adding new subpackage regenerator.
1 parent 35270ed commit fd3e813

34 files changed

+1023
-38
lines changed

docs/examples/air_conditioning/example_09/cooling_coil_sizing.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"from hvac.fluids import HumidAir, Fluid\n",
5757
"from hvac.air_conditioning.multi_zone import Zone, Season\n",
5858
"from hvac.air_conditioning.multi_zone.design import VAVSystem\n",
59-
"from hvac.heat_exchanger.fintube.continuous_fin import (\n",
59+
"from hvac.heat_exchanger.recuperator.fintube.continuous_fin import (\n",
6060
" PlainFinTubeAirToWaterCounterFlowHeatExchanger as AirCoil\n",
6161
")\n",
6262
"\n",

docs/examples/air_cooling_coil/air_cooling_coil_01.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"import warnings\n",
1717
"from hvac import Quantity\n",
1818
"from hvac.fluids import HumidAir, Fluid, CoolPropWarning\n",
19-
"from hvac.heat_exchanger.fintube.continuous_fin import (\n",
19+
"from hvac.heat_exchanger.recuperator.fintube.continuous_fin import (\n",
2020
" PlainFinTubeAirToWaterCounterFlowHeatExchanger\n",
2121
")\n",
2222
"\n",

docs/examples/air_cooling_coil/air_cooling_coil_02.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
" HumidAir, Fluid, CoolPropWarning,\n",
2020
" STANDARD_TEMPERATURE, STANDARD_PRESSURE\n",
2121
")\n",
22-
"from hvac.heat_exchanger.fintube.continuous_fin import (\n",
22+
"from hvac.heat_exchanger.recuperator.fintube.continuous_fin import (\n",
2323
" PlainFinTubeAirToWaterCounterFlowHeatExchanger as AirCoil\n",
2424
")\n",
2525
"\n",

docs/examples/air_cooling_coil/air_cooling_coil_03.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import numpy as np
2222
from hvac import Quantity
2323
from hvac.fluids import HumidAir, Fluid, STANDARD_TEMPERATURE, STANDARD_PRESSURE
24-
from hvac.heat_exchanger.fintube.continuous_fin import (
24+
from hvac.heat_exchanger.recuperator.fintube.continuous_fin import (
2525
PlainFinTubeAirToWaterCounterFlowHeatExchanger as AirCoil
2626
)
2727
from hvac.air_conditioning import AirConditioningProcess

docs/examples/air_cooling_coil/air_cooling_coil_04.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from scipy import optimize
88
from hvac import Quantity
99
from hvac.fluids import Fluid, HumidAir, FluidState
10-
from hvac.heat_exchanger.fintube.continuous_fin import PlainFinTubeAirToWaterCounterFlowHeatExchanger
10+
from hvac.heat_exchanger.recuperator.fintube.continuous_fin import PlainFinTubeAirToWaterCounterFlowHeatExchanger
1111
from hvac.charts import LineChart, PsychrometricChart
1212

1313

docs/examples/air_diffusion/script_02b.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,28 @@ def find_target(target: Quantity, values: Quantity) -> int:
2626

2727
def main():
2828
room = RoomInfo(
29-
L=Q_(23 / 4, 'm'),
30-
B=Q_(11, 'm'),
29+
L=Q_(11, 'm'),
30+
B=Q_(23 / 2, 'm'),
3131
H=Q_(6, 'm'),
3232
Z=Q_(1.8, 'm'),
3333
T_r=Q_(26, 'degC'),
34-
Q_dot=Q_(25.452 / 4, 'kW')
34+
Q_dot=Q_(25.452 / 2, 'kW')
3535
)
3636
print(f"room load per unit area: {room.q_dot.to('W / m**2'):~P.3f}")
3737

3838
# Throw constant of supply outlet:
39-
K1 = 0.5
39+
K1 = 2.0
4040
# Height between upper edge of supply opening and ceiling:
4141
d = Q_(0.5, 'm')
4242

4343
sws = SideWallSupply(room, d, K1, Ar_r_crit=10_000)
4444
# The critical room Archimedes number depends on the ratio room length to
4545
# room height: see e.g. Awbi, H. B. (2003). Ventilation of Buildings.
4646
# Taylor & Francis. p. 246, table 6.2.
47+
4748
output = sws.design(
4849
h_o=Q_(0.4, 'm'),
49-
L_th_frac=0.50,
50+
L_th_frac=0.75,
5051
v_r_minmax=(Q_(0.1, 'm / s'), Q_(0.3, 'm / s'))
5152
)
5253
print(output)

docs/examples/air_diffusion/script_02c.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def main():
4545

4646
# Do the analysis. The needed supply air volume flow rate and supply/room air
4747
# temperature difference are returned with the other output.
48-
sws = SideWallSupply(room, d, K1, Ar_r_crit=42_500)
48+
sws = SideWallSupply(room, d, K1, Ar_r_crit=5_000)
4949
# The critical room Archimedes number depends on the ratio room length to
5050
# room height: see e.g. Awbi, H. B. (2003). Ventilation of Buildings.
5151
# Taylor & Francis. p. 246, table 6.2.

docs/examples/cooling_load_calc/example_09.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import pandas as pd
5252
from hvac import Quantity
5353
from hvac.fluids import Fluid, FluidState, HumidAir
54-
from hvac.heat_exchanger.fintube.continuous_fin import (
54+
from hvac.heat_exchanger.recuperator.fintube.continuous_fin import (
5555
PlainFinTubeAirToWaterCounterFlowHeatExchanger as AirCoil
5656
)
5757
from hvac.sun import Location, ClimateType, ReferenceDates

docs/examples/vapor_compression/ex02_air_evaporator.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"\n",
3939
"warnings.filterwarnings('ignore', category=CoolPropWarning)\n",
4040
"\n",
41-
"from hvac.heat_exchanger.fintube.continuous_fin import PlainFinTubeCounterFlowAirEvaporator as Evaporator\n",
41+
"from hvac.heat_exchanger.recuperator.fintube.continuous_fin import PlainFinTubeCounterFlowAirEvaporator as Evaporator\n",
4242
"from hvac.charts import PsychrometricChart\n",
4343
"from hvac.air_conditioning import AirConditioningProcess\n",
4444
"\n",

docs/examples/vapor_compression/ex03_air_condenser.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"\n",
4141
"Q_ = Quantity\n",
4242
"\n",
43-
"from hvac.heat_exchanger.fintube.continuous_fin import PlainFinTubeCounterFlowAirCondenser as Condenser"
43+
"from hvac.heat_exchanger.recuperator.fintube.continuous_fin import PlainFinTubeCounterFlowAirCondenser as Condenser"
4444
]
4545
},
4646
{

docs/examples/vapor_compression/ex05_vcm_rating.ipynb

+4-8
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"from hvac.fluids import Fluid, HumidAir, CoolPropWarning\n",
3737
"from hvac.vapor_compression import VariableSpeedCompressor\n",
3838
"from hvac.vapor_compression.machine import SingleStageVaporCompressionMachine\n",
39-
"from hvac.heat_exchanger.fintube.continuous_fin import PlainFinTubeCounterFlowAirEvaporator\n",
40-
"from hvac.heat_exchanger.fintube.continuous_fin import PlainFinTubeCounterFlowAirCondenser\n",
39+
"from hvac.heat_exchanger.recuperator.fintube.continuous_fin import PlainFinTubeCounterFlowAirEvaporator\n",
40+
"from hvac.heat_exchanger.recuperator.fintube.continuous_fin import PlainFinTubeCounterFlowAirCondenser\n",
4141
"\n",
4242
"import warnings\n",
4343
"warnings.filterwarnings('ignore', category=RuntimeWarning)\n",
@@ -455,10 +455,7 @@
455455
"end_time": "2023-09-25T19:31:25.957353100Z",
456456
"start_time": "2023-09-25T19:31:25.940661200Z"
457457
},
458-
"collapsed": false,
459-
"jupyter": {
460-
"outputs_hidden": false
461-
}
458+
"collapsed": false
462459
},
463460
"outputs": [
464461
{
@@ -491,8 +488,7 @@
491488
"liquid = 45.142 °C, 264.113 kJ/kg, 13.215 bar\n",
492489
"mixture = 4.972 °C, 264.113 kJ/kg, 3.493 bar, 29 %\n",
493490
"evp_air_dP = 22.112 Pa\n",
494-
"cnd_air_dP = 53.514 Pa\n",
495-
"\n"
491+
"cnd_air_dP = 53.514 Pa\n"
496492
]
497493
}
498494
],

docs/examples/vapor_compression/ex06_vcm_rating_bis.ipynb

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"from pathlib import Path\n",
4040
"from hvac import Quantity\n",
4141
"from hvac.fluids import Fluid, HumidAir\n",
42-
"from hvac.heat_exchanger.fintube.continuous_fin import (\n",
42+
"from hvac.heat_exchanger.recuperator.fintube.continuous_fin import (\n",
4343
" PlainFinTubeCounterFlowAirEvaporator,\n",
4444
" PlainFinTubeCounterFlowAirCondenser\n",
4545
")\n",
@@ -991,8 +991,7 @@
991991
"liquid = 37.903 °C, 260.950 kJ/kg, 38.348 bar\n",
992992
"mixture = 5.920 °C, 260.950 kJ/kg, 9.621 bar, 24 %\n",
993993
"evp_air_dP = 51.657 Pa\n",
994-
"cnd_air_dP = 35.820 Pa\n",
995-
"\n"
994+
"cnd_air_dP = 35.820 Pa\n"
996995
]
997996
}
998997
],

docs/examples/vapor_compression/ex07_multi_vcm_analysis_part_a.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
Output,
4343
logger
4444
)
45-
from hvac.heat_exchanger.fintube.continuous_fin import (
45+
from hvac.heat_exchanger.recuperator.fintube.continuous_fin import (
4646
PlainFinTubeCounterFlowAirEvaporator,
4747
PlainFinTubeCounterFlowAirCondenser
4848
)

docs/examples/vapor_compression/ex08_condensing_unit.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from hvac.logging import ModuleLogger
2323
from hvac.charts import LineChart
2424
from hvac.fluids import Fluid, HumidAir, CoolPropWarning
25-
from hvac.heat_exchanger.fintube.continuous_fin import (
25+
from hvac.heat_exchanger.recuperator.fintube.continuous_fin import (
2626
PlainFinTubeCounterFlowAirCondenser
2727
)
2828
from hvac.vapor_compression import (

hvac/air_diffusion/design/sill_supply.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ def design_sill_supply(
263263
v_r: Quantity = Q_(0.2, 'm / s'),
264264
) -> Output:
265265
"""Calculates the air supply rate, the temperature difference between
266-
supply and room, and the dimensions of the supply opening.
266+
supply and room air, and the dimensions of the supply opening.
267267
The routine starts with the given initial guess of the supply/return air
268268
temperature difference `dT_o`, which is to be considered as a
269269
maximum value. It then tries to find the `dT_o` for which the

hvac/heat_exchanger/fintube/continuous_fin/air_condenser.py hvac/heat_exchanger/recuperator/fintube/continuous_fin/air_condenser.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from hvac.fluids import HumidAir, FluidState, CoolPropError, CP_HUMID_AIR
77
import hvac.heat_transfer.forced_convection.internal_flow as single_phase_flow
88
import hvac.heat_transfer.condensation.flow_condensation as condensing_flow
9-
from hvac.heat_exchanger.general.eps_ntu import CounterFlowHeatExchanger
9+
from hvac.heat_exchanger.recuperator.general.eps_ntu import CounterFlowHeatExchanger
1010
from .geometry import ContinuousFinStaggeredTubeBank
1111
from .air_to_water import ExternalSurface
1212

hvac/heat_exchanger/fintube/continuous_fin/air_evaporator.py hvac/heat_exchanger/recuperator/fintube/continuous_fin/air_evaporator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from hvac.fluids import FluidState, HumidAir, CP_HUMID_AIR
77
import hvac.heat_transfer.forced_convection.internal_flow as single_phase_flow
88
import hvac.heat_transfer.boiling.flow_boiling as boiling_flow
9-
from hvac.heat_exchanger.general import eps_ntu as dry
10-
from hvac.heat_exchanger.general import eps_ntu_wet as wet
9+
from hvac.heat_exchanger.recuperator.general import eps_ntu as dry
10+
from ...general import eps_ntu_wet as wet
1111
from .geometry import ContinuousFinStaggeredTubeBank
1212
from .air_to_water import ExternalSurface
1313

hvac/heat_exchanger/fintube/continuous_fin/air_to_water.py hvac/heat_exchanger/recuperator/fintube/continuous_fin/air_to_water.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from hvac.fluids import Fluid, HumidAir, CoolPropWarning, FluidState
77
from hvac.heat_transfer.forced_convection.internal_flow import CircularTube
88
from hvac.heat_transfer.finned_surface.fins import Fin, PlainContinuousFin
9-
import hvac.heat_exchanger.general.eps_ntu_wet as wet
10-
import hvac.heat_exchanger.general.eps_ntu as dry
11-
from hvac.heat_exchanger.general import corrections
9+
import hvac.heat_exchanger.recuperator.general.eps_ntu_wet as wet
10+
import hvac.heat_exchanger.recuperator.general.eps_ntu as dry
11+
from hvac.heat_exchanger.recuperator.general import corrections
1212
from .geometry import ContinuousFinStaggeredTubeBank
1313
from .correlations import PlainContinuousFinStaggeredTubeBank as correlations
1414

hvac/heat_exchanger/recuperator/general/__init__.py

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from .rotary_regenerator import Fluid, Matrix, CounterFlowRotaryRegenerator

0 commit comments

Comments
 (0)