pybop-team · NicolaCourtier · Jan 24, 2025 · Dec 12, 2024 · Dec 12, 2024 · Dec 12, 2024
diff --git a/examples/notebooks/battery_parameterisation/equivalent_circuit_identification.ipynb b/examples/notebooks/battery_parameterisation/equivalent_circuit_identification.ipynb
@@ -116,8 +116,7 @@
    "source": [
     "# parameter_set = pybop.ParameterSet(\n",
     "# json_path=\"examples/parameters/initial_ecm_parameters.json\"\n",
-    "# )\n",
-    "# parameter_set.import_parameters()"
+    "# )"
    ]
   },
   {

diff --git a/examples/notebooks/battery_parameterisation/equivalent_circuit_identification_hppc.ipynb b/examples/notebooks/battery_parameterisation/equivalent_circuit_identification_hppc.ipynb
@@ -76,7 +76,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"ECM_Example\")\n",
+    "parameter_set = pybop.ParameterSet(\"ECM_Example\")\n",
     "parameter_set.update(\n",
     "    {\n",
     "        \"Cell capacity [A.h]\": 3,\n",

diff --git a/...les/notebooks/battery_parameterisation/equivalent_circuit_identification_multipulse.ipynb b/...les/notebooks/battery_parameterisation/equivalent_circuit_identification_multipulse.ipynb
@@ -78,7 +78,7 @@
    "outputs": [],
    "source": [
     "# Load the parameters\n",
-    "parameter_set = pybop.ParameterSet.pybamm(\"ECM_Example\")\n",
+    "parameter_set = pybop.ParameterSet(\"ECM_Example\")\n",
     "parameter_set.update(\n",
     "    {\n",
     "        \"Cell capacity [A.h]\": 3,\n",

diff --git a/examples/notebooks/battery_parameterisation/monte_carlo_ecm_identification.ipynb b/examples/notebooks/battery_parameterisation/monte_carlo_ecm_identification.ipynb
@@ -194,7 +194,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"ECM_Example\")\n",
+    "parameter_set = pybop.ParameterSet(\"ECM_Example\")\n",
     "parameter_set.update(\n",
     "    {\n",
     "        \"Cell capacity [A.h]\": 22.651,  # 083/828 - C/20\n",

diff --git a/examples/notebooks/battery_parameterisation/multi_model_identification.ipynb b/examples/notebooks/battery_parameterisation/multi_model_identification.ipynb
@@ -128,7 +128,7 @@
    },
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "parameter_set = pybamm.get_size_distribution_parameters(parameter_set)\n",
     "synth_model = pybop.lithium_ion.DFN(\n",
     "    parameter_set=parameter_set, options={\"particle size\": \"distribution\"}\n",

diff --git a/examples/notebooks/battery_parameterisation/pouch_cell_identification.ipynb b/examples/notebooks/battery_parameterisation/pouch_cell_identification.ipynb
@@ -108,7 +108,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Marquis2019\")\n",
+    "parameter_set = pybop.ParameterSet(\"Marquis2019\")\n",
     "parameter_set.update(\n",
     "    {\n",
     "        \"Negative electrode active material volume fraction\": 0.495,\n",

diff --git a/examples/notebooks/battery_parameterisation/single_pulse_circuit_model.ipynb b/examples/notebooks/battery_parameterisation/single_pulse_circuit_model.ipynb
@@ -286,7 +286,7 @@
    "outputs": [],
    "source": [
     "params = pybop.ParameterSet(\n",
-    "    params_dict={\n",
+    "    {\n",
     "        \"chemistry\": \"ecm\",\n",
     "        \"Initial SoC\": 0.9 - 0.01,\n",
     "        \"Initial temperature [K]\": 25 + 273.15,\n",

diff --git a/examples/notebooks/comparison_examples/comparing_cost_functions.ipynb b/examples/notebooks/comparison_examples/comparing_cost_functions.ipynb
@@ -113,7 +113,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "model = pybop.lithium_ion.SPM(parameter_set=parameter_set)"
    ]
   },

