Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bpx/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion bpx/expression_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions bpx/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions tests/test_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down