Skip to content

Commit

Permalink
format with black formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
@bertkdowns
bertkdowns committed Nov 13, 2024
1 parent c4ce54c commit 5a01cd9
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 20 deletions.
20 changes: 15 additions & 5 deletions idaes/models/properties/general_helmholtz/helmholtz_functions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@

_log = idaeslog.getLogger(__name__)


def _get_data_dir():
return os.path.join(get_parameter_path(),"")
return os.path.join(get_parameter_path(), "")


# General Helmholtz functions return variables for all phases,
# but single phase properties do not need all of these.
Expand All @@ -82,6 +84,7 @@ def helmholtz_available():
return False
return True


_data_dir = _get_data_dir()
helmholtz_data_dir = _data_dir
auto_register()
Expand Down Expand Up @@ -1855,7 +1858,8 @@ def dome_data(
p_vec = [
pyo.value(
pyo.units.convert(
self.p_sat_func(self.pure_component, tau, _get_data_dir()), pressure_unit
self.p_sat_func(self.pure_component, tau, _get_data_dir()),
pressure_unit,
)
)
for tau in tau_vec
Expand Down Expand Up @@ -2003,14 +2007,18 @@ def _pvec(d, tau, p1, p2=None, phase="sat"):
if phase == "liq" or phase == "sc":
delta = [
pyo.value(
self.delta_liq_func(self.pure_component, p, tau, _get_data_dir())
self.delta_liq_func(
self.pure_component, p, tau, _get_data_dir()
)
)
for p in p_vec
]
elif phase == "vap":
delta = [
pyo.value(
self.delta_vap_func(self.pure_component, p, tau, _get_data_dir())
self.delta_vap_func(
self.pure_component, p, tau, _get_data_dir()
)
)
for p in p_vec
]
Expand Down Expand Up @@ -2052,7 +2060,9 @@ def _pvec(d, tau, p1, p2=None, phase="sat"):
_pvec(d2["sc"], tau, pc, pmax, "sc")
_pvec(d2["vap"], tau, pc, pt, "vap")
else:
p_sat = pyo.value(self.p_sat_func(self.pure_component, tau, _get_data_dir()))
p_sat = pyo.value(
self.p_sat_func(self.pure_component, tau, _get_data_dir())
)
_pvec(d2["liq"], tau, p_sat, pmax, "liq")
_pvec(d2["sat"], tau, p_sat, p_sat, "sat")
_pvec(d2["vap"], tau, p_sat, pt, "vap")
Expand Down
57 changes: 42 additions & 15 deletions idaes/models/properties/general_helmholtz/helmholtz_state.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,9 @@ def _state_vars(self):
)
if phase_set == PhaseType.MIX or phase_set == PhaseType.LG:
self.vapor_frac = pyo.Expression(
expr=self.vf_hp_func(cmp, self.h_kJ_per_kg, self.p_kPa, _get_data_dir()),
expr=self.vf_hp_func(
cmp, self.h_kJ_per_kg, self.p_kPa, _get_data_dir()
),
doc="Vapor mole fraction (mol vapor/mol total)",
)
self._state_vars_dict = {
Expand All @@ -392,7 +394,9 @@ def _state_vars(self):
)
if phase_set == PhaseType.MIX or phase_set == PhaseType.LG:
self.vapor_frac = pyo.Expression(
expr=self.vf_hp_func(cmp, self.h_kJ_per_kg, self.p_kPa, _get_data_dir()),
expr=self.vf_hp_func(
cmp, self.h_kJ_per_kg, self.p_kPa, _get_data_dir()
),
doc="Vapor mole fraction (mol vapor/mol total)",
)
self._state_vars_dict = {
Expand All @@ -413,12 +417,16 @@ def _state_vars(self):
expr=self.entr_mol * params.uc["J/mol/K to kJ/kg/K"]
)
self.temperature = pyo.Expression(
expr=self.t_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()),
expr=self.t_sp_func(
cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()
),
doc="Temperature",
)
if phase_set == PhaseType.MIX or phase_set == PhaseType.LG:
self.vapor_frac = pyo.Expression(
expr=self.vf_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()),
expr=self.vf_sp_func(
cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()
),
doc="Vapor mole fraction (mol vapor/mol total)",
)
self._state_vars_dict = {
Expand All @@ -439,12 +447,16 @@ def _state_vars(self):
expr=self.entr_mass * params.uc["J/kg/K to kJ/kg/K"]
)
self.temperature = pyo.Expression(
expr=self.t_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()),
expr=self.t_sp_func(
cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()
),
doc="Temperature",
)
if phase_set == PhaseType.MIX or phase_set == PhaseType.LG:
self.vapor_frac = pyo.Expression(
expr=self.vf_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()),
expr=self.vf_sp_func(
cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()
),
doc="Vapor mole fraction (mol vapor/mol total)",
)
self._state_vars_dict = {
Expand All @@ -470,7 +482,9 @@ def _state_vars(self):
)
if phase_set == PhaseType.MIX or phase_set == PhaseType.LG:
self.vapor_frac = pyo.Expression(
expr=self.vf_up_func(cmp, self.u_kJ_per_kg, self.p_kPa, _get_data_dir()),
expr=self.vf_up_func(
cmp, self.u_kJ_per_kg, self.p_kPa, _get_data_dir()
),
doc="Vapor mole fraction (mol vapor/mol total)",
)
self._state_vars_dict = {
Expand All @@ -496,7 +510,9 @@ def _state_vars(self):
)
if phase_set == PhaseType.MIX or phase_set == PhaseType.LG:
self.vapor_frac = pyo.Expression(
expr=self.vf_up_func(cmp, self.u_kJ_per_kg, self.p_kPa, _get_data_dir()),
expr=self.vf_up_func(
cmp, self.u_kJ_per_kg, self.p_kPa, _get_data_dir()
),
doc="Vapor mole fraction (mol vapor/mol total)",
)
self._state_vars_dict = {
Expand Down Expand Up @@ -1227,7 +1243,8 @@ def component_flow_mass(b, i):
* params.uc["kJ/kg/K to J/mol/K"]
)
self.dens_mass = pyo.Expression(
expr=1.0 / self.v_hp_func(cmp, self.h_kJ_per_kg, self.p_kPa, _get_data_dir())
expr=1.0
/ self.v_hp_func(cmp, self.h_kJ_per_kg, self.p_kPa, _get_data_dir())
)
self.dens_mol = pyo.Expression(
expr=params.uc["kg/m3 to mol/m3"]
Expand Down Expand Up @@ -1260,23 +1277,32 @@ def component_flow_mass(b, i):
* params.uc["kJ/kg to J/mol"]
)
self.cp_mass = pyo.Expression(
expr=self.cp_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir())
expr=self.cp_sp_func(
cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()
)
* params.uc["kJ/kg/K to J/kg/K"]
)
self.cp_mol = pyo.Expression(
expr=self.cp_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir())
expr=self.cp_sp_func(
cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()
)
* params.uc["kJ/kg/K to J/mol/K"]
)
self.cv_mass = pyo.Expression(
expr=self.cv_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir())
expr=self.cv_sp_func(
cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()
)
* params.uc["kJ/kg/K to J/kg/K"]
)
self.cv_mol = pyo.Expression(
expr=self.cv_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir())
expr=self.cv_sp_func(
cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir()
)
* params.uc["kJ/kg/K to J/mol/K"]
)
self.dens_mass = pyo.Expression(
expr=1.0 / self.v_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir())
expr=1.0
/ self.v_sp_func(cmp, self.s_kJ_per_kgK, self.p_kPa, _get_data_dir())
)
self.dens_mol = pyo.Expression(
expr=params.uc["kg/m3 to mol/m3"]
Expand Down Expand Up @@ -1325,7 +1351,8 @@ def component_flow_mass(b, i):
* params.uc["kJ/kg/K to J/mol/K"]
)
self.dens_mass = pyo.Expression(
expr=1.0 / self.v_up_func(cmp, self.u_kJ_per_kg, self.p_kPa, _get_data_dir())
expr=1.0
/ self.v_up_func(cmp, self.u_kJ_per_kg, self.p_kPa, _get_data_dir())
)
self.dens_mol = pyo.Expression(
expr=params.uc["kg/m3 to mol/m3"]
Expand Down

0 comments on commit 5a01cd9

Please sign in to comment.