Skip to content

Commit

Permalink
* Adapt the init file to integrate the new model type, #40.
Browse files Browse the repository at this point in the history
  • Loading branch information
MBaranskiEBC committed Dec 30, 2018
1 parent 00e4f7d commit 404c01f
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions pyDMPC/ControlFramework/Init.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
cost_par = [] #for MassFlowRate
IDs_inputs = []
cost_factor = []
model_type = []

""" Subsystems """
# Heat recovery system
Expand All @@ -138,6 +139,7 @@
IDs_inputs.append(['outdoorHumidityOutput','outdoorTemperatureOutput','roomHumidityOutput','roomTemperatureOutput'])
cost_par.append(None)
cost_factor.append(0)
model_type.append("MLP")

# Pre-heater
name.append('Pre_heater')
Expand All @@ -154,6 +156,7 @@
IDs_inputs.append(["hRCHumidityOutput","hRCTemperatureCOutput"])
cost_par.append('val.port_1.m_flow')
cost_factor.append(0.5)
model_type.append("MLP")

# Cooler
name.append('Cooler')
Expand All @@ -170,6 +173,7 @@
IDs_inputs.append(["preHeaterHumidityOutput","preHeaterTemperatureCOutput"])
cost_par.append('CoolerValve.port_b.m_flow')
cost_factor.append(0.5)
model_type.append("MLP")

# Heater
name.append('Heater')
Expand All @@ -186,6 +190,7 @@
IDs_inputs.append(["coolerHumidityOutput","coolerTemperatureCOutput"])
cost_par.append('val.port_1.m_flow')
cost_factor.append(0.5)
model_type.append("MLP")

# Steam_humidifier
name.append('Steam_humidifier')
Expand All @@ -197,8 +202,9 @@
model_path.append('ModelicaModels.SubsystemModels.DetailedModels.Humidifier')
names_DVs.append('humidifierWSP1')
output_vars.append(["supplyAirTemperature.T","supplyAirHumidity.phi"])
initial_names.append(None)
IDs_initial_values.append(None)
initial_names.append(["hex.ele[1].mas.T","hex.ele[2].mas.T","hex.ele[3].mas.T","hex.ele[4].mas.T"])
IDs_initial_values.append(["heaterhexele1masT","heaterhexele2masT","heaterhexele3masT","heaterhexele4masT"])
IDs_inputs.append(["heaterHumidityOutput","heaterTemperatureCOutput"])
cost_par.append('product3.y')
cost_factor.append(0.5)
model_type.append("MLP")

0 comments on commit 404c01f

Please sign in to comment.