diff --git a/bpx/__init__.py b/bpx/__init__.py index c7e2ca2..e7e8dd0 100644 --- a/bpx/__init__.py +++ b/bpx/__init__.py @@ -5,7 +5,7 @@ from .schema import BPX, check_sto_limits from .utilities import get_electrode_concentrations, get_electrode_stoichiometries -__version__ = "0.5.0" +__version__ = "1.1.0" __all__ = [ "BPX", diff --git a/bpx/expression_parser.py b/bpx/expression_parser.py index ceb7ff3..5ef323f 100644 --- a/bpx/expression_parser.py +++ b/bpx/expression_parser.py @@ -64,4 +64,4 @@ def push_unary_minus(self, toks: tuple) -> None: def parse_string(self, model_str: str, *, parse_all: bool = True) -> None: self.expr_stack = [] - self.parser.parseString(model_str, parseAll=parse_all) + self.parser.parse_string(model_str, parse_all=parse_all) diff --git a/bpx/schema.py b/bpx/schema.py index 24c4943..2c6e968 100644 --- a/bpx/schema.py +++ b/bpx/schema.py @@ -687,8 +687,8 @@ class State(ExtraBaseModel): alias="Initial conditions", ) - thermal_state: ThermalState = Field( - alias="Thermal state", + thermal_environment: ThermalState = Field( + alias="Thermal environment", ) degradation: Degradation = Field( diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 175a3fa..2b9dabc 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -96,7 +96,7 @@ def setUp(self) -> None: "Initial hysteresis state: Negative electrode": 5, "Initial hysteresis state: Positive electrode": 10 }, - "Thermal state": { + "Thermal environment": { "Ambient temperature [K]": 299, "Heat transfer coefficient [W.m-2.K-1]": 10.0 } diff --git a/tests/test_schema.py b/tests/test_schema.py index 31233ce..64d8dc0 100644 --- a/tests/test_schema.py +++ b/tests/test_schema.py @@ -94,7 +94,7 @@ def setUp(self) -> None: "Secondary": 10, }, }, - "Thermal state": { + "Thermal environment": { "Ambient temperature [K]": 299, "Heat transfer coefficient [W.m-2.K-1]": 10.0, }, @@ -166,7 +166,7 @@ def setUp(self) -> None: }, "Initial hysteresis state: Negative electrode": 5, }, - "Thermal state": { + "Thermal environment": { "Ambient temperature [K]": 299, "Heat transfer coefficient [W.m-2.K-1]": 10.0, }, @@ -232,7 +232,7 @@ def setUp(self) -> None: "Initial hysteresis state: Positive electrode": 10, "Initial hysteresis state: Negative electrode": 5, }, - "Thermal state": { + "Thermal environment": { "Ambient temperature [K]": 299, "Heat transfer coefficient [W.m-2.K-1]": 10.0, }, diff --git a/tests/test_utilities.py b/tests/test_utilities.py index 8715415..58a532e 100644 --- a/tests/test_utilities.py +++ b/tests/test_utilities.py @@ -74,7 +74,7 @@ def setUp(self) -> None: "Initial hysteresis state: Negative electrode": 5, "Initial hysteresis state: Positive electrode": 10, }, - "Thermal state": { + "Thermal environment": { "Ambient temperature [K]": 299, "Heat transfer coefficient [W.m-2.K-1]": 10.0, },