fiqus 2024.7.0__py3-none-any.whl → 2024.12.1__py3-none-any.whl

tests/test_solvers.py

@@ -16,10 +16,19 @@ class TestSolvers(FiQuSSolverTests):
             "TEST_Pancake3D_TSA",
             "TEST_Pancake3D_TSAStructured",
             "TEST_Pancake3D_TSAInsulating",
+            "TEST_Pancake3D_TSAInsulatingJcVsLength",
+            "TEST_Pancake3D_TSAInsulatingJcVsLength_thermalOnly",
         ]
-        solve_types = ["electromagnetic", "weaklyCoupled", "stronglyCoupled"]
+        solve_types = ["electromagnetic", "weaklyCoupled", "stronglyCoupled", "thermal"]
         for model_name in model_names:
             for solve_type in solve_types:
+
+                if solve_type == "thermal" and not model_name =="TEST_Pancake3D_TSAInsulatingJcVsLength_thermalOnly":
+                    continue
+
+                if solve_type != "thermal" and model_name =="TEST_Pancake3D_TSAInsulatingJcVsLength_thermalOnly":
+                    continue
+
                 with self.subTest(model_name=model_name, solve_type=solve_type):
                     data_model: FDM = self.get_data_model(model_name)
 
@@ -28,7 +37,7 @@ class TestSolvers(FiQuSSolverTests):
                     data_model.run.solution = solve_type
 
                     if solve_type in ["weaklyCoupled", "stronglyCoupled"]:
-                        data_model.magnet.solve.save = [
+                        data_model.magnet.solve.quantitiesToBeSaved = [
                             Pancake3D.Pancake3DSolveSaveQuantity(
                                 quantity="magneticField",
                             ),
@@ -40,7 +49,7 @@ class TestSolvers(FiQuSSolverTests):
                             ),
                         ]
                     elif solve_type == "electromagnetic":
-                        data_model.magnet.solve.save = [
+                        data_model.magnet.solve.quantitiesToBeSaved = [
                             Pancake3D.Pancake3DSolveSaveQuantity(
                                 quantity="magneticField",
                             ),
@@ -48,6 +57,12 @@ class TestSolvers(FiQuSSolverTests):
                                 quantity="currentDensity",
                             ),
                         ]
+                    elif solve_type == "thermal":
+                        data_model.magnet.solve.quantitiesToBeSaved = [
+                            Pancake3D.Pancake3DSolveSaveQuantity(
+                                quantity="temperature",
+                            ),
+                        ]
 
                     self.solve(data_model, model_name)
 
@@ -65,19 +80,20 @@ class TestSolvers(FiQuSSolverTests):
                     self.compare_text_files(pro_file, reference_pro_file)
 
                     # Compare the results files:
-                    pos_file = self.get_path_to_generated_file(
-                        data_model=data_model,
-                        file_name="MagneticField-DefaultFormat",
-                        file_extension="pos",
-                    )
-                    reference_pos_file = self.get_path_to_reference_file(
-                        data_model=data_model,
-                        file_name="MagneticField-DefaultFormat",
-                        file_extension="pos",
-                    )
-                    self.compare_pos_files(pos_file, reference_pos_file)
+                    if solve_type in ["electromagnetic", "weaklyCoupled", "stronglyCoupled"]:
+                        pos_file = self.get_path_to_generated_file(
+                            data_model=data_model,
+                            file_name="MagneticField-DefaultFormat",
+                            file_extension="pos",
+                        )
+                        reference_pos_file = self.get_path_to_reference_file(
+                            data_model=data_model,
+                            file_name="MagneticField-DefaultFormat",
+                            file_extension="pos",
+                        )
+                        self.compare_pos_files(pos_file, reference_pos_file, rel_tolerance=1e-3, abs_tolerance=1e-3)
 
