fiqus 2025.2.0__tar.gz → 2025.11.0__tar.gz

{fiqus-2025.2.0 → fiqus-2025.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiqus
-Version: 2025.2.0
+Version: 2025.11.0
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team
@@ -9,11 +9,75 @@ Keywords: STEAM,FiQuS,CERN
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Requires-Dist: gmsh==4.13.1
+Requires-Dist: h5py==3.10.0
+Requires-Dist: Jinja2==3.1.3
+Requires-Dist: matplotlib==3.8.3
+Requires-Dist: mplcursors==0.5.3
+Requires-Dist: numpy==1.26.4
+Requires-Dist: pandas==2.2.1
+Requires-Dist: pydantic==2.6.4
+Requires-Dist: ruamel.yaml==0.18.6
+Requires-Dist: ruamel.yaml.clib==0.2.8
+Requires-Dist: scipy==1.14.1
+Requires-Dist: tqdm==4.66.2
+Requires-Dist: typing_extensions==4.10.0
 Provides-Extra: all
+Requires-Dist: gmsh==4.13.1; extra == "all"
+Requires-Dist: h5py==3.10.0; extra == "all"
+Requires-Dist: Jinja2==3.1.3; extra == "all"
+Requires-Dist: matplotlib==3.8.3; extra == "all"
+Requires-Dist: mplcursors==0.5.3; extra == "all"
+Requires-Dist: numpy==1.26.4; extra == "all"
+Requires-Dist: pandas==2.2.1; extra == "all"
+Requires-Dist: pydantic==2.6.4; extra == "all"
+Requires-Dist: ruamel.yaml==0.18.6; extra == "all"
+Requires-Dist: ruamel.yaml.clib==0.2.8; extra == "all"
+Requires-Dist: scipy==1.14.1; extra == "all"
+Requires-Dist: tqdm==4.66.2; extra == "all"
+Requires-Dist: typing_extensions==4.10.0; extra == "all"
+Requires-Dist: griffe==0.42.0; extra == "all"
+Requires-Dist: markdown==3.5.2; extra == "all"
+Requires-Dist: markdown-include==0.8.1; extra == "all"
+Requires-Dist: mkdocs-git-revision-date-localized-plugin==1.2.4; extra == "all"
+Requires-Dist: mkdocs-include-markdown-plugin==6.0.4; extra == "all"
+Requires-Dist: mkdocs-material==9.5.13; extra == "all"
+Requires-Dist: mkdocstrings-python==1.9.0; extra == "all"
+Requires-Dist: mkdocs-autorefs==1.3.1; extra == "all"
+Requires-Dist: coverage==7.4.4; extra == "all"
+Requires-Dist: coverage-badge==1.1.0; extra == "all"
+Requires-Dist: flake8==7.0.0; extra == "all"
+Requires-Dist: mypy==1.9.0; extra == "all"
+Requires-Dist: pylint==3.1.0; extra == "all"
+Requires-Dist: pytest==8.1.1; extra == "all"
+Requires-Dist: pytest-cov==4.1.0; extra == "all"
+Requires-Dist: pytest-subtests==0.12.1; extra == "all"
+Requires-Dist: setuptools==69.2.0; extra == "all"
+Requires-Dist: wheel==0.45.1; extra == "all"
+Requires-Dist: twine==6.0.1; extra == "all"
 Provides-Extra: docs
+Requires-Dist: griffe==0.42.0; extra == "docs"
+Requires-Dist: markdown==3.5.2; extra == "docs"
+Requires-Dist: markdown-include==0.8.1; extra == "docs"
+Requires-Dist: mkdocs-git-revision-date-localized-plugin==1.2.4; extra == "docs"
+Requires-Dist: mkdocs-include-markdown-plugin==6.0.4; extra == "docs"
+Requires-Dist: mkdocs-material==9.5.13; extra == "docs"
+Requires-Dist: mkdocstrings-python==1.9.0; extra == "docs"
+Requires-Dist: mkdocs-autorefs==1.3.1; extra == "docs"
 Provides-Extra: tests
+Requires-Dist: coverage==7.4.4; extra == "tests"
+Requires-Dist: coverage-badge==1.1.0; extra == "tests"
+Requires-Dist: flake8==7.0.0; extra == "tests"
+Requires-Dist: mypy==1.9.0; extra == "tests"
+Requires-Dist: pylint==3.1.0; extra == "tests"
+Requires-Dist: pytest==8.1.1; extra == "tests"
+Requires-Dist: pytest-cov==4.1.0; extra == "tests"
+Requires-Dist: pytest-subtests==0.12.1; extra == "tests"
 Provides-Extra: build
-License-File: LICENSE.txt
+Requires-Dist: setuptools==69.2.0; extra == "build"
+Requires-Dist: wheel==0.45.1; extra == "build"
+Requires-Dist: twine==6.0.1; extra == "build"
 
 ![FiQuS logo](https://gitlab.cern.ch/steam/fiqus/-/raw/master/docs/images/FiQuS_name_logo.svg)
 

{fiqus-2025.2.0 → fiqus-2025.11.0}/fiqus/MainFiQuS.py

@@ -19,7 +19,7 @@ from fiqus.utils.Utils import CheckForExceptions as Check
 from fiqus.utils.Utils import create_json_schema
 from fiqus.utils.Utils import get_data_settings
 from fiqus.utils.Utils import initialize_logger
-from fiqus.data.DataFiQuS import FDM
+from fiqus.data.DataFiQuS import FDM, SolveDumpDataModel
 from fiqus.data.DataSettings import DataSettings
 from fiqus.mains.MainCCT import MainCCT
 from fiqus.mains.MainMultipole import MainMultipole
@@ -86,22 +86,10 @@ class MainFiQuS:
         # Initialize Main object
         if self.fdm.magnet.type == "CCT_straight":
             self.main_magnet = MainCCT(fdm=self.fdm, verbose=verbose)
-        elif self.fdm.magnet.type == "CWS":
-            self.main_magnet = MainCWS(
-                fdm=self.fdm,
-                inputs_folder_path=pathlib.Path(input_file_path).parent,
-                verbose=self.fdm.run.verbosity_FiQuS,
-            )
         elif self.fdm.magnet.type == "Pancake3D":
             self.main_magnet = MainPancake3D(fdm=self.fdm, verbose=verbose)
         elif self.fdm.magnet.type == "CACStrand":
             self.main_magnet = MainConductorAC_Strand(fdm=self.fdm, inputs_folder_path=pathlib.Path(input_file_path).parent, outputs_folder_path=model_folder, verbose=verbose)
-        elif self.fdm.magnet.type == "CACRutherford":
-            self.main_magnet = MainConductorAC_Rutherford(fdm=self.fdm, inputs_folder_path=pathlib.Path(input_file_path).parent, verbose=verbose)
-        elif self.fdm.magnet.type == "Racetrack":
-            self.main_magnet = MainRacetrack(fdm=self.fdm, verbose=verbose)
-        elif self.fdm.magnet.type == "Racetrack3D":
-            self.main_magnet = MainRacetrack3D(fdm=self.fdm, inputs_folder_path=pathlib.Path(input_file_path).parent, verbose=verbose)
         elif self.fdm.magnet.type == "multipole":
             self.file_name = os.path.basename(input_file_path)[:-5]
             if not self.fdm.magnet.geometry.geom_file_path:
@@ -230,7 +218,7 @@ class MainFiQuS:
         else:  # post_process_getdp_only or post_process_python_only or plot_python
             required_folders = []
 
-        fdm = self.main_magnet.fdm.magnet
+
 
         self.main_magnet.geom_folder = _check_and_generate_path(folder_type="Geometry")
         if not self.fdm.run.type in ["geometry_only"]:
@@ -250,7 +238,7 @@ class MainFiQuS:
         ]:
             Util.write_data_model_to_yaml(
                 os.path.join(self.main_magnet.geom_folder, "geometry.yaml"),
-                fdm.geometry,
+                self.fdm.magnet.geometry,
                 by_alias=True,
                 with_comments=True,
             )
@@ -262,7 +250,7 @@ class MainFiQuS:
         ]:
             Util.write_data_model_to_yaml(
                 os.path.join(self.main_magnet.mesh_folder, "mesh.yaml"),
-                fdm.mesh,
+                self.fdm.magnet.mesh,
                 by_alias=True,
                 with_comments=True,
             )
