fiqus 2026.1.0__py3-none-any.whl → 2026.1.2__py3-none-any.whl

fiqus/MainFiQuS.py

@@ -103,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}!"
@@ -397,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/data/DataConductor.py

@@ -321,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.")
@@ -362,18 +362,14 @@ 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.")