File tree Expand file tree Collapse file tree 3 files changed +12
-22
lines changed
Expand file tree Collapse file tree 3 files changed +12
-22
lines changed Original file line number Diff line number Diff line change @@ -380,16 +380,12 @@ def __init__(self, *children):
380380 raise ValueError ("Cannot concatenate symbols with different bounds" )
381381 super ().__init__ (* children , name = name )
382382
383- if not any (c ._raw_print_name is None for c in children ):
384- print_name = intersect (
385- children [0 ]._raw_print_name , children [1 ]._raw_print_name
386- )
387- for child in children [2 :]:
388- print_name = intersect (print_name , child ._raw_print_name )
389- if print_name .endswith ("_" ):
390- print_name = print_name [:- 1 ]
391- else :
392- print_name = None
383+ print_name = intersect (children [0 ]._raw_print_name , children [1 ]._raw_print_name )
384+ for child in children [2 :]:
385+ print_name = intersect (print_name , child ._raw_print_name )
386+ if print_name .endswith ("_" ):
387+ print_name = print_name [:- 1 ]
388+
393389 self .print_name = print_name
394390
395391
Original file line number Diff line number Diff line change @@ -392,14 +392,10 @@ def set_parameters(self):
392392 if self .model_with_set_params :
393393 return
394394
395- if self ._parameter_values ._dict_items == {}:
396- # Don't process if parameter values is empty
397- self ._model_with_set_params = self ._unprocessed_model
398- else :
399- self ._model_with_set_params = self ._parameter_values .process_model (
400- self ._unprocessed_model , inplace = False
401- )
402- self ._parameter_values .process_geometry (self .geometry )
395+ self ._model_with_set_params = self ._parameter_values .process_model (
396+ self ._unprocessed_model , inplace = False
397+ )
398+ self ._parameter_values .process_geometry (self .geometry )
403399 self .model = self ._model_with_set_params
404400
405401 def set_initial_soc (self , initial_soc ):
Original file line number Diff line number Diff line change @@ -11,11 +11,9 @@ class TestSimulation(unittest.TestCase):
1111 def test_simple_model (self ):
1212 model = pybamm .BaseModel ()
1313 v = pybamm .Variable ("v" )
14- a = pybamm .Parameter ("a" )
15- model .rhs = {v : - a * v }
14+ model .rhs = {v : - v }
1615 model .initial_conditions = {v : 1 }
17- param = pybamm .ParameterValues ({"a" : 1 })
18- sim = pybamm .Simulation (model , parameter_values = param )
16+ sim = pybamm .Simulation (model )
1917 sol = sim .solve ([0 , 1 ])
2018 np .testing .assert_array_almost_equal (sol .y .full ()[0 ], np .exp (- sol .t ), decimal = 5 )
2119
You can’t perform that action at this time.
0 commit comments