fiqus 2025.10.0__tar.gz → 2025.12.0__tar.gz

{fiqus-2025.10.0 → fiqus-2025.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiqus
-Version: 2025.10.0
+Version: 2025.12.0
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team
@@ -91,10 +91,10 @@ Source code for STEAM **FiQuS** (**Fi**nite Element **Qu**ench **S**imulator).
 - J. Dular et al, "Coupled Axial and Transverse Currents Method for Finite Element Modelling of Periodic Superconductors", in Superconductor Science and Technology, doi: [10.1088/1361-6668/ad650d](https://doi.org/10.1088/1361-6668/ad650d).
 - E. Schnaubelt et al, "Transient Finite Element Simulation of Accelerator Magnets Using Thermal Thin Shell Approximation", arXiV preprint, doi: [10.48550/arXiv.2501.15871](https://doi.org/10.48550/arXiv.2501.15871).
 - A. Vitrano et al, "An Open-Source Finite Element Quench Simulation Tool for Superconducting Magnets," in IEEE Transactions on Applied Superconductivity, vol. 33, no. 5, pp. 1-6, Aug. 2023, Art no. 4702006, doi: [10.1109/TASC.2023.3259332](https://ieeexplore.ieee.org/abstract/document/10077402).
+- J. Dular et al, "Simulation of Rutherford Cable AC Loss and Magnetization with the Coupled Axial and Transverse Currents Method", in IEEE Transactions on Applied Superconductivity, [10.1109/TASC.2024.3520941](https://doi.org/10.1109/TASC.2024.3520941).
+- J. Dular et al, "Distributed Inter-Strand Coupling Current Model for Finite Element Simulations of Rutherford Cables", arXiv preprint, doi: [arXiv:2510.24618](https://arxiv.org/abs/2510.24618).
 
 ## Using FiQuS
-
-- J. Dular et al, "Simulation of Rutherford Cable AC Loss and Magnetization with the Coupled Axial and Transverse Currents Method", in IEEE Transactions on Applied Superconductivity, [10.1109/TASC.2024.3520941](https://doi.org/10.1109/TASC.2024.3520941).
 - M. Wozniak et al, "Influence of Critical Current Distribution on Operation, Quench Detection and Protection of HTS Pancake Coils, in IEEE Transactions on Applied Superconductivity, [10.1109/TASC.2025.3532246](https://doi.org/10.1109/TASC.2025.3532246).
 - Laura AM D’Angelo et al, "Efficient Reduced Magnetic Vector Potential Formulation for the Magnetic Field Simulation of Accelerator Magnets", in IEEE Transactions on Magnetics, vol. 60, no. 3, pp. 1-8, Jan. 2024, Art no. 7000808, doi: [10.1109/TMAG.2024.3352113](https://ieeexplore.ieee.org/abstract/document/10387412).
 - M. Wozniak et al, "Quench Co-Simulation of Canted Cos-Theta Magnets," in IEEE Transactions on Applied Superconductivity, vol. 34, no. 3, pp. 1-5, Dec. 2023, Art no. 4900105, doi: [10.1109/TASC.2023.3338142](https://ieeexplore.ieee.org/document/10337614).
@@ -103,11 +103,12 @@ Source code for STEAM **FiQuS** (**Fi**nite Element **Qu**ench **S**imulator).
 Scientific Computing in Electrical Engineering (SCEE) 2024 conference, [arXiv:2404.13333](https://arxiv.org/abs/2404.13333).
 
 ## Mathematical Formulations Forming the Basis of Some FiQuS Modules
-
 - E. Schnaubelt et al, "Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils", in IEEE Transactions on Applied Superconductivity, vol. 34, no. 3, pp. 1-6, Dec. 2023, Art no. 4700406, doi: [10.1109/TASC.2023.3340648](https://ieeexplore.ieee.org/document/10349801).
 - E. Schnaubelt et al, "Electromagnetic Simulation of No-Insulation Coils Using H−φ Thin Shell Approximation", in IEEE Transactions on Applied Superconductivity, vol. 33, no. 5, pp. 1-6, Mar. 2023, Art no. 4900906, doi: [10.1109/TASC.2023.3258905](https://ieeexplore.ieee.org/document/10076826).
 - E. Schnaubelt et al, "Thermal thin shell approximation towards finite element quench simulation", in Superconductor Science and Technology, vol. 36, no. 4, Art no. 044004, doi: [10.1088/1361-6668/acbeea](https://iopscience.iop.org/article/10.1088/1361-6668/acbeea).
-
+- J. Dular et al, "Reduced order hysteretic magnetization model for composite superconductors", in Superconductor Science and Technology, vol. 38, no. 3, Art no. 035017, doi: [10.1088/1361-6668/adb5cc](https://iopscience.iop.org/article/10.1088/1361-6668/adb5cc/meta).
+- J. Dular et al, "A Finite Element a-h-Formulation for the Reduced Order Hysteretic Magnetization Model for Composite Superconductors", in IEEE Transactions on Applied Superconductivity, vol. 35, no. 5, Art no. 8200205, doi: [10.1109/TASC.2025.3528310](https://ieeexplore.ieee.org/abstract/document/10839043).
+- A. Glock et al, "Reduced Order Hysteretic Flux Model for Transport Current Homogenization in Composite Superconductors", in IEEE Transactions on Magnetics, doi: [10.1109/TMAG.2025.3613877](https://ieeexplore.ieee.org/abstract/document/11177605).
 
 # Folder Structure
 ![FiQuS folder structure](https://gitlab.cern.ch/steam/fiqus/-/raw/master/docs/images/FiQuS_folder_structure.svg)

{fiqus-2025.10.0 → fiqus-2025.12.0}/README.md

@@ -10,10 +10,10 @@ Source code for STEAM **FiQuS** (**Fi**nite Element **Qu**ench **S**imulator).
 - J. Dular et al, "Coupled Axial and Transverse Currents Method for Finite Element Modelling of Periodic Superconductors", in Superconductor Science and Technology, doi: [10.1088/1361-6668/ad650d](https://doi.org/10.1088/1361-6668/ad650d).
 - E. Schnaubelt et al, "Transient Finite Element Simulation of Accelerator Magnets Using Thermal Thin Shell Approximation", arXiV preprint, doi: [10.48550/arXiv.2501.15871](https://doi.org/10.48550/arXiv.2501.15871).
 - A. Vitrano et al, "An Open-Source Finite Element Quench Simulation Tool for Superconducting Magnets," in IEEE Transactions on Applied Superconductivity, vol. 33, no. 5, pp. 1-6, Aug. 2023, Art no. 4702006, doi: [10.1109/TASC.2023.3259332](https://ieeexplore.ieee.org/abstract/document/10077402).
+- J. Dular et al, "Simulation of Rutherford Cable AC Loss and Magnetization with the Coupled Axial and Transverse Currents Method", in IEEE Transactions on Applied Superconductivity, [10.1109/TASC.2024.3520941](https://doi.org/10.1109/TASC.2024.3520941).
+- J. Dular et al, "Distributed Inter-Strand Coupling Current Model for Finite Element Simulations of Rutherford Cables", arXiv preprint, doi: [arXiv:2510.24618](https://arxiv.org/abs/2510.24618).
 
 ## Using FiQuS
-
-- J. Dular et al, "Simulation of Rutherford Cable AC Loss and Magnetization with the Coupled Axial and Transverse Currents Method", in IEEE Transactions on Applied Superconductivity, [10.1109/TASC.2024.3520941](https://doi.org/10.1109/TASC.2024.3520941).
 - M. Wozniak et al, "Influence of Critical Current Distribution on Operation, Quench Detection and Protection of HTS Pancake Coils, in IEEE Transactions on Applied Superconductivity, [10.1109/TASC.2025.3532246](https://doi.org/10.1109/TASC.2025.3532246).
 - Laura AM D’Angelo et al, "Efficient Reduced Magnetic Vector Potential Formulation for the Magnetic Field Simulation of Accelerator Magnets", in IEEE Transactions on Magnetics, vol. 60, no. 3, pp. 1-8, Jan. 2024, Art no. 7000808, doi: [10.1109/TMAG.2024.3352113](https://ieeexplore.ieee.org/abstract/document/10387412).
 - M. Wozniak et al, "Quench Co-Simulation of Canted Cos-Theta Magnets," in IEEE Transactions on Applied Superconductivity, vol. 34, no. 3, pp. 1-5, Dec. 2023, Art no. 4900105, doi: [10.1109/TASC.2023.3338142](https://ieeexplore.ieee.org/document/10337614).
@@ -22,11 +22,12 @@ Source code for STEAM **FiQuS** (**Fi**nite Element **Qu**ench **S**imulator).
 Scientific Computing in Electrical Engineering (SCEE) 2024 conference, [arXiv:2404.13333](https://arxiv.org/abs/2404.13333).
 
 ## Mathematical Formulations Forming the Basis of Some FiQuS Modules
-
 - E. Schnaubelt et al, "Magneto-Thermal Thin Shell Approximation for 3D Finite Element Analysis of No-Insulation Coils", in IEEE Transactions on Applied Superconductivity, vol. 34, no. 3, pp. 1-6, Dec. 2023, Art no. 4700406, doi: [10.1109/TASC.2023.3340648](https://ieeexplore.ieee.org/document/10349801).
 - E. Schnaubelt et al, "Electromagnetic Simulation of No-Insulation Coils Using H−φ Thin Shell Approximation", in IEEE Transactions on Applied Superconductivity, vol. 33, no. 5, pp. 1-6, Mar. 2023, Art no. 4900906, doi: [10.1109/TASC.2023.3258905](https://ieeexplore.ieee.org/document/10076826).
 - E. Schnaubelt et al, "Thermal thin shell approximation towards finite element quench simulation", in Superconductor Science and Technology, vol. 36, no. 4, Art no. 044004, doi: [10.1088/1361-6668/acbeea](https://iopscience.iop.org/article/10.1088/1361-6668/acbeea).
-
+- J. Dular et al, "Reduced order hysteretic magnetization model for composite superconductors", in Superconductor Science and Technology, vol. 38, no. 3, Art no. 035017, doi: [10.1088/1361-6668/adb5cc](https://iopscience.iop.org/article/10.1088/1361-6668/adb5cc/meta).
+- J. Dular et al, "A Finite Element a-h-Formulation for the Reduced Order Hysteretic Magnetization Model for Composite Superconductors", in IEEE Transactions on Applied Superconductivity, vol. 35, no. 5, Art no. 8200205, doi: [10.1109/TASC.2025.3528310](https://ieeexplore.ieee.org/abstract/document/10839043).
+- A. Glock et al, "Reduced Order Hysteretic Flux Model for Transport Current Homogenization in Composite Superconductors", in IEEE Transactions on Magnetics, doi: [10.1109/TMAG.2025.3613877](https://ieeexplore.ieee.org/abstract/document/11177605).
 
 # Folder Structure
 ![FiQuS folder structure](https://gitlab.cern.ch/steam/fiqus/-/raw/master/docs/images/FiQuS_folder_structure.svg)

{fiqus-2025.10.0 → fiqus-2025.12.0}/fiqus/MainFiQuS.py

@@ -19,12 +19,14 @@ 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
 from fiqus.mains.MainPancake3D import MainPancake3D
 from fiqus.mains.MainConductorAC_Strand import MainConductorAC_Strand
+from fiqus.mains.MainHomogenizedConductor import MainHomogenizedConductor
+from fiqus.mains.MainConductorAC_Rutherford import MainConductorAC_Rutherford
 
 class MainFiQuS:
     """
@@ -86,22 +88,14 @@ 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 == "HomogenizedConductor":
+            self.main_magnet = MainHomogenizedConductor(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 +224,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 +244,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 +256,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 +266,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 +290,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 +341,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 +394,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":

{fiqus-2025.10.0 → fiqus-2025.12.0}/fiqus/data/DataConductor.py

@@ -328,6 +328,14 @@ class Rectangular(BaseModel):
     # superconductor: MaterialSuperconductor = MaterialSuperconductor()
     # stabilizer: MaterialStabilizer = MaterialStabilizer()
     
+class Homogenized(BaseModel):
+    """
+    Level 2: Class for homogenized strand parameters, to be used in the Rutherford cable model
+    """
+    type: Literal["Homogenized"]
+
+    # Strand diameter (used in the geometry step)
+    diameter: Optional[float] = Field(default=None, description="Undeformed round strand diameter. Used in the geometry step if keep_strand_area==true, the strand is deformed while preserving its surface area. Not used otherwise.")
 
 
 # ------------------- Conductors ---------------------------#
@@ -344,7 +352,7 @@ class Conductor(BaseModel):
     cable: Union[Rutherford, Mono, Ribbon] = {
         "type": "Rutherford"
     }  # TODO: Busbar, Rope, Roebel, CORC, TSTC, CICC
-    strand: Union[Round, Rectangular] = {"type": "Round"}  # TODO: Tape, WIC
+    strand: Union[Round, Rectangular, Homogenized] = {"type": "Round"}  # TODO: Tape, WIC
     Jc_fit: Union[ConstantJc, Bottura, CUDI1, CUDI3, Summers, Bordini, Nb3Sn_HFM, BSCCO_2212_LBNL, Ic_A_NbTi, ProDefined] = {
         "type": "CUDI1"
     }  # TODO: CUDI other numbers? , Roxie?

{fiqus-2025.10.0 → fiqus-2025.12.0}/fiqus/data/DataFiQuS.py

@@ -7,8 +7,8 @@ from fiqus.data.DataFiQuSCCT import CCT
 from fiqus.data.DataFiQuSMultipole import Multipole
 from fiqus.data.DataFiQuSPancake3D import Pancake3D
 from fiqus.data.DataFiQuSConductorAC_Strand import CACStrand
-
-
+from fiqus.data.DataFiQuSHomogenizedConductor import HomogenizedConductor
+from fiqus.data.DataFiQuSConductorAC_Rutherford import CACRutherford
 
 class RunFiQuS(BaseModel):
     """
@@ -144,7 +144,7 @@ class FDM(BaseModel):
 
     general: GeneralFiQuS = GeneralFiQuS()
     run: RunFiQuS = RunFiQuS()
-    magnet: Union[Multipole, CCT, Pancake3D, CACStrand] = Field(
+    magnet: Union[Multipole, CCT, Pancake3D, CACStrand, HomogenizedConductor, CACRutherford] = Field(
         default=Multipole(), discriminator="type"
     )
     circuit: Circuit_Class = Circuit_Class()