-                    if solve_type in ["weaklyCoupled", "stronglyCoupled"]:
+                    if solve_type in ["weaklyCoupled", "stronglyCoupled", "thermal"]:
                         pos_file = self.get_path_to_generated_file(
                             data_model=data_model,
                             file_name="Temperature-DefaultFormat",
@@ -88,15 +104,16 @@ class TestSolvers(FiQuSSolverTests):
                             file_name="Temperature-DefaultFormat",
                             file_extension="pos",
                         )
-                        self.compare_pos_files(pos_file, reference_pos_file)
+                        self.compare_pos_files(pos_file, reference_pos_file, rel_tolerance=1e-3, abs_tolerance=1e-3)
 
     def test_ConductorAC_Strand(self):
         """
-        Checks if ConductorAC_Strand solvers work correctly by comparing the results to the
+        Checks if CACStrand solvers work correctly by comparing the results to the
         reference results that were checked manually.
         """
         model_names = [
             "TEST_CAC_Strand_hexFilaments",
+            "TEST_CAC_Strand_adaptiveMesh",
             "TEST_CAC_wireInChannel",
         ]
         for model_name in model_names:
@@ -105,7 +122,7 @@ class TestSolvers(FiQuSSolverTests):
 
                 self.solve(data_model, model_name)
 
-                # Compare the pro files:
+                # Compare the pro files: 
                 pro_file = self.get_path_to_generated_file(
                     data_model=data_model,
                     file_name=model_name,
@@ -116,7 +133,9 @@ class TestSolvers(FiQuSSolverTests):
                     file_name=model_name,
                     file_extension="pro",
                 )
-                self.compare_text_files(pro_file, reference_pro_file)
+                # This makes no sense as long as the development on the Strand model pro-template is ongoing ...
+                # Comparing the field solutions should ensure solver consistency without relying on the exact template structure. Skipping the pro-templates for now ~ AG
+                #self.compare_text_files(pro_file, reference_pro_file)
 
                 # Compare the magnetic flux density files:
                 pos_file = self.get_path_to_generated_file(
@@ -129,7 +148,7 @@ class TestSolvers(FiQuSSolverTests):
                     file_name="b",
                     file_extension="pos",
                 )
-                self.compare_pos_files(pos_file, reference_pos_file)
+                self.compare_pos_files(pos_file, reference_pos_file, rel_tolerance=1e-3, abs_tolerance=1e-10)
 
                 # Compare the current density files:
                 pos_file = self.get_path_to_generated_file(
@@ -142,7 +161,82 @@ class TestSolvers(FiQuSSolverTests):
                     file_name="j",
                     file_extension="pos",
                 )