@@ -272,11 +260,20 @@ class MainFiQuS:
             "solve_with_post_process_python",
             "solve_only",
             "post_process",
-            "plot_python"
+            "plot_python",
+            "postprocess_veusz"
         ]:
+            solve_dump_data = SolveDumpDataModel(
+                solve=self.fdm.magnet.solve,
+                circuit=self.fdm.circuit,
+                power_supply=self.fdm.power_supply,
+                quench_protection=self.fdm.quench_protection,
+                quench_detection=self.fdm.quench_detection,
+                conductors=self.fdm.conductors
+            )
             Util.write_data_model_to_yaml(
                 os.path.join(self.main_magnet.solution_folder, "solve.yaml"),
-                fdm.solve,
+                solve_dump_data,
                 by_alias=True,
                 with_comments=True,
             )
@@ -287,11 +284,12 @@ class MainFiQuS:
             "post_process_python_only",
             "post_process_getdp_only",
             "post_process",
+            "postprocess_veusz",
             "plot_python"
         ]:
             Util.write_data_model_to_yaml(
                 os.path.join(self.main_magnet.solution_folder, "postproc.yaml"),
-                fdm.postproc,
+                self.fdm.magnet.postproc,
                 by_alias=True,
                 with_comments=True,
             )
@@ -337,6 +335,7 @@ class MainFiQuS:
         except:
             self.logger.warning("Run log could not be completed.")
 