diff --git a/examples/notebooks/comparison_examples/multi_optimiser_identification.ipynb b/examples/notebooks/comparison_examples/multi_optimiser_identification.ipynb
@@ -123,7 +123,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "synth_model = pybop.lithium_ion.DFN(parameter_set=parameter_set)\n",
     "model = pybop.lithium_ion.SPMe(parameter_set=parameter_set)"
    ]

diff --git a/examples/notebooks/comparison_examples/optimiser_calibration.ipynb b/examples/notebooks/comparison_examples/optimiser_calibration.ipynb
@@ -123,7 +123,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "parameter_set.update(\n",
     "    {\n",
     "        \"Negative electrode active material volume fraction\": 0.65,\n",

diff --git a/examples/notebooks/comparison_examples/solver_selection.ipynb b/examples/notebooks/comparison_examples/solver_selection.ipynb
@@ -105,7 +105,7 @@
    "outputs": [],
    "source": [
     "# Model\n",
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "model = pybop.lithium_ion.SPM(parameter_set=parameter_set)\n",
     "\n",
     "# Synthetic data\n",

diff --git a/examples/notebooks/design_optimisation/energy_based_electrode_design.ipynb b/examples/notebooks/design_optimisation/energy_based_electrode_design.ipynb
@@ -131,7 +131,7 @@
    },
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "parameter_set.update(\n",
     "    {\n",
     "        \"Electrolyte density [kg.m-3]\": Parameter(\"Separator density [kg.m-3]\"),\n",

diff --git a/examples/notebooks/getting_started/adamw_identification.ipynb b/examples/notebooks/getting_started/adamw_identification.ipynb
@@ -127,7 +127,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "model = pybop.lithium_ion.SPM(parameter_set=parameter_set)"
    ]
   },

diff --git a/examples/notebooks/getting_started/cost_compute_methods.ipynb b/examples/notebooks/getting_started/cost_compute_methods.ipynb
@@ -98,7 +98,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "model = pybop.lithium_ion.SPM(parameter_set=parameter_set)"
    ]
   },

diff --git a/examples/notebooks/getting_started/creating_a_model.ipynb b/examples/notebooks/getting_started/creating_a_model.ipynb
@@ -81,7 +81,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Marquis2019\")\n",
+    "parameter_set = pybop.ParameterSet(\"Marquis2019\")\n",
     "model = pybop.lithium_ion.SPM(parameter_set=parameter_set)"
    ]
   },

diff --git a/examples/notebooks/getting_started/maximum_a_posteriori.ipynb b/examples/notebooks/getting_started/maximum_a_posteriori.ipynb
@@ -97,7 +97,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "parameter_set = pybop.ParameterSet.pybamm(\"Chen2020\")\n",
+    "parameter_set = pybop.ParameterSet(\"Chen2020\")\n",
     "model = pybop.lithium_ion.SPM(parameter_set=parameter_set)"
    ]
   },

diff --git a/examples/notebooks/getting_started/optimiser_interface.ipynb b/examples/notebooks/getting_started/optimiser_interface.ipynb
@@ -100,7 +100,6 @@
     "parameter_set = pybop.ParameterSet(\n",
     "    json_path=\"../../parameters/initial_ecm_parameters.json\"\n",
     ")\n",
-    "parameter_set.import_parameters()\n",
     "# Define the model\n",
     "model = pybop.empirical.Thevenin(\n",
     "    parameter_set=parameter_set, options={\"number of rc elements\": 1}\n",

diff --git a/examples/parameters/initial_ecm_parameters.json b/examples/parameters/initial_ecm_parameters.json
@@ -12,7 +12,6 @@
     "Cell-jig heat transfer coefficient [W/K]": 10,
     "Jig thermal mass [J/K]": 500,
     "Jig-air heat transfer coefficient [W/K]": 10,
-    "Open-circuit voltage [V]": "default",
     "R0 [Ohm]": 0.001,
     "Element-1 initial overpotential [V]": 0,
     "Element-2 initial overpotential [V]": 0,

diff --git a/examples/scripts/battery_parameterisation/ecm_CMAES.py b/examples/scripts/battery_parameterisation/ecm_CMAES.py
@@ -6,7 +6,6 @@
 parameter_set = pybop.ParameterSet(
     json_path="examples/parameters/initial_ecm_parameters.json"
 )