-                self.compare_pos_files(pos_file, reference_pos_file)
+                self.compare_pos_files(pos_file, reference_pos_file, rel_tolerance=1e-3, abs_tolerance=1e-10)
+
+
+    def test_Multipole(self):
+        """
+        Checks if Multipole solvers work correctly by comparing the results to the
+        reference results that were checked manually.
+        """
+        model_names = [
+            "TEST_MULTIPOLE_MBH_1in1_TSA_withQH",
+            "TEST_MULTIPOLE_MBH_1in1_TSA",
+            "TEST_MULTIPOLE_MBH_1in1_REF",
+            "TEST_MULTIPOLE_SMC_TSA_withQH",
+            "TEST_MULTIPOLE_SMC_TSA",
+            "TEST_MULTIPOLE_SMC_REF",
+            "TEST_MULTIPOLE_4COND_TSA",
+        ]
+        for model_name in model_names:
+            with self.subTest(model_name=model_name):
+                data_model: FDM = self.get_data_model(model_name)
+
+                self.solve(data_model, model_name)
+
+                # Compare the pro files: 
+                pro_file = self.get_path_to_generated_file(
+                    data_model=data_model,
+                    file_name=model_name,
+                    file_extension="pro",
+                )
+                reference_pro_file = self.get_path_to_reference_file(
+                    data_model=data_model,
+                    file_name=model_name,
+                    file_extension="pro",
+                )
+                
+                self.compare_text_files(pro_file, reference_pro_file, exclude_lines_keywords=["NameOfMesh"], exclude_first_n_lines=1)
+
+                # Compare the magnetic flux density files:
+                pos_file = self.get_path_to_generated_file(
+                    data_model=data_model,
+                    file_name="b_Omega",
+                    file_extension="pos",
+                )
+                reference_pos_file = self.get_path_to_reference_file(
+                    data_model=data_model,
+                    file_name="b_Omega",
+                    file_extension="pos",
+                )
+                self.compare_pos_files(pos_file, reference_pos_file, rel_tolerance=1e-3, abs_tolerance=1e-2)
+
+                # Compare the temperature files:
+                pos_file = self.get_path_to_generated_file(
+                    data_model=data_model,
+                    file_name="T_Omega_c",
+                    file_extension="pos",
+                )
+                reference_pos_file = self.get_path_to_reference_file(
+                    data_model=data_model,
+                    file_name="T_Omega_c",
+                    file_extension="pos",
+                )
+                self.compare_pos_files(pos_file, reference_pos_file, rel_tolerance=1e-3, abs_tolerance=1e-2)
+
+                # Compare the solve yaml files
+                solve_file = self.get_path_to_generated_file(
+                    data_model=data_model,
+                    file_name="solve",
+                    file_extension="yaml",
+                )
+                reference_solve_file = self.get_path_to_reference_file(
+                    data_model=data_model,
+                    file_name="solve",
+                    file_extension="yaml",
+                )
+                self.compare_json_or_yaml_files(solve_file, reference_solve_file)
+
 
 if __name__ == "__main__":
     unittest.main()

tests/utils/fiqus_test_classes.py

@@ -148,10 +148,10 @@ class BaseClassesForTests(unittest.TestCase):
             )
 
             shutil.copytree(
-                reference_geometry_folder, output_geometry_folder, dirs_exist_ok=True
+                reference_geometry_folder, output_geometry_folder, dirs_exist_ok=True, ignore=shutil.ignore_patterns('Mesh*')
             )
             shutil.copytree(
-                reference_mesh_folder, output_mesh_folder, dirs_exist_ok=True
+                reference_mesh_folder, output_mesh_folder, dirs_exist_ok=True, ignore=shutil.ignore_patterns('Solution*')
             )
 
         # Run FiQuS:
@@ -159,7 +159,7 @@ class BaseClassesForTests(unittest.TestCase):
             model_folder=model_folder,
             input_file_path=self.get_input_file_path(model_name),
             fdm=data_model,
