fiqus 2025.12.0__tar.gz → 2026.1.1__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fiqus
-Version: 2025.12.0
+Version: 2026.1.1
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team
@@ -10,52 +10,17 @@ 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"
+Requires-Dist: gmsh<5,>=4.13
+Requires-Dist: h5py<4,>=3.10
+Requires-Dist: Jinja2<4,>=3.1
+Requires-Dist: matplotlib<4,>=3.8
+Requires-Dist: mplcursors<1,>=0.5
+Requires-Dist: numpy<2,>=1.26
+Requires-Dist: pandas<3,>=2.2
+Requires-Dist: pydantic<3,>=2.6
+Requires-Dist: ruamel.yaml<1,>=0.18
+Requires-Dist: scipy<2,>=1.14
+Requires-Dist: tqdm<5,>=4.66
 Provides-Extra: docs
 Requires-Dist: griffe==0.42.0; extra == "docs"
 Requires-Dist: markdown==3.5.2; extra == "docs"
@@ -78,6 +43,49 @@ Provides-Extra: build
 Requires-Dist: setuptools==69.2.0; extra == "build"
 Requires-Dist: wheel==0.45.1; extra == "build"
 Requires-Dist: twine==6.0.1; extra == "build"
+Provides-Extra: all
+Requires-Dist: gmsh<5,>=4.13; extra == "all"
+Requires-Dist: h5py<4,>=3.10; extra == "all"
+Requires-Dist: Jinja2<4,>=3.1; extra == "all"
+Requires-Dist: matplotlib<4,>=3.8; extra == "all"
+Requires-Dist: mplcursors<1,>=0.5; extra == "all"
+Requires-Dist: numpy<2,>=1.26; extra == "all"
+Requires-Dist: pandas<3,>=2.2; extra == "all"
+Requires-Dist: pydantic<3,>=2.6; extra == "all"
+Requires-Dist: ruamel.yaml<1,>=0.18; extra == "all"
+Requires-Dist: scipy<2,>=1.14; extra == "all"
+Requires-Dist: tqdm<5,>=4.66; 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"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![FiQuS logo](https://gitlab.cern.ch/steam/fiqus/-/raw/master/docs/images/FiQuS_name_logo.svg)
 
@@ -96,7 +104,7 @@ Source code for STEAM **FiQuS** (**Fi**nite Element **Qu**ench **S**imulator).
 
 ## Using FiQuS
 - 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).
