matrix and fourier example update

Author: otvam

examples/examples_shape/pwm/run_fourier.py

@@ -39,26 +39,22 @@ def _solve_peec(folder_example, folder_config):
     # define the input
     file_geometry = os.path.join(folder_example, "geometry.yaml")
     file_problem = os.path.join(folder_example, "problem.yaml")
-
-    # define the configuration
     file_tolerance = os.path.join(folder_config, "tolerance.yaml")
 
-    # define the output
-    file_voxel = os.path.join(folder_example, "voxel.pkl")
-    file_solution = os.path.join(folder_example, "solution.pkl")
+    # load the input
+    data_geometry = scisave.load_config(file_geometry)
+    data_problem = scisave.load_config(file_problem)
+    data_tolerance = scisave.load_config(file_tolerance)
 
-    # run the workflow and load the solution
-    pypeec.run_mesher_file(
-        file_geometry=file_geometry,
-        file_voxel=file_voxel,
+    # run the workflow (mesher and solver)
+    data_voxel = pypeec.run_mesher_data(
+        data_geometry=data_geometry,
     )
-    pypeec.run_solver_file(
-        file_voxel=file_voxel,
-        file_problem=file_problem,
-        file_tolerance=file_tolerance,
-        file_solution=file_solution,
+    data_solution = pypeec.run_solver_data(
+        data_voxel=data_voxel,
+        data_problem=data_problem,
+        data_tolerance=data_tolerance,
     )
-    data_solution = scisave.load_data(file_solution)
 
     return data_solution
 
@@ -69,10 +65,12 @@ def _get_impedance_peec(data_solution):
     """
 
     # extract the data
+    status = data_solution["status"]
     data_init = data_solution["data_init"]
     data_sweep = data_solution["data_sweep"]
 
     # check solution
+    assert status, "invalid solution"
     assert isinstance(data_init, dict), "invalid solution"
     assert isinstance(data_sweep, dict), "invalid solution"
 
@@ -82,13 +80,15 @@ def _get_impedance_peec(data_solution):
 
     # find the impedance for the different frequencies
     for idx, data_sweep_tmp in enumerate(data_sweep.values()):
-        # extract the data
+        # extract the frequency
         freq = data_sweep_tmp["freq"]
-        source = data_sweep_tmp["source"]
+
+        # extract the terminal properties
+        source_values = data_sweep_tmp["source_values"]
 
         # extract the impedance
-        voltage = source["src"]["V"] - source["sink"]["V"]
-        current = (source["src"]["I"] - source["sink"]["I"]) / 2
+        voltage = source_values["src"]["V"] - source_values["sink"]["V"]
+        current = (source_values["src"]["I"] - source_values["sink"]["I"]) / 2
         impedance = voltage / current
 
         # assign

examples/examples_stl/transformer_air/run_matrix.py

@@ -33,26 +33,22 @@ def _solve_peec(folder_example, folder_config):
     # define the input
     file_geometry = os.path.join(folder_example, "geometry.yaml")
     file_problem = os.path.join(folder_example, "problem.yaml")
-
-    # define the configuration
     file_tolerance = os.path.join(folder_config, "tolerance.yaml")
 
-    # define the output
-    file_voxel = os.path.join(folder_example, "voxel.pkl")
-    file_solution = os.path.join(folder_example, "solution.pkl")
+    # load the input
+    data_geometry = scisave.load_config(file_geometry)
+    data_problem = scisave.load_config(file_problem)
+    data_tolerance = scisave.load_config(file_tolerance)
 
-    # run the workflow and load the solution
-    pypeec.run_mesher_file(
-        file_geometry=file_geometry,
-        file_voxel=file_voxel,
+    # run the workflow (mesher and solver)
+    data_voxel = pypeec.run_mesher_data(
+        data_geometry=data_geometry,
     )
-    pypeec.run_solver_file(
-        file_voxel=file_voxel,
-        file_problem=file_problem,
-        file_tolerance=file_tolerance,
-        file_solution=file_solution,
+    data_solution = pypeec.run_solver_data(
+        data_voxel=data_voxel,
+        data_problem=data_problem,
+        data_tolerance=data_tolerance,
     )
-    data_solution = scisave.load_data(file_solution)
 
     return data_solution
 

pypeec/utils/matrix.py

@@ -199,7 +199,7 @@ def _get_symmetry_expand(data, symmetry):
     return data_all
 
 
-def _get_extract_sweep(source, terminal_list):
+def _get_extract_sweep(source_values, terminal_list):
     """
     Get the terminal currents and voltages for a specific sweep.
     """
@@ -215,8 +215,8 @@ def _get_extract_sweep(source, terminal_list):
         sink = terminal["sink"]
 
         # extract the terminal quantities
-        V_vec[idx] = source[src]["V"] - source[sink]["V"]
-        I_vec[idx] = (source[src]["I"] - source[sink]["I"]) / 2
+        V_vec[idx] = source_values[src]["V"] - source_values[sink]["V"]
+        I_vec[idx] = (source_values[src]["I"] - source_values[sink]["I"]) / 2
 
     # assign the data
     V_vec = np.array(V_vec, dtype=np.complex128)
@@ -282,10 +282,12 @@ def get_extract(data_solution, sweep_list, terminal_list):
     """
 
     # extract the data
+    status = data_solution["status"]
     data_init = data_solution["data_init"]
     data_sweep = data_solution["data_sweep"]
 
     # check solution
+    assert status, "invalid solution"
     assert isinstance(data_init, dict), "invalid solution"
     assert isinstance(data_sweep, dict), "invalid solution"
 
@@ -300,13 +302,14 @@ def get_extract(data_solution, sweep_list, terminal_list):
 
     # extract data
     for idx, sweep in enumerate(sweep_list):
-        # extract the data
-        data_sweep_tmp = data_sweep[sweep]
-        freq = data_sweep_tmp["freq"]
-        source = data_sweep_tmp["source"]
+        # extract the frequency
+        freq = data_sweep[sweep]["freq"]
+
+        # extract the terminal properties
+        source_values = data_sweep[sweep]["source_values"]
 
         # compute
-        (V_vec, I_vec) = _get_extract_sweep(source, terminal_list)
+        (V_vec, I_vec) = _get_extract_sweep(source_values, terminal_list)
 
         # assign
         V_mat[:, idx] = V_vec