#492 passes voltage function tests

pybamm-team · Jul 25, 2019 · 37903e6 · 37903e6
1 parent 78c563e
commit 37903e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/pybamm/expression_tree/functions.py b/pybamm/expression_tree/functions.py
@@ -187,6 +187,8 @@ def _function_simplify(self, simplified_children):
         elif isinstance(self.function, pybamm.GetConstantCurrent):
             # If self.function() is a constant current then simplify to scalar
             return pybamm.Scalar(self.function.parameters_eval["Current [A]"])
+        elif isinstance(self.function, pybamm.GetConstantVoltage):
+            return pybamm.Scalar(self.function.parameters_eval["Cell voltage [V]"])
         else:
             return pybamm.Function(self.function, *simplified_children)
 

diff --git a/pybamm/parameters/parameter_values.py b/pybamm/parameters/parameter_values.py
@@ -352,15 +352,17 @@ def update_scalars(self, symbol):
                     continue
             elif isinstance(x, pybamm.Function):
                 # Need to update values in parameters_eval dict of current functions
-                if isinstance(x.function, pybamm.GetCurrent):
+                if isinstance(x.function, (pybamm.GetCurrent, pybamm.GetVoltage)):
                     for param, sym in x.function.parameters.items():
                         if isinstance(sym, pybamm.Scalar):
                             try:
                                 x.function.parameters_eval[param] = self[sym.name]
                             except KeyError:
                                 # KeyError -> name not in parameter dict, don't update
                                 continue
-                    if isinstance(x.function, pybamm.GetCurrentData):
+                    if isinstance(
+                        x.function, (pybamm.GetCurrentData, pybamm.GetVoltageData)
+                    ):
                         # update interpolant
                         x.function.interpolate()
 

diff --git a/pybamm/parameters/standard_current_functions/base_current.py b/pybamm/parameters/standard_current_functions/base_current.py
@@ -6,7 +6,7 @@
 class GetCurrent(object):
     """
     The base class for setting the input current for a simulation. The parameters
-    dictionary holds the symbols of any paramters required to evaluate the current.
+    dictionary holds the symbols of any parameters required to evaluate the current.
     During processing, the evaluated parameters are stored in parameters_eval.
     """
 

diff --git a/tests/unit/test_parameters/test_voltage_functions.py b/tests/unit/test_parameters/test_voltage_functions.py
@@ -22,7 +22,7 @@ def test_constant_voltage(self):
         voltage = pybamm.electrical_parameters.voltage_with_time
         parameter_values = pybamm.ParameterValues(
             {
-                "Typical voltage [A]": 2,
+                "Typical voltage [V]": 2,
                 "Typical timescale [s]": 1,
                 "Voltage function": pybamm.GetConstantVoltage(),
             }