Skip to content

Commit

Permalink
Refactor PureFluid derived classes as functions
Browse files Browse the repository at this point in the history
Since the only overridden method was __init__, it makes more sense for
these to be functions than subclasses.
  • Loading branch information
bryanwweber authored and speth committed Apr 25, 2023
1 parent f507624 commit 24e7f0e
Showing 1 changed file with 16 additions and 24 deletions.
40 changes: 16 additions & 24 deletions interfaces/cython/cantera/units/solution.py.in
Expand Up @@ -84,41 +84,33 @@ class PureFluid(Solution):
@purefluid_properties@


class Heptane(PureFluid):
def __init__(self):
super().__init__("liquidvapor.yaml", "heptane")
def Heptane():
return PureFluid("liquidvapor.yaml", "heptane")


class CarbonDioxide(PureFluid):
def __init__(self):
super().__init__("liquidvapor.yaml", "carbon-dioxide")
def CarbonDioxide():
return PureFluid("liquidvapor.yaml", "carbon-dioxide")


class Hfc134a(PureFluid):
def __init__(self):
super().__init__("liquidvapor.yaml", "hfc134a")
def Hfc134a():
return PureFluid("liquidvapor.yaml", "hfc134a")


class Hydrogen(PureFluid):
def __init__(self):
super().__init__("liquidvapor.yaml", "hydrogen")
def Hydrogen():
return PureFluid("liquidvapor.yaml", "hydrogen")


class Methane(PureFluid):
def __init__(self):
super().__init__("liquidvapor.yaml", "methane")
def Methane():
return PureFluid("liquidvapor.yaml", "methane")


class Nitrogen(PureFluid):
def __init__(self):
super().__init__("liquidvapor.yaml", "nitrogen")
def Nitrogen():
return PureFluid("liquidvapor.yaml", "nitrogen")


class Oxygen(PureFluid):
def __init__(self):
super().__init__("liquidvapor.yaml", "oxygen")
def Oxygen():
return PureFluid("liquidvapor.yaml", "oxygen")


class Water(PureFluid):
def __init__(self):
super().__init__("liquidvapor.yaml", "water")
def Water():
return PureFluid("liquidvapor.yaml", "water")

0 comments on commit 24e7f0e

Please sign in to comment.