Merge pull request #2478 from architecture-building-systems/2477-wron…

…g-column-name-in-piping-catalog 2477 wrong column name in piping catalog
architecture-building-systems · Dec 3, 2019 · bc80bac · bc80bac
2 parents 5942f65 + 4b6aed4
commit bc80bac
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/cea/databases/SG/systems/supply_systems.xls b/cea/databases/SG/systems/supply_systems.xls
diff --git a/cea/optimization/slave/cooling_main.py b/cea/optimization/slave/cooling_main.py
@@ -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

diff --git a/cea/technologies/thermal_network/thermal_network.py b/cea/technologies/thermal_network/thermal_network.py
@@ -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'