Skip to content

Commit

Permalink
Remove fluid_vec occurrence and other clean up (#2).
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfreissmann
jfreissmann committed Jun 19, 2024
1 parent b369065 commit 22b81ff
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 143 deletions.
12 changes: 1 addition & 11 deletions src/heatpumps/models/HeatPumpBase.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,12 @@ def __init__(self, params):
self.si = self.params['fluids']['si']
self.so = self.params['fluids']['so']

if self.si == self.so:
self.fluid_vec_wf = {self.wf: 1, self.si:0}
self.fluid_vec_si = {self.wf: 0, self.si: 1}
self.fluid_vec_so = {self.wf: 0, self.si: 1}
else:
self.fluid_vec_wf = {self.wf: 1, self.si: 0, self.so: 0}
self.fluid_vec_si = {self.wf: 0, self.si: 1, self.so: 0}
self.fluid_vec_so = {self.wf: 0, self.si: 0, self.so: 1}

self.comps = dict()
self.conns = dict()
self.buses = dict()

self.nw = Network(
T_unit='C', p_unit='bar', h_unit='kJ / kg',
m_unit='kg / s'
T_unit='C', p_unit='bar', h_unit='kJ / kg', m_unit='kg / s'
)

self.cop = np.nan
Expand Down
34 changes: 1 addition & 33 deletions src/heatpumps/models/HeatPumpCascade.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,44 +31,12 @@ def __init__(self, params):
self.si = self.params['fluids']['si']
self.so = self.params['fluids']['so']

if self.wf1 == self.wf2:
if self.si == self.so:
self.fluid_vec_wf1 = {self.wf1: 1, self.si: 0}
self.fluid_vec_wf2 = {self.wf1: 1, self.si: 0}
self.fluid_vec_si = {self.wf1: 0, self.si: 1}
self.fluid_vec_so = {self.wf1: 0, self.si: 1}
else:
self.fluid_vec_wf1 = {self.wf1: 1, self.si: 0, self.so: 0}
self.fluid_vec_wf2 = {self.wf1: 1, self.si: 0, self.so: 0}
self.fluid_vec_si = {self.wf1: 0, self.si: 1, self.so: 0}
self.fluid_vec_so = {self.wf1: 0, self.si: 0, self.so: 1}
else:
if self.si == self.so:
self.fluid_vec_wf1 = {self.wf1: 1, self.wf2: 0, self.si: 0}
self.fluid_vec_wf2 = {self.wf1: 0, self.wf2: 1, self.si: 0}
self.fluid_vec_si = {self.wf1: 0, self.wf2: 0, self.si: 1}
self.fluid_vec_so = {self.wf1: 0, self.wf2: 0, self.si: 1}
else:
self.fluid_vec_wf1 = {
self.wf1: 1, self.wf2: 0, self.si: 0, self.so: 0
}
self.fluid_vec_wf2 = {
self.wf1: 0, self.wf2: 1, self.si: 0, self.so: 0
}
self.fluid_vec_si = {
self.wf1: 0, self.wf2: 0, self.si: 1, self.so: 0
}
self.fluid_vec_so = {
self.wf1: 0, self.wf2: 0, self.si: 0, self.so: 1
}

self.comps = dict()
self.conns = dict()
self.buses = dict()

self.nw = Network(
T_unit='C', p_unit='bar', h_unit='kJ / kg',
m_unit='kg / s'
T_unit='C', p_unit='bar', h_unit='kJ / kg', m_unit='kg / s'
)

self.cop = np.nan
Expand Down
34 changes: 1 addition & 33 deletions src/heatpumps/models/HeatPumpCascade2IHX.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,44 +31,12 @@ def __init__(self, params):
self.si = self.params['fluids']['si']
self.so = self.params['fluids']['so']

if self.wf1 == self.wf2:
if self.si == self.so:
self.fluid_vec_wf1 = {self.wf1: 1, self.si: 0}
self.fluid_vec_wf2 = {self.wf1: 1, self.si: 0}
self.fluid_vec_si = {self.wf1: 0, self.si: 1}
self.fluid_vec_so = {self.wf1: 0, self.si: 1}
else:
self.fluid_vec_wf1 = {self.wf1: 1, self.si: 0, self.so: 0}
self.fluid_vec_wf2 = {self.wf1: 1, self.si: 0, self.so: 0}
self.fluid_vec_si = {self.wf1: 0, self.si: 1, self.so: 0}
self.fluid_vec_so = {self.wf1: 0, self.si: 0, self.so: 1}
else:
if self.si == self.so:
self.fluid_vec_wf1 = {self.wf1: 1, self.wf2: 0, self.si: 0}
self.fluid_vec_wf2 = {self.wf1: 0, self.wf2: 1, self.si: 0}
self.fluid_vec_si = {self.wf1: 0, self.wf2: 0, self.si: 1}
self.fluid_vec_so = {self.wf1: 0, self.wf2: 0, self.si: 1}
else:
self.fluid_vec_wf1 = {
self.wf1: 1, self.wf2: 0, self.si: 0, self.so: 0
}
self.fluid_vec_wf2 = {
self.wf1: 0, self.wf2: 1, self.si: 0, self.so: 0
}
self.fluid_vec_si = {
self.wf1: 0, self.wf2: 0, self.si: 1, self.so: 0
}
self.fluid_vec_so = {
self.wf1: 0, self.wf2: 0, self.si: 0, self.so: 1
}

self.comps = dict()
self.conns = dict()
self.buses = dict()

self.nw = Network(
T_unit='C', p_unit='bar', h_unit='kJ / kg',
m_unit='kg / s'
T_unit='C', p_unit='bar', h_unit='kJ / kg', m_unit='kg / s'
)

self.cop = np.nan
Expand Down
34 changes: 1 addition & 33 deletions src/heatpumps/models/HeatPumpCascade2IHXTrans.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,44 +31,12 @@ def __init__(self, params):
self.si = self.params['fluids']['si']
self.so = self.params['fluids']['so']

if self.wf1 == self.wf2:
if self.si == self.so:
self.fluid_vec_wf1 = {self.wf1: 1, self.si: 0}
self.fluid_vec_wf2 = {self.wf1: 1, self.si: 0}
self.fluid_vec_si = {self.wf1: 0, self.si: 1}
self.fluid_vec_so = {self.wf1: 0, self.si: 1}
else:
self.fluid_vec_wf1 = {self.wf1: 1, self.si: 0, self.so: 0}
self.fluid_vec_wf2 = {self.wf1: 1, self.si: 0, self.so: 0}
self.fluid_vec_si = {self.wf1: 0, self.si: 1, self.so: 0}
self.fluid_vec_so = {self.wf1: 0, self.si: 0, self.so: 1}
else:
if self.si == self.so:
self.fluid_vec_wf1 = {self.wf1: 1, self.wf2: 0, self.si: 0}
self.fluid_vec_wf2 = {self.wf1: 0, self.wf2: 1, self.si: 0}
self.fluid_vec_si = {self.wf1: 0, self.wf2: 0, self.si: 1}
self.fluid_vec_so = {self.wf1: 0, self.wf2: 0, self.si: 1}
else:
self.fluid_vec_wf1 = {
self.wf1: 1, self.wf2: 0, self.si: 0, self.so: 0
}
self.fluid_vec_wf2 = {
self.wf1: 0, self.wf2: 1, self.si: 0, self.so: 0
}
self.fluid_vec_si = {
self.wf1: 0, self.wf2: 0, self.si: 1, self.so: 0
}
self.fluid_vec_so = {
self.wf1: 0, self.wf2: 0, self.si: 0, self.so: 1
}

self.comps = dict()
self.conns = dict()
self.buses = dict()

self.nw = Network(
T_unit='C', p_unit='bar', h_unit='kJ / kg',
m_unit='kg / s'
T_unit='C', p_unit='bar', h_unit='kJ / kg', m_unit='kg / s'
)

self.cop = np.nan
Expand Down
34 changes: 1 addition & 33 deletions src/heatpumps/models/HeatPumpCascadeTrans.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,44 +31,12 @@ def __init__(self, params):
self.si = self.params['fluids']['si']
self.so = self.params['fluids']['so']

if self.wf1 == self.wf2:
if self.si == self.so:
self.fluid_vec_wf1 = {self.wf1: 1, self.si: 0}
self.fluid_vec_wf2 = {self.wf1: 1, self.si: 0}
self.fluid_vec_si = {self.wf1: 0, self.si: 1}
self.fluid_vec_so = {self.wf1: 0, self.si: 1}
else:
self.fluid_vec_wf1 = {self.wf1: 1, self.si: 0, self.so: 0}
self.fluid_vec_wf2 = {self.wf1: 1, self.si: 0, self.so: 0}
self.fluid_vec_si = {self.wf1: 0, self.si: 1, self.so: 0}
self.fluid_vec_so = {self.wf1: 0, self.si: 0, self.so: 1}
else:
if self.si == self.so:
self.fluid_vec_wf1 = {self.wf1: 1, self.wf2: 0, self.si: 0}
self.fluid_vec_wf2 = {self.wf1: 0, self.wf2: 1, self.si: 0}
self.fluid_vec_si = {self.wf1: 0, self.wf2: 0, self.si: 1}
self.fluid_vec_so = {self.wf1: 0, self.wf2: 0, self.si: 1}
else:
self.fluid_vec_wf1 = {
self.wf1: 1, self.wf2: 0, self.si: 0, self.so: 0
}
self.fluid_vec_wf2 = {
self.wf1: 0, self.wf2: 1, self.si: 0, self.so: 0
}
self.fluid_vec_si = {
self.wf1: 0, self.wf2: 0, self.si: 1, self.so: 0
}
self.fluid_vec_so = {
self.wf1: 0, self.wf2: 0, self.si: 0, self.so: 1
}

self.comps = dict()
self.conns = dict()
self.buses = dict()

self.nw = Network(
T_unit='C', p_unit='bar', h_unit='kJ / kg',
m_unit='kg / s'
T_unit='C', p_unit='bar', h_unit='kJ / kg', m_unit='kg / s'
)

self.cop = np.nan
Expand Down

0 comments on commit 22b81ff

Please sign in to comment.