-parameter_set.import_parameters()
 
 # Alternatively, define the initial parameter set with a dictionary
 # Add definitions for R's, C's, and initial overpotentials for any additional RC elements

diff --git a/examples/scripts/battery_parameterisation/ecm_tau_constraints.py b/examples/scripts/battery_parameterisation/ecm_tau_constraints.py
@@ -22,7 +22,7 @@
 """
 
 # Define the initial parameter set
-parameter_set = pybop.ParameterSet.pybamm("ECM_Example")
+parameter_set = pybop.ParameterSet("ECM_Example")
 parameter_set.update(
     {
         "Initial SoC": 0.75,

diff --git a/examples/scripts/battery_parameterisation/ecm_with_tau.py b/examples/scripts/battery_parameterisation/ecm_with_tau.py
@@ -11,7 +11,7 @@
 """
 
 # Define the initial parameter set
-parameter_set = pybop.ParameterSet.pybamm("ECM_Example")
+parameter_set = pybop.ParameterSet("ECM_Example")
 parameter_set.update(
     {
         "Initial SoC": 0.75,
@@ -109,7 +109,7 @@
         parameter_set["R0 [Ohm]"],
         parameter_set["R1 [Ohm]"],
         parameter_set["tau1 [s]"],
-        parameter_set.evaluate(pybamm.Parameter("C1 [F]")),
+        parameter_set.parameter_values.evaluate(pybamm.Parameter("C1 [F]")),
     ],
 )
 print("Estimated parameters:", results.x.tolist() + [results.x[2] / results.x[1]])

diff --git a/examples/scripts/battery_parameterisation/eis_fitting.py b/examples/scripts/battery_parameterisation/eis_fitting.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 parameter_set["Contact resistance [Ohm]"] = 0.0
 initial_state = {"Initial SoC": 0.5}
 n_frequency = 20

diff --git a/examples/scripts/battery_parameterisation/full_cell_balancing.py b/examples/scripts/battery_parameterisation/full_cell_balancing.py
@@ -3,12 +3,12 @@
 import pybop
 
 # Parameter set definition
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 parameter_set["Lower voltage cut-off [V]"] = 2.3
 parameter_set["Upper voltage cut-off [V]"] = 4.4
 
 # Set initial state and unpack true values
-parameter_set.set_initial_stoichiometries(initial_value=1.0)
+parameter_set.parameter_values.set_initial_stoichiometries(initial_value=1.0)
 cs_n_max = parameter_set["Maximum concentration in negative electrode [mol.m-3]"]
 cs_p_max = parameter_set["Maximum concentration in positive electrode [mol.m-3]"]
 cs_n_init = parameter_set["Initial concentration in negative electrode [mol.m-3]"]

diff --git a/examples/scripts/battery_parameterisation/gitt.py b/examples/scripts/battery_parameterisation/gitt.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Xu2019")
+parameter_set = pybop.ParameterSet("Xu2019")
 model = pybop.lithium_ion.SPM(
     parameter_set=parameter_set, options={"working electrode": "positive"}
 )

