temp commit

pybop-team · Jul 10, 2024 · 080f183 · 080f183
1 parent c8ebf13
commit 080f183
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/examples/scripts/eis_fitting.py b/examples/scripts/eis_fitting.py
@@ -1,4 +1,5 @@
 import numpy as np
+import plotly.express as px
 
 import pybop
 
@@ -39,8 +40,8 @@
 # Generate problem, cost function, and optimisation class
 problem = pybop.EISProblem(model, parameters, dataset, signal=signal)
 prediction = problem.evaluate(np.array([0.75, 0.665]))
-# fig = px.scatter(x=prediction["Impedance"].real, y=-prediction["Impedance"].imag)
-# fig.show()
+fig = px.scatter(x=prediction["Impedance"].real, y=-prediction["Impedance"].imag)
+fig.show()
 # cost = pybop.SumSquaredError(problem)
 # optim = pybop.CMAES(cost, max_iterations=100)
 

diff --git a/pybop/models/base_model.py b/pybop/models/base_model.py
@@ -113,20 +113,16 @@ def build(
         if eis:
             self.set_up_for_eis(self.pybamm_model)
             self.parameter_set["Current function [A]"] = 0
-            sim = pybamm.Simulation(
-                self.pybamm_model,
-                geometry=self.geometry,
-                parameter_values=self.parameter_set,
-                submesh_types=self.submesh_types,
-                var_pts=self.var_pts,
-                spatial_methods=self.spatial_methods,
-            )
-            sim.build()
-            self._built_model = sim.built_model
-
-            V_scale = getattr(self.pybamm_model.variables["Voltage [V]"], "scale", 1)
-            I_scale = getattr(self.pybamm_model.variables["Current [A]"], "scale", 1)
-            self.z_scale = self._parameter_set.evaluate(V_scale / I_scale)
+            # sim = pybamm.Simulation(
+            #     self.pybamm_model,
+            #     geometry=self.geometry,
+            #     parameter_values=self.parameter_set,
+            #     submesh_types=self.submesh_types,
+            #     var_pts=self.var_pts,
+            #     spatial_methods=self.spatial_methods,
+            # )
+            # sim.build()
+            # self._built_model = sim.built_model
 
         if self._built_model:
             return
@@ -148,6 +144,15 @@ def build(
                 self._model_with_set_params, inplace=False
             )
 
+            if eis:
+                V_scale = getattr(
+                    self.pybamm_model.variables["Voltage [V]"], "scale", 1
+                )
+                I_scale = getattr(
+                    self.pybamm_model.variables["Current [A]"], "scale", 1
+                )
+                self.z_scale = self._parameter_set.evaluate(V_scale / I_scale)
+
             # Clear solver and setup model
             self._solver._model_set_up = {}