+- 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).
 - M. Wozniak et al, "Fast Quench Propagation Conductor for Protecting Canted Cos-Theta Magnets," in IEEE Transactions on Applied Superconductivity, vol. 33, no. 5, pp. 1-5, Aug. 2023, Art no. 4701705, doi: [10.1109/TASC.2023.3247997](https://ieeexplore.ieee.org/document/10050158).
 - E. Schnaubelt et al, "Parallel-in-Time Integration of Transient Phenomena in No-Insulation Superconducting Coils Using Parareal", accepted for publication in the proceedings of the 
@@ -104,7 +112,7 @@ Scientific Computing in Electrical Engineering (SCEE) 2024 conference, [arXiv:24
 
 ## 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, "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).
@@ -128,13 +136,9 @@ STEAM-FiQuS documentation: https://steam-fiqus.docs.cern.ch/
 Coverage report: https://steam-fiqus.docs.cern.ch/htmlcov/ 
 
 # Contact
-steam-team@cern.ch
-
-# STEAM User Agreement
-By using any software of the STEAM framework, users agree with this document:
-https://edms.cern.ch/document/2024516
-
-(Copyright © 2022, CERN, Switzerland. All rights reserved.)
+steam-admins@cern.ch
 
 # License
 This project is licensed under the GNU General Public License v3.0. See the LICENSE file for details.
+
+(Copyright © 2022, CERN, Switzerland. All rights reserved.)

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

@@ -47,13 +47,9 @@ STEAM-FiQuS documentation: https://steam-fiqus.docs.cern.ch/
 Coverage report: https://steam-fiqus.docs.cern.ch/htmlcov/ 
 
 # Contact
-steam-team@cern.ch
-
-# STEAM User Agreement
-By using any software of the STEAM framework, users agree with this document:
-https://edms.cern.ch/document/2024516
-
-(Copyright © 2022, CERN, Switzerland. All rights reserved.)
+steam-admins@cern.ch
 
 # License
-This project is licensed under the GNU General Public License v3.0. See the LICENSE file for details.
+This project is licensed under the GNU General Public License v3.0. See the LICENSE file for details.
+
+(Copyright © 2022, CERN, Switzerland. All rights reserved.)

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

@@ -27,6 +27,7 @@ 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
+from fiqus.mains.MainConductorAC_CC import MainConductorAC_CC
 
 class MainFiQuS:
     """
@@ -92,6 +93,8 @@ class MainFiQuS:
             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 == "CACCC":
+            self.main_magnet = MainConductorAC_CC(fdm=self.fdm, inputs_folder_path=pathlib.Path(input_file_path).parent, 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":
@@ -100,12 +103,7 @@ class MainFiQuS:
             self.file_name = os.path.basename(input_file_path)[:-5]
             if not self.fdm.magnet.geometry.geom_file_path:
                 self.fdm.magnet.geometry.geom_file_path = f"{input_file_path[:-5]}.geom"
-            self.main_magnet = MainMultipole(
-                fdm=self.fdm,
-                rgd_path=self.fdm.magnet.geometry.geom_file_path,
-                verbose=verbose,
-            )
-
+            self.main_magnet = MainMultipole(fdm=self.fdm,rgd_path=self.fdm.magnet.geometry.geom_file_path,verbose=verbose, inputs_folder_path=pathlib.Path(input_file_path).parent)
         else:
             raise ValueError(
                 f"FiQuS does not support magnet type: {self.fdm.magnet.type}!"
@@ -394,8 +392,6 @@ 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.12.0 → fiqus-2026.1.1}/fiqus/data/DataConductor.py

@@ -116,6 +116,27 @@ class ProDefined(BaseModel):
     v: Optional[float] = None  # [-]
     B0: Optional[float] = None  # [-]
 
+class Succi_fixed(BaseModel):
+    """
+    Level 3: Class for cable Succi's YBCO fit
+    """
+
+    type: Literal["Succi_fixed"]
+    Jc_factor: Optional[float] = Field(gt=0.0,
+        default = 1.0,
+        description = "This factor multiplies the Jc returned by the function."
+    )
+    # all other parameters of the Succi fit are hardcoded
+class Fujikura(BaseModel):
+    """
+    Level 3: Class for cable Fujikura's fit
+    """
+
+    type: Literal["Fujikura"]
+    Jc_factor: Optional[float] = Field(gt=0.0,
+        default = 1.0,
+        description = "This factor multiplies the Jc returned by the function."
+    )
 
 class BSCCO_2212_LBNL(BaseModel):
     """
@@ -223,6 +244,31 @@ class Ribbon(BaseModel):
     material_outer_voids: Optional[str] = None
     material_core: Optional[str] = None
 
+class TSTC(BaseModel):
+    """
+    Twisted Stacked-Tape Cable (TSTC) type:
+    """
+    type: Literal["TSTC"]
+    stack_layout: Optional[List[Literal[-1,0,1]]] = Field(default=None,description="2D: Tape stack layout ordered TOP->BOTTOM. The numbers represent: 1 = a CC tape, -1 = a flipped CC tape, 0 = a shunt.")
+    nb_tapes: Optional[int] = Field(default=None, description="3D: Number of tapes in the stack")
+    tape_width: Optional[float] = Field(default=None, description="3D and 2D: Width of each tape")
+    tape_thickness: Optional[float] = Field(default=None, description="3D and 2D: Thickness of each tape")
+    twist_pitch: Optional[float] = Field(default=None, description="3D: Length over which tapes are twisted by full rotation")
+    pitch_fraction: Optional[float] = Field(default=1.0, description="3D: Fraction of the twist pitch to be modelled (1.0 = full pitch, 0.5 = half pitch, etc.)")
+    bare_cable_width: Optional[float] = Field(default=None, description="Cable width, typically the same as CC width")
+    bare_cable_height_low: Optional[float] = Field(default=None, description="Narrow end (if applicable) cable height (thickness), typically the same as (CC thickness + Cu stabilizer thickness) * number of tapes.")
+    bare_cable_height_high: Optional[float] = Field(default=None, description="Wide end (if applicable) cable height (thickness), typically the same as (CC thickness + Cu stabilizer thickness) * number of tapes.")
+    bare_cable_height_mean: Optional[float] = Field(default=None, description="Average (if applicable) cable height (thickness), typically the same as (CC thickness + Cu stabilizer thickness) * number of tapes.")
+    th_insulation_along_width: Optional[float] = Field(default=None, description="Insulation thickness along the width ")
+    th_insulation_along_height: Optional[float] = Field(default=None, description="Insulation thickness along the height ")
+    f_superconductor: Optional[float] = Field(default=None, description="Fraction of superconductor related to the total area of the cable (winding cell)")
+    f_stabilizer: Optional[float] = Field(default=None, description="Fraction of stabilizer related to the total area of the cable (winding cell)")
+    f_silver: Optional[float] = Field(default=None, description="Fraction of silver related to the total area of the cable (winding cell)")
+    f_substrate: Optional[float] = Field(default=None, description="Fraction of substrate (including buffer layers and silver overlay) related to the total area of the cable (winding cell)")
+    f_shunt: Optional[float] = Field(default=None, description="Fraction of substrate (including buffer layers and silver overlay) related to the total area of the cable (winding cell)")
+    f_insulation: Optional[float] = Field(default=None, description="Fraction of cable insulation related to the total area of the cable (winding cell)")
+    f_inner_voids: Optional[float] = Field(default=None, description="Fraction of additional material (typically insulation) related to the total area of the cable (winding cell)")
+    f_outer_voids: Optional[float] = Field(default=None, description="Fraction of additional material (typically helium impregnating the windings) related to the total area of the cable (winding cell)")
 
 # ------------------- Conductors ---------------------------#
 
@@ -275,7 +321,7 @@ class Round(BaseModel):
     k_material_superconductor: Optional[Union[str, float]] = Field(default=None, description="Thermal conductivity of the superconductor.")
     Cv_material_superconductor: Optional[Union[str, float]] = Field(default=None, description="Material function for specific heat of the superconductor.")
     # -- Stabilizer parameters -- #
-    material_stabilizer: Optional[str] = Field(default=None, description="Material of the stabilizer.")
+    #material_stabilizer: Optional[str] = Field(default=None, description="Material of the stabilizer.")
     rho_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Material function for resistivity of the stabilizer. Constant resistivity can be given as float.")
     rho_material_holes: Optional[Union[str, float]] = Field(default=None, description="Material function for resistivity of the holes in the filaments."
                                                                                      "Constant resistivity can be given as float, material name as a string or None or 0.0 to use 'air' in the holes.")
@@ -316,18 +362,69 @@ class Rectangular(BaseModel):
     k_material_superconductor: Optional[Union[str, float]] = Field(default=None, description="Thermal conductivity of the superconductor.")
     Cv_material_superconductor: Optional[Union[str, float]] = Field(default=None, description="Material function for specific heat of the superconductor.")
     # -- Stabilizer parameters -- #
-    material_stabilizer: Optional[str] = Field(default=None, description="Material of the stabilizer.")
+    #material_stabilizer: Optional[str] = Field(default=None, description="Material of the stabilizer.") #TODO this should be removed as is substituted by rho, k and Cv
+    k_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Thermal conductivity of the stabilizer.")
+    Cv_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Material function for specific heat of the stabilizer.")
     rho_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Material function for resistivity of the stabilizer. Constant resistivity can be given as float.")
     RRR: Optional[Union[float, List[float]]] = Field(default=None, description="Residual resistivity ratio of the stabilizer. If a list of RRR is provided it needs to match in length the number of matrix regions in the geometry (typically 3)")
     T_ref_RRR_high: Optional[float] = Field(default=None, description="Upper reference temperature for RRR measurements.")
     T_ref_RRR_low: Optional[float] = Field(default=None, description="Lower reference temperature for RRR measurements.")
-    k_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Thermal conductivity of the stabilizer.")
-    Cv_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Material function for specific heat of the stabilizer.")
-    number_of_filaments: Optional[int] = None
 
-    # superconductor: MaterialSuperconductor = MaterialSuperconductor()
-    # stabilizer: MaterialStabilizer = MaterialStabilizer()
-    
+class Copper_thickness(BaseModel):
+    left: Optional[float] = Field(default=None, description="On the left side.")
+    right: Optional[float] = Field(default=None, description="On the right side.")
+    top: Optional[float] = Field(default=None, description="On the top side.")
+    bottom: Optional[float] = Field(default=None, description="On the bottom side.")
+
+class Silver_thickness(BaseModel):
+    top: Optional[float] = Field(default=None, description="On the top side.")
+    bottom: Optional[float] = Field(default=None, description="On the bottom side.")
+
+class CC(BaseModel):
+    """
+    Level 2: Class for coated conductor parameters
+    """
+    type: Literal["CC"]
+
+    # Core layer sizes
+    HTS_thickness: Optional[float] = Field(default=None, description="HTS thickness in meters.")
+    HTS_width: Optional[float] = Field(default=None, description="HTS width in meters.")
+    number_of_filaments: Optional[int] = Field(default=1, ge=1, description="Number of HTS filaments. If 1, no striation case")
+    gap_between_filaments: Optional[float] = Field(default=None, description="Gap between HTS filaments in meters. Only applies when number_of_filaments > 1.")
+    substrate_thickness: Optional[float] = Field(default=None, description="Substrate layer thickness in meters.")
+
+    # Plating/stabilizer
+    copper_thickness: Copper_thickness = Field(default=Copper_thickness(), description="Copper thickness in meters")
+    silver_thickness: Silver_thickness = Field(default=Silver_thickness(), description="Silver thickness in meters")
+
+    # -- Superconductor parameters -- #
+    material_superconductor: Optional[str] = Field(default=None, description="Material of the superconductor. E.g. NbTi, Nb3Sn, etc.")
+    n_value_superconductor: Optional[float] = Field(default=None, description="n value of the superconductor (for power law fit).")
+    ec_superconductor: Optional[float] = Field(default=None, description="Critical electric field of the superconductor.")
+    minimum_jc_fraction: Optional[float] = Field(gt=0, le=1, default=None, description="Fraction of Jc(minimum_jc_field, T) to use as minimum Jc for the power law"
+                                                                                       " fit to avoid division by zero when Jc(B_local, T) decreases to zero."
+                                                                           "Typical value would be 0.001 (so the Jc_minimum is 0.1% of Jc(minimum_jc_field, T))"
+                                                                            "This fraction is only allowed to be greater than 0.0 and less than or equal to 1.0")
+    minimum_jc_field: Optional[float] = Field(default=None, description="Magnetic flux density in tesla used for calculation of Jc(minimum_jc_field, T)."
+                                                                        "This gets multiplied by minimum_jc_fraction and used as minimum Jc for the power law")
+    k_material_superconductor: Optional[Union[str, float]] = Field(default=None, description="Thermal conductivity of the superconductor.")
+    Cv_material_superconductor: Optional[Union[str, float]] = Field(default=None, description="Material function for specific heat of the superconductor.")
+    k_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Thermal conductivity of the stabilizer, typically copper.")
+    Cv_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Material function for specific heat of the stabilizer, typically copper.")
+    rho_material_stabilizer: Optional[Union[str, float]] = Field(default=None, description="Material function for resistivity of the stabilizer. Constant resistivity can be given as float.")
+    RRR: Optional[Union[float, List[float]]] = Field(default=None, description="Residual resistivity ratio of the stabilizer. If a list of RRR is provided it needs to match in length the number of matrix regions in the geometry (typically 3)")
+    T_ref_RRR_high: Optional[float] = Field(default=None, description="Upper reference temperature for RRR measurements.")
+    T_ref_RRR_low: Optional[float] = Field(default=None, description="Lower reference temperature for RRR measurements.")
+    k_material_silver: Optional[Union[str, float]] = Field(default=None, description="Thermal conductivity of the silver")
+    Cv_material_silver: Optional[Union[str, float]] = Field(default=None, description="Material function for specific heat of the silver")
+    rho_material_silver: Optional[Union[str, float]] = Field(default=None, description="Material function for resistivity of the silver. Constant resistivity can be given as float.")
+    RRR_silver: Optional[Union[float, List[float]]] = Field(default=None, description="Residual resistivity ratio of the silver. If a list of RRR is provided it needs to match in length the number of matrix regions in the geometry (typically 3)")
+    T_ref_RRR_high_silver: Optional[float] = Field(default=None, description="Upper reference temperature for RRR measurements for silver.")
+    T_ref_RRR_low_silver: Optional[float] = Field(default=None, description="Lower reference temperature for RRR measurements for silver.")
+    rho_material_substrate: Optional[Union[str, float]] = Field(default=None, description="Material function for resistivity of the substrate. Constant resistivity can be given as float.")
+    k_material_substrate: Optional[Union[str, float]] = Field(default=None, description="Thermal conductivity of the substrate.")
+    Cv_material_substrate: Optional[Union[str, float]] = Field(default=None, description="Material function for specific heat of the substrate.")
+
 class Homogenized(BaseModel):
     """
     Level 2: Class for homogenized strand parameters, to be used in the Rutherford cable model
@@ -349,10 +446,10 @@ class Conductor(BaseModel):
     version: Optional[str] = None
     case: Optional[str] = None
     state: Optional[str] = None
-    cable: Union[Rutherford, Mono, Ribbon] = {
+    cable: Union[Rutherford, Mono, Ribbon, TSTC] = {
         "type": "Rutherford"
     }  # TODO: Busbar, Rope, Roebel, CORC, TSTC, CICC
-    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] = {
+    strand: Union[Round, Rectangular, CC, Homogenized] = {"type": "Round"}  # TODO: Tape, WIC
+    Jc_fit: Union[ConstantJc, Bottura, CUDI1, CUDI3, Summers, Bordini, Nb3Sn_HFM, BSCCO_2212_LBNL, Ic_A_NbTi, ProDefined, Succi_fixed, Fujikura] = {
         "type": "CUDI1"
     }  # TODO: CUDI other numbers? , Roxie?

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

@@ -9,6 +9,7 @@ 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
+from fiqus.data.DataFiQuSConductorAC_CC import CACCC
 
 class RunFiQuS(BaseModel):
     """
@@ -144,7 +145,7 @@ class FDM(BaseModel):
 
     general: GeneralFiQuS = GeneralFiQuS()
     run: RunFiQuS = RunFiQuS()
-    magnet: Union[Multipole, CCT, Pancake3D, CACStrand, HomogenizedConductor, CACRutherford] = Field(
+    magnet: Union[Multipole, CCT, Pancake3D, CACStrand, HomogenizedConductor, CACRutherford, CACCC] = Field(
         default=Multipole(), discriminator="type"
     )
     circuit: Circuit_Class = Circuit_Class()