+
     def build_magnet(self):
         """
         Main method to build magnets, i.e. to run various fiqus run types and magnet types
@@ -389,6 +388,8 @@ class MainFiQuS:
             self.summary["solution_time"] = (
                 self.main_magnet.solve_and_postprocess_getdp(gui=self.main_magnet.fdm.run.launch_gui)
             )
+        elif self.fdm.run.type == "postprocess_veusz":
+            self.main_magnet.post_process_veusz(gui=self.main_magnet.fdm.run.launch_gui)
         elif self.fdm.run.type == "post_process_getdp_only":
             self.main_magnet.post_process_getdp(gui=self.main_magnet.fdm.run.launch_gui)
         elif self.fdm.run.type == "post_process_python_only":
@@ -405,15 +406,10 @@ class MainFiQuS:
             self.main_magnet.batch_post_process_python()
         os.chdir(self.start_folder)
 
-        if self.file_name: json.dump(self.summary, open(f"{os.path.join(self.wrk_folder, self.file_name)}.json", 'w'))
-        # mesh_par = self.fdm.magnet.mesh
-        # if self.summary['solution_time']:
-        #     with open(r"C:\Users\avitrano\PycharmProjects\steam_sdk\tests\parsims\FiQuS_run\summary.dat", 'a') as f:
-        #         content = (f"{mesh_par.mesh_coil.SizeMin}     {mesh_par.mesh_coil.SizeMax}      {mesh_par.mesh_iron.SizeMin}      {mesh_par.mesh_iron.SizeMax}       "
-        #                    f"{self.summary['solution_time']}    {self.summary['overall_error']}       {self.summary['overall_error'] * 0.999 + self.summary['solution_time'] * 0.001}       "
-        #                    f"{self.summary['SJ']}     {self.summary['SICN']}      {self.summary['SIGE']}      {self.summary['Gamma']}       "
-        #                    f"{self.summary['nodes']}    {self.summary['minimum_diff']}    {self.summary['maximum_diff']}\n")
-        #         f.writelines(content)
+        if self.file_name:
+            file_path = os.path.join(self.wrk_folder, f"{self.file_name}.json")
+            with open(file_path, 'w', encoding='utf-8') as f:
+                json.dump(self.summary, f, indent=2)
 
     @staticmethod
     def add_to_run_log(path_to_csv, run_log_row):