Model and solver setting

Author: thomas-risse

python/fd_string_model.py

@@ -30,8 +30,9 @@ class FD_string_model(Model):
     def __init__(self, sr = 44100, **kwargs):
         # Copy string parameters first from Default params
         # and replace parameters given as kwargs
-        self.__dict__.update(DEFAULT_STRING_PARAMS)
-        self.__dict__.update(kwargs)
+        self.params = DEFAULT_STRING_PARAMS
+        self.params.update(**kwargs)
+        self.__dict__.update(self.params)
         self.fill_intermediary_physical_params()
 
         # Samplerate, used for choosing the spatial discretization
@@ -61,6 +62,9 @@ def print_perceptual_params(self):
         print(r"$f_0 = $" + f"{self.f0}")
         print(r"$T_{60}(0) = $" + f"{self.T60(0)}")
         print(r"$T_{60}(1000) = $" + f"{self.T60(2 * np.pi * 1000)}")
+    
+    def setting(self):
+        return {"Name": self.__class__.__name__, "N": self.N, **self.params} 
 
     def fill_intermediary_physical_params(self):
         self.A = np.pi*self.Ra**2

python/model.py

@@ -24,4 +24,7 @@ def __init__(self, N = 10):
         # Both functions are called at the same time in the solver,
         # in some cases it is then computationally interesting 
         # to compute both in the same function.
-        self.EandFnl = lambda q: (self.Enl(q), self.Fnl(q))
+        self.EandFnl = lambda q: (self.Enl(q), self.Fnl(q))
+
+    def setting(self):
+        return {"Name": self.__class__.__name__, "N": self.N} 

python/results_storage.py

@@ -29,10 +29,17 @@ def __init__(self, **kwargs):
         self.__dict__.update(DEFAULT_STORAGE_CONFIG)
         self.__dict__.update(kwargs)
 
-    def reserve(self, t, model):
+    def reserve(self, t, model, solver):
         self.t = t
         self.Nt = len(t)
 
+        if self.SolverSetting:
+            self.solver_dict = solver.setting()
+        
+        if self.ModelSetting:
+            self.model_dict = model.setting()
+            print(self.model_dict)
+
         # Force energy to be computed if power is needed
         if self.Power:
             self.Energy = True

python/sav_solver.py

@@ -20,7 +20,7 @@ def __init__(self, model, sr = 44100, lambda0 = 0):
         # Shifting constant
         self. C0 = 0
         # Control parameter
-        self.lamba0 = lambda0
+        self.lambda0 = lambda0
         # Numerical epsilon
         self.Num_eps = 1e-16
 
@@ -38,6 +38,13 @@ def __init__(self, model, sr = 44100, lambda0 = 0):
         ### Check dimensions ###
         self.check_sizes()
 
+    def setting(self):
+        """Returns a dictionnary with solver settings.
+        Returns:
+            (dict): solver setings
+        """
+        return {"sr": self.sr, "dt": self.dt, "num_eps": self.Num_eps, "C0": self.C0, "lambda0": self.lambda0}
+
     def check_sizes(self):
         """Checks that the underlying model has coherent matrices and operators
         shapes.
@@ -324,7 +331,7 @@ def g_mod(self, q, p, r):
             vector: g_mod(q,p, r)
         """
         self.epsilon = r - np.sqrt(2 * self.model.Enl(q) + self.C0)
-        return - self.lamba0 * self.epsilon * self.model.M * np.sign(p) / (np.abs(p) + self.Num_eps)
+        return - self.lambda0 * self.epsilon * self.model.M * np.sign(p) / (np.abs(p) + self.Num_eps)
 
     ### Time stepping and integration ###
 
@@ -385,7 +392,7 @@ def integrate(self, q0, u0, u_func, duration, ConstantRmid = False,
         self.t = np.arange(self.model.Nt) * self.dt
 
         self.storage = ResultsStorage(**storage_config)
-        self.storage.reserve(self.t, self.model)
+        self.storage.reserve(self.t, self.model, self)
         self.plotter = Plotter(**plotter_config)
         self.plotter.init_plots()