Skip to content
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

Jump to bottom

2477 wrong column name in piping catalog #2478

Merged
merged 3 commits into from
Dec 3, 2019
Merged

2477 wrong column name in piping catalog #2478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fae506
update column name in piping catalog
ShiZhongming Nov 27, 2019
22eff46
Update thermal_network.py
ShiZhongming Nov 27, 2019
4b6aed4
refactoring update method name
gabriel-happle Nov 28, 2019
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
Binary file modified cea/databases/SG/systems/supply_systems.xls
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion cea/optimization/slave/cooling_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def district_cooling_network(locator,
T_source_average_Lake_K = np.zeros(HOURS_IN_YEAR)

# get properties of technology used in this script
ACH_prop = AbsorptionChiller(pd.read_excel(locator.get_supply_systems(), sheet_name="Absorption_chiller"), 'double')
ACH_prop = AbsorptionChiller(pd.read_excel(locator.get_database_supply_systems(), sheet_name="Absorption_chiller"), 'double')
CCGT_prop = calc_cop_CCGT(master_to_slave_variables.NG_Trigen_CCGT_size_W, ACH_T_IN_FROM_CHP_K, "NG")

# intitalize variables
Expand Down
2 changes: 1 addition & 1 deletion cea/technologies/thermal_network/thermal_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ def calc_asign_diameter(max_flow, pipe_catalog):

if max_flow < pipe_catalog['mdot_min_kgs'].min():
return 'DN20' # the smallest pipe
elif max_flow > pipe_catalog['mdot_min_kgs'].max():
elif max_flow > pipe_catalog['mdot_max_kgs'].max():
raise ValueError(
'A very specific bad thing happened!: One or more of the pipes diameters you indicated' '\n'
'are not in the pipe catalog!, please make sure your input network match the piping catalog,' '\n'
Expand Down