addition of district heating link, ice storage example update, debugg…

…ubg, etc.

data/examples/solar_ice_hp.py

@@ -6,12 +6,6 @@
 from optihood.energy_network import EnergyNetworkGroup as EnergyNetwork
 
 if __name__ == '__main__':
-    """
-    
-    This example is currently under development (use with caution) !
-    
-    """
-
     # set a time period for the optimization problem
     timePeriod = pd.date_range("2018-06-01 00:00:00", "2018-12-31 23:00:00", freq="60min")
 
@@ -29,8 +23,8 @@
     # initialize parameters
     numberOfBuildings = 4
     optimizationType = "costs"  # set as "env" for environmental optimization and "costs" for cost optimization
-    mergeLinkBuses = True
-    mergeBuses = ["electricity", "heatPumpInputBus"] # "heat_buses"
+    mergeLinkBuses = False
+    mergeBuses = [] # "electricity", "heatPumpInputBus"
     dispatchMode = True  # Set to True to run the optimization in dispatch mode
 
     # solver specific command line options

optihood/constraints.py

@@ -66,29 +66,29 @@ def connectInvestmentRule(om):
     dhwLinkOutputFlows = [(i, o) for (i, o) in om.flows if i.label == "dhwLink"]
 
     if elLinkOutputFlows:
-        first = om.InvestmentFlow.invest[next(iter(elLinkOutputFlows))]
+        first = om.InvestmentFlowBlock.invest[next(iter(elLinkOutputFlows))]
         for (i, o) in elLinkOutputFlows:
-            expr = (first == om.InvestmentFlow.invest[i, o])
+            expr = (first == om.InvestmentFlowBlock.invest[i, o])
             setattr(
                 om,
                 "elLinkConstr_" + o.label,
                 pyo.Constraint(expr=expr),
             )
 
     if shLinkOutputFlows:
-        first = om.InvestmentFlow.invest[next(iter(shLinkOutputFlows))]
+        first = om.InvestmentFlowBlock.invest[next(iter(shLinkOutputFlows))]
         for (i, o) in shLinkOutputFlows:
-            expr = (first == om.InvestmentFlow.invest[i, o])
+            expr = (first == om.InvestmentFlowBlock.invest[i, o])
             setattr(
                 om,
                 "shLinkConstr_" + o.label,
                 pyo.Constraint(expr=expr),
             )
 
     if dhwLinkOutputFlows:
-        first = om.InvestmentFlow.invest[next(iter(dhwLinkOutputFlows))]
+        first = om.InvestmentFlowBlock.invest[next(iter(dhwLinkOutputFlows))]
         for (i, o) in dhwLinkOutputFlows:
-            expr = (first == om.InvestmentFlow.invest[i, o])
+            expr = (first == om.InvestmentFlowBlock.invest[i, o])
             setattr(
                 om,
                 "dhwLinkConstr_" + o.label,
@@ -228,12 +228,12 @@ def electricRodCapacityConstaint(om, numBuildings):
     groundHeatPumpCapacityTotal = 0
 
     for b in range(1,numBuildings+1):
-        elRodCapacity = [om.InvestmentFlow.invest[i, o] for (i, o) in electricRodInputFlows if ((f'__Building{b}') in o.label)]
-        airHeatPumpCapacity = [om.InvestmentFlow.invest[i, o] for (i, o) in airHeatPumpInputFlows if ((f'__Building{b}') in o.label)]
+        elRodCapacity = [om.InvestmentFlowBlock.invest[i, o] for (i, o) in electricRodInputFlows if ((f'__Building{b}') in o.label)]
+        airHeatPumpCapacity = [om.InvestmentFlowBlock.invest[i, o] for (i, o) in airHeatPumpInputFlows if ((f'__Building{b}') in o.label)]
         if groundHeatPumpInputFlows:
-            groundHeatPumpCapacity = [om.InvestmentFlow.invest[i, o] for (i, o) in groundHeatPumpInputFlows if ((f'__Building{b}') in o.label)]
+            groundHeatPumpCapacity = [om.InvestmentFlowBlock.invest[i, o] for (i, o) in groundHeatPumpInputFlows if ((f'__Building{b}') in o.label)]
         else:
-            groundHeatPumpCapacity = [om.InvestmentFlow.invest[i, o] for (i, o) in groundHeatPumpOutFlows if ((f'__Building{b}') in i.label)]
+            groundHeatPumpCapacity = [om.InvestmentFlowBlock.invest[i, o] for (i, o) in groundHeatPumpOutFlows if ((f'__Building{b}') in i.label)]
         if elRodCapacity:
             elRodCapacity = elRodCapacity[0]
             airHeatPumpCapacity = airHeatPumpCapacity[0] if airHeatPumpCapacity else 0
@@ -257,7 +257,7 @@ def totalPVCapacityConstraint(om, numBuildings):
     pvOutFlows = [(i, o) for (i, o) in om.flows if ("pv" in i.label)]
     pvCapacityTotal = 0
     for b in range(1,numBuildings+1):
-        pvCapacity = [om.InvestmentFlow.invest[i, o] for (i, o) in pvOutFlows if ((f'__Building{b}') in o.label)]
+        pvCapacity = [om.InvestmentFlowBlock.invest[i, o] for (i, o) in pvOutFlows if ((f'__Building{b}') in o.label)]
         if pvCapacity:
             pvCapacity = pvCapacity[0]
             pvCapacityTotal = pvCapacityTotal + pvCapacity

optihood/energy_network.py

@@ -1404,9 +1404,13 @@ def _addLinks(self, data, numberOfBuildings, mergeLinkBuses):  # connects buses
                     elif "heat" in l["label"]:
                         busesOut.append(self._busDict["heatBus" + l["label"][-1] + '__Building' + str(b + 1)])
                         busesIn.append(self._busDict["heatDemandBus" + l["label"][-1] + '__Building' + str(b + 1)])
-                    else:
+                    elif "electricity" in l["label"]:
                         busesOut.append(self._busDict["electricityBus" + '__Building' + str(b + 1)])
                         busesIn.append(self._busDict["electricityInBus" + '__Building' + str(b + 1)])
+                    elif "dhLink" in l["label"]:
+                        if "districtHeatingInputBus" + '__Building' + str(b + 1) in self._busDict:
+                            busesOut.append(self._busDict["districtHeatingInputBus"  + '__Building' + str(b + 1)])
+                        busesIn.append(self._busDict["districtHeatingBus" + '__Building' + str(b + 1)])
 
                 self._nodesList.append(Link(
                     label=l["label"],