-            verbose=False,
+            # verbose=False,
         )
 
     def get_path_to_generated_file(
@@ -414,7 +414,7 @@ class BaseClassesForTests(unittest.TestCase):
 
         return reference_file
 
-    def compare_json_or_yaml_files(self, file_1, file_2, tolerance=0):
+    def compare_json_or_yaml_files(self, file_1, file_2, tolerance=0,excluded_keys=None):
         """
         This method compares the contents of two JSON or YAML files. It is used to
         check that the generated files are the same as the reference.
@@ -423,6 +423,10 @@ class BaseClassesForTests(unittest.TestCase):
         :type file_1: Union[str, os.PathLike]
         :param file_2: path to the second file
         :type file_2: Union[str, os.PathLike]
+        :param tolerance: tolerance for numeric differences (default is 0)
+        :type tolerance: int or float
+        :param excluded_keys: keys to exclude from comparison (default is None)
+        :type excluded_keys: List[str]
         """
         try:
             # YAML is a superset of JSON, so we can use the same parser for both:
@@ -435,6 +439,11 @@ class BaseClassesForTests(unittest.TestCase):
         except:
             raise ValueError("The files must be JSON or YAML files!")
 
+        # Remove excluded keys from both dictionaries
+        if excluded_keys:
+            file_1_dictionary = self._remove_excluded_keys(file_1_dictionary, excluded_keys)
+            file_2_dictionary = self._remove_excluded_keys(file_2_dictionary, excluded_keys)
+
         # Compare the dictionaries:
         if tolerance == 0:
             self.assertDictEqual(
@@ -445,6 +454,27 @@ class BaseClassesForTests(unittest.TestCase):
         else:
             self.compare_dicts(file_1_dictionary, file_2_dictionary, tolerance)
 
+
+    def _remove_excluded_keys(self, data, excluded_keys):
+        """
+        Recursively removes excluded keys from a dictionary.
+
+        :param data: the dictionary to process
+        :type data: dict
+        :param excluded_keys: the keys to remove
+        :type excluded_keys: List[str]
+        :return: the dictionary without excluded keys
+        :rtype: dict
+        """
+        if not isinstance(data, dict):
+            return data  # Return non-dict types unchanged
+
+        return {
+            key: self._remove_excluded_keys(value, excluded_keys)
+            for key, value in data.items()
+            if key not in excluded_keys
+        }
+
     def compare_dicts(self, dict1, dict2, tolerance):
         """
         This method compares the contents of two dictionaries, taking into account
@@ -493,8 +523,23 @@ class BaseClassesForTests(unittest.TestCase):
             filecmp.cmp(file_1, file_2),
             msg=f"{file_1} did not match {file_2}!",
         )
+    
+    def filter_content(self, file_path, keywords, n):
+        """
+        Read a file and return its content as a string,
+        excluding lines containing any of the specified keywords.
+        It also skips the first n lines.
+        This looping is slower than the filecmp.cmp method, but it is more flexible.
+        """
+        with open(file_path, 'r', encoding='utf-8') as f:
+            # Skip the first N lines
+            for _ in range(n):
+                next(f, None)
+            # Filter remaining lines
+            return ''.join(line for line in f if not any(keyword in line for keyword in keywords))
 
-    def compare_text_files(self, file_1, file_2):
+
+    def compare_text_files(self, file_1, file_2, exclude_lines_keywords: list = None, exclude_first_n_lines: int = 0):
         """
         This method compares the contents of two files. It is used to check that the
         generated files are the same as the reference.
@@ -504,11 +549,17 @@ class BaseClassesForTests(unittest.TestCase):
         :param file_2: path to the second file
         :type file_2: Union[str, os.PathLike]
         """
-        # Compare the files:
-        self.assertTrue(
-            filecmp.cmp(file_1, file_2),
-            msg=f"{file_1} did not match {file_2}!",
-        )
+        if exclude_lines_keywords: 
+            # more complicated check that needs to loop through the lines
+            filtered_content1 = self.filter_content(file_1, exclude_lines_keywords, exclude_first_n_lines)
+            filtered_content2 = self.filter_content(file_2, exclude_lines_keywords, exclude_first_n_lines)
+            self.assertTrue(filtered_content1 == filtered_content2)
+        else:
+            # Compare the files with a binary check
+            self.assertTrue(
+                filecmp.cmp(file_1, file_2),
+                msg=f"{file_1} did not match {file_2}!",
+            )
 
 
 class FiQuSGeometryTests(BaseClassesForTests):
@@ -547,7 +598,7 @@ class FiQuSGeometryTests(BaseClassesForTests):
         """
         # Initialize gmsh:
         gmsh_utils = GmshUtils(verbose=False)
-        gmsh_utils.initialize()
+        gmsh_utils.initialize(verbosity_Gmsh=0)
 
         # Open the geometry files and get the entities:
         model_entities = {}
@@ -619,7 +670,7 @@ class FiQuSMeshTests(BaseClassesForTests):
         """
         # Initialize gmsh:
         gmsh_utils = GmshUtils(verbose=False)
-        gmsh_utils.initialize()
+        gmsh_utils.initialize(verbosity_Gmsh=0)
 
         # Open the mesh files and get the average mesh quality:
         average_mesh_qualities = []
@@ -669,7 +720,7 @@ class FiQuSSolverTests(BaseClassesForTests):
         self.model_name = model_name
 
     def compare_pos_files(
-        self, pos_file_1: Union[str, os.PathLike], pos_file_2: Union[str, os.PathLike]
+        self, pos_file_1: Union[str, os.PathLike], pos_file_2: Union[str, os.PathLike], rel_tolerance: float = 1e-10, abs_tolerance: float = 0
     ):
         """
         This method compares the contents of two pos files. It is used to check that
@@ -682,15 +733,19 @@ class FiQuSSolverTests(BaseClassesForTests):
         """
         # Initialize gmsh:
         gmsh_utils = GmshUtils(verbose=False)
-        gmsh_utils.initialize()
+        gmsh_utils.initialize(verbosity_Gmsh=0)
 
         # Open the pos files and get the model data:
         model_datas = []
-        for pos_file in [pos_file_1, pos_file_2]:
+        time_steps = [0, 0]
+        for idx, pos_file in enumerate([pos_file_1, pos_file_2]):
+            # remove all old views
+            gmsh.clear()
             # Open the pos file:
             gmsh.open(pos_file)
             data_all_steps = []
-            for time_step in range(1, 100):
+            
+            while True:
                 # Save all available time steps up to 100:
                 try:
                     (
@@ -699,18 +754,27 @@ class FiQuSSolverTests(BaseClassesForTests):
                         data,
                         time,
                         numComponents,
-                    ) = gmsh.view.getHomogeneousModelData(tag=0, step=time_step)
+                    ) = gmsh.view.getHomogeneousModelData(tag=0, step=time_steps[idx])
                     data_all_steps.extend(list(data))
+                    time_steps[idx] += 1  # Move to the next time step
                 except:
+                    print(f"Finished reading {pos_file} at time step {time_steps[idx]}.")
                     break
 
             model_datas.append(data_all_steps)
 
-        # Make sure the pos files are close enough:
+        # Make sure the number of time steps are the same:
+        self.assertEqual(
+            time_steps[0],
+            time_steps[1],
+            msg=f"{pos_file_1} and {pos_file_2} do not have the same number of time steps!",
+        )
+
+        # Make sure the pos files are the same length:
         self.assertEqual(
             len(model_datas[0]),
             len(model_datas[1]),
-            msg=f"{pos_file_1} and {pos_file_2} did not match!",
+            msg=f"{pos_file_1} and {pos_file_2} are not the same length!",
         )
 
         # Convert to numppy array:
@@ -721,8 +785,8 @@ class FiQuSSolverTests(BaseClassesForTests):
         np.testing.assert_allclose(
             model_data1,
             model_data2,
-            rtol=1e-05,
-            atol=1e-08,
+            rtol=rel_tolerance,
+            atol=abs_tolerance,
         )
 
     def get_path_to_generated_file(

tests/utils/generate_reference_files_ConductorAC.py

@@ -1,57 +1,57 @@
-import os
-import shutil
-import sys
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../../'))) # Add the path to the fiqus package to the system path
-from fiqus.data.DataFiQuS import FDM
-from fiqus.utils.Utils import FilesAndFolders as Util
-from fiqus import MainFiQuS as mf
-
-
-# Generate reference files for the models below:
-model_names = [
-    "TEST_CAC_Strand_adaptiveMesh",
-    "TEST_CAC_Strand_hexFilaments",
-    "TEST_CAC_wireInChannel",
-]
-# The run types for the models above:
-run_types = [
-    'geometry_and_mesh', 
-    'start_from_yaml', 
-    'start_from_yaml',
-]
-
-for model_name, run_type in zip(model_names, run_types):
-    # get path to the input file:
-    input_file = os.path.join(
-        os.path.dirname(os.path.dirname(__file__)),
-        "_inputs",
-        model_name,
-        f"{model_name}.yaml",
-    )
-
-    # select _references folder as the output folder:
-    output_folder = os.path.join(
-        os.path.dirname(os.path.dirname(__file__)), "_references", model_name
-    )
-
-    # if the output folder exists, remove it:
-    if os.path.exists(output_folder):
-        shutil.rmtree(output_folder)
-
-    # Create the output folder:
-    os.makedirs(output_folder)
-
-    # Cast input yaml file to FDM
-    data_model: FDM = Util.read_data_from_yaml(input_file, FDM)
-
-    data_model.run.overwrite = True
-
-    # Make the run type start_from_yaml:
-    data_model.run.type = run_type
-
-    fiqus_instance = mf.MainFiQuS(
-        fdm=data_model, model_folder=output_folder, input_file_path=input_file
-    )
-
-    # remove fiqus_instance to avoid memory issues:
-    del fiqus_instance
+import os
+import shutil
+import sys
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../../'))) # Add the path to the fiqus package to the system path
+from fiqus.data.DataFiQuS import FDM
+from fiqus.utils.Utils import FilesAndFolders as Util
+from fiqus import MainFiQuS as mf
+
+
+# Generate reference files for the models below:
+model_names = [
+    "TEST_CAC_Strand_adaptiveMesh",
+    "TEST_CAC_Strand_hexFilaments",
+    "TEST_CAC_wireInChannel",
+]
+# The run types for the models above:
+run_types = [
+    'geometry_and_mesh', 
+    'start_from_yaml', 
+    'start_from_yaml',
+]
+
+for model_name, run_type in zip(model_names, run_types):
+    # get path to the input file:
+    input_file = os.path.join(
+        os.path.dirname(os.path.dirname(__file__)),
+        "_inputs",
+        model_name,
+        f"{model_name}.yaml",
+    )
+
+    # select _references folder as the output folder:
+    output_folder = os.path.join(
+        os.path.dirname(os.path.dirname(__file__)), "_references", model_name
+    )
+
+    # if the output folder exists, remove it:
+    if os.path.exists(output_folder):
+        shutil.rmtree(output_folder)
+
+    # Create the output folder:
+    os.makedirs(output_folder)
+
+    # Cast input yaml file to FDM
+    data_model: FDM = Util.read_data_from_yaml(input_file, FDM)
+
+    data_model.run.overwrite = True
+
+    # Make the run type start_from_yaml:
+    data_model.run.type = run_type
+
+    fiqus_instance = mf.MainFiQuS(
+        fdm=data_model, model_folder=output_folder, input_file_path=input_file
+    )
+
+    # remove fiqus_instance to avoid memory issues:
+    del fiqus_instance

tests/utils/generate_reference_files_Pancake3D.py

@@ -1,7 +1,6 @@
 import os
 import shutil
-import sys
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../../'))) # Add the path to the fiqus package to the system path
+
 import fiqus.data.DataFiQuSPancake3D as Pancake3D
 from fiqus.data.DataFiQuS import FDM
 from fiqus.utils.Utils import FilesAndFolders as Util
@@ -31,7 +30,7 @@ for model_name in model_names:
 
     # Cast input yaml file to FDM
     data_model: FDM = Util.read_data_from_yaml(input_file, FDM)
-    data_model.magnet.postproc = Pancake3D.Pancake3DPostprocess()
+
     data_model.run.overwrite = True
     data_model.run.launch_gui = False
 
@@ -61,7 +60,7 @@ for model_name in model_names:
         data_model.magnet.solve.type = solve_type
         data_model.run.solution = solve_type
         if solve_type in ["weaklyCoupled", "stronglyCoupled"]:
-            data_model.magnet.solve.save = [
+            data_model.magnet.solve.quantitiesToBeSaved = [
                 Pancake3D.Pancake3DSolveSaveQuantity(
                     quantity="magneticField",
                 ),
@@ -73,7 +72,7 @@ for model_name in model_names:
                 ),
             ]
         elif solve_type == "electromagnetic":
-            data_model.magnet.solve.save = [
+            data_model.magnet.solve.quantitiesToBeSaved = [
                 Pancake3D.Pancake3DSolveSaveQuantity(
                     quantity="magneticField",
                 ),