diff --git a/examples/scripts/comparison_examples/cuckoo.py b/examples/scripts/comparison_examples/cuckoo.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 parameter_set.update(
     {
         "Negative electrode active material volume fraction": 0.7,

diff --git a/examples/scripts/comparison_examples/grouped_SPMe.py b/examples/scripts/comparison_examples/grouped_SPMe.py
@@ -12,7 +12,7 @@
 plot_dict = pybop.plot.StandardPlot(layout_options=layout_options)
 
 # Unpack parameter values from Chen2020
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 
 # Fix the electrolyte diffusivity and conductivity
 ce0 = parameter_set["Initial concentration in electrolyte [mol.m-3]"]

diff --git a/examples/scripts/comparison_examples/jaxified-idaklu-benchmarks.py b/examples/scripts/comparison_examples/jaxified-idaklu-benchmarks.py
@@ -16,7 +16,7 @@
 ]
 
 # Parameter set and model definition
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.DFN(parameter_set=parameter_set, solver=solvers[0])
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/maximum_a_posteriori.py b/examples/scripts/comparison_examples/maximum_a_posteriori.py
@@ -6,7 +6,7 @@
 sigma = 0.002
 
 # Construct and update initial parameter values
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 parameter_set.update(
     {
         "Negative electrode active material volume fraction": 0.43,

diff --git a/examples/scripts/comparison_examples/maximum_likelihood.py b/examples/scripts/comparison_examples/maximum_likelihood.py
@@ -4,7 +4,7 @@
 import pybop
 
 # Define model and set initial parameter values
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 parameter_set.update(
     {
         "Negative electrode active material volume fraction": 0.63,

diff --git a/examples/scripts/comparison_examples/random_search.py b/examples/scripts/comparison_examples/random_search.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 parameter_set.update(
     {
         "Negative electrode active material volume fraction": 0.7,

diff --git a/examples/scripts/comparison_examples/selecting_a_solver.py b/examples/scripts/comparison_examples/selecting_a_solver.py
@@ -6,7 +6,7 @@
 import pybop
 
 # Parameter set and model definition
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set)
 
 solvers = [

diff --git a/examples/scripts/comparison_examples/spm_AdamW.py b/examples/scripts/comparison_examples/spm_AdamW.py
@@ -5,7 +5,7 @@
 
 # Define model and use high-performant solver for sensitivities
 solver = pybamm.IDAKLUSolver()
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set, solver=solver)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_CMAES.py b/examples/scripts/comparison_examples/spm_CMAES.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_IRPropMin.py b/examples/scripts/comparison_examples/spm_IRPropMin.py
@@ -5,7 +5,7 @@
 
 # Define model and use high-performant solver for sensitivities
 solver = pybamm.IDAKLUSolver()
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set, solver=solver)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_NelderMead.py b/examples/scripts/comparison_examples/spm_NelderMead.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Parameter set and model definition
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_SNES.py b/examples/scripts/comparison_examples/spm_SNES.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_UKF.py b/examples/scripts/comparison_examples/spm_UKF.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Parameter set and model definition
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_XNES.py b/examples/scripts/comparison_examples/spm_XNES.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_descent.py b/examples/scripts/comparison_examples/spm_descent.py
@@ -5,7 +5,7 @@
 
 # Define model and use high-performant solver for sensitivities
 solver = pybamm.IDAKLUSolver()
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set, solver=solver)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_pso.py b/examples/scripts/comparison_examples/spm_pso.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set)
 
 # Fitting parameters

diff --git a/examples/scripts/comparison_examples/spm_scipymin.py b/examples/scripts/comparison_examples/spm_scipymin.py
@@ -4,7 +4,7 @@
 import pybop
 
 # Define model
-parameter_set = pybop.ParameterSet.pybamm("Chen2020")
+parameter_set = pybop.ParameterSet("Chen2020")
 solver = pybamm.IDAKLUSolver()
 model = pybop.lithium_ion.SPM(parameter_set=parameter_set, solver=solver)
 

diff --git a/examples/scripts/design_optimisation/maximising_energy.py b/examples/scripts/design_optimisation/maximising_energy.py
@@ -12,7 +12,7 @@
 # separator width.
 
 # Define parameter set and additional parameters needed for the cost function
-parameter_set = pybop.ParameterSet.pybamm("Chen2020", formation_concentrations=True)
+parameter_set = pybop.ParameterSet("Chen2020", formation_concentrations=True)
 parameter_set.update(
     {
         "Electrolyte density [kg.m-3]": Parameter("Separator density [kg.m-3]"),

diff --git a/examples/scripts/design_optimisation/maximising_power.py b/examples/scripts/design_optimisation/maximising_power.py
@@ -3,7 +3,7 @@
 import pybop
 
 # Define parameter set and additional parameters needed for the cost function
-parameter_set = pybop.ParameterSet.pybamm("Chen2020", formation_concentrations=True)
+parameter_set = pybop.ParameterSet("Chen2020", formation_concentrations=True)
 parameter_set.update(
     {
         "Electrolyte density [kg.m-3]": Parameter("Separator density [kg.m-3]"),