#247 fix parameter printing

pybamm-team · Feb 24, 2020 · 5a0690a · 5a0690a
1 parent 79cbec9
commit 5a0690a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pybamm/parameters/print_parameters.py b/pybamm/parameters/print_parameters.py
@@ -67,7 +67,10 @@ def print_parameters(parameters, parameter_values, output_file=None):
                 proc_symbol = parameter_values.process_symbol(symbol)
                 if not (
                     callable(proc_symbol)
-                    or isinstance(proc_symbol, pybamm.Concatenation)
+                    or any(
+                        isinstance(x, (pybamm.Concatenation, pybamm.Broadcast))
+                        for x in proc_symbol.pre_order()
+                    )
                 ):
                     evaluated_parameters[name].append(proc_symbol.evaluate(t=0))
 

diff --git a/pybamm/parameters/standard_parameters_lithium_ion.py b/pybamm/parameters/standard_parameters_lithium_ion.py
@@ -288,10 +288,15 @@ def U_p_dimensional(sto, T):
 centre_z_tab_p = pybamm.geometric_parameters.centre_z_tab_p
 
 # Microscale geometry
-var = pybamm.standard_spatial_vars
-epsilon_n = pybamm.FunctionParameter("Negative electrode porosity", var.x_n)
-epsilon_s = pybamm.FunctionParameter("Separator porosity", var.x_s)
-epsilon_p = pybamm.FunctionParameter("Positive electrode porosity", var.x_p)
+epsilon_n = pybamm.FunctionParameter(
+    "Negative electrode porosity", pybamm.standard_spatial_vars.x_n
+)
+epsilon_s = pybamm.FunctionParameter(
+    "Separator porosity", pybamm.standard_spatial_vars.x_s
+)
+epsilon_p = pybamm.FunctionParameter(
+    "Positive electrode porosity", pybamm.standard_spatial_vars.x_p
+)
 epsilon = pybamm.Concatenation(epsilon_n, epsilon_s, epsilon_p)
 epsilon_s_n = pybamm.Parameter("Negative electrode active material volume fraction")
 epsilon_s_p = pybamm.Parameter("Positive electrode active material volume fraction")
@@ -318,7 +323,7 @@ def U_p_dimensional(sto, T):
 
 # Electrolyte Properties
 t_plus = pybamm.Parameter("Cation transference number")
-beta_surf = 0
+beta_surf = pybamm.Scalar(0)
 s = 1 - t_plus