fiqus 2026.1.1__py3-none-any.whl → 2026.1.3__py3-none-any.whl

fiqus/data/DataFiQuSMultipole.py

@@ -226,13 +226,6 @@ class MultipoleSolveNonLinearSolver(BaseModel):
         default='LinfNorm',
         description="It specifies the type of norm to be calculated for convergence assessment.",
     )
-    integration_method: Union[None, Literal[
-       "Euler", "Gear_2", "Gear_3", "Gear_4", "Gear_5", "Gear_6"
-    ]] = Field(
-        default="Euler",
-        title="Integration Method",
-        description="It specifies the type of integration method to be used.",
-    )
 
 class MultipoleSolveTransientThermal(MultipoleSolveTransient_parent):
     """

fiqus/mains/MainMultipole.py

@@ -109,7 +109,7 @@ class MainMultipole:
                 This code generates the reference models for the FALCOND_C
             """
             ### hardcoded, we need only one reference
-            if self.fdm.general.magnet_name == 'TEST_MULTIPOLE_FALCOND_C_TSA_COLLAR_POLE':
+            if 'FALCOND_C' in self.fdm.general.magnet_name.upper() and 'POLE' in self.fdm.general.magnet_name.upper():
                 CUT_REFERENCE = True # self specify loop and surf
 
                 L_col = [56, 57, 58, 35, 16, 49, 48, 47]
@@ -205,35 +205,20 @@ class MainMultipole:
 
     def solve_and_postprocess_getdp(self, gui: bool = False):
         an = AssignNaming(data=self.fdm)
-        rg = RunGetdpMultipole(data=an, solution_folder=self.solution_folder, GetDP_path=self.GetDP_path,
-                               verbose=self.verbose)
-        rg.loadRegionFiles()
-        if self.fdm.magnet.solve.thermal.solve_type and self.fdm.magnet.geometry.thermal.use_TSA:
-            rg.loadRegionCoordinateFile()
-        rg.assemblePro()
-        start_time = time.time()
-        rg.solve_and_postprocess()
-        rg.ending_step(gui)
-        return time.time() - start_time
+        rg = RunGetdpMultipole(data=an, solution_folder=self.solution_folder, GetDP_path=self.GetDP_path, verbose=self.verbose)
 
-    def solve_and_postprocess_getdp(self, gui: bool = False):
-        an = AssignNaming(data=self.fdm)
-        rg = RunGetdpMultipole(data=an, solution_folder=self.solution_folder, GetDP_path=self.GetDP_path,
-                               verbose=self.verbose)
         rg.loadRegionFiles()
-        if self.fdm.magnet.solve.thermal.solve_type and self.fdm.magnet.geometry.thermal.use_TSA:
-            rg.loadRegionCoordinateFile()
-            rg.read_aux_file(os.path.join(self.mesh_folder, f"{self.fdm.general.magnet_name}_EM.aux"))
-            rg.extract_half_turn_blocks()
+        rg.loadRegionCoordinateFile()
+        rg.read_aux_file(os.path.join(self.mesh_folder, f"{self.fdm.general.magnet_name}_EM.aux"))
+        rg.extract_half_turn_blocks()
         if self.fdm.magnet.geometry.thermal.use_TSA_new:
-            rg.read_aux_file(os.path.join(self.mesh_folder,
-                                          f"{self.fdm.general.magnet_name}_TH.aux"))  # now load the thermal aux file
+            rg.read_aux_file(os.path.join(self.mesh_folder, f"{self.fdm.general.magnet_name}_TH.aux")) # now load the thermal aux file
             rg.extract_specific_TSA_lines()
+
         rg.assemblePro()
         start_time = time.time()
         rg.solve_and_postprocess()
         rg.ending_step(gui)
-        return time.time() - start_time
 
 
     def post_process_getdp(self, gui: bool = False):

fiqus/mesh_generators/MeshMultipole.py

@@ -217,7 +217,7 @@ class Mesh:
             if not 'collar' in geometry.areas:
                 raise Exception("Adding the reference segment without collar is not intended.")
             distance_ref = self.mesh.field.add("Distance")
-            if self.data.general.magnet_name == 'TEST_MULTIPOLE_FALCOND_C_TSA_COLLAR_POLE':
+            if 'FALCOND_C' in self.data.general.magnet_name.upper() and 'POLE' in self.data.general.magnet_name.upper():
                 lines = list(range(754, 855)) + list(range(910, 1011))
                 self.mesh.field.setNumbers(distance_ref, "CurvesList", lines)
             else:

{fiqus-2026.1.1.dist-info → fiqus-2026.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiqus
-Version: 2026.1.1
+Version: 2026.1.3
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: gmsh<5,>=4.13
+Requires-Dist: gmsh==4.15.0
 Requires-Dist: h5py<4,>=3.10
 Requires-Dist: Jinja2<4,>=3.1
 Requires-Dist: matplotlib<4,>=3.8
@@ -44,7 +44,7 @@ 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: gmsh==4.15.0; 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"

{fiqus-2026.1.1.dist-info → fiqus-2026.1.3.dist-info}/RECORD

@@ -8,7 +8,7 @@ fiqus/data/DataFiQuSConductorAC_CC.py,sha256=fF_g2Ao5Q_vy2g5EcxSGbstHETYP2YKJH2B
 fiqus/data/DataFiQuSConductorAC_Rutherford.py,sha256=mEZYPqIMzovyt-7vwD16dMScwwrX2ZTkmn1MmZI4rNM,30037
 fiqus/data/DataFiQuSConductorAC_Strand.py,sha256=vyVcY9IIVbTvOVP1AkbTLafcv2TSM02BHQ6Fxy3ZDbY,38089
 fiqus/data/DataFiQuSHomogenizedConductor.py,sha256=2MIJHJ51nB3_7Gx4St0tFfKh07vFhVu3DzXVNvntsMY,22854
-fiqus/data/DataFiQuSMultipole.py,sha256=HPhRfVW58xqPzWrNNfrwcsvLSshMKv32CXaQA7qcQAw,43025
+fiqus/data/DataFiQuSMultipole.py,sha256=GiErxzISEFWN6nbfH8IUlZ_hbvvgu64nWipd8ciTDa4,42746
 fiqus/data/DataFiQuSPancake3D.py,sha256=czgDU-h_XBq3OLqFOllr8zLx_MxQoCiWo84DsyOhhbo,136611
 fiqus/data/DataModelCommon.py,sha256=v78jhX4oL7aro2t2Uzo7HTvUIB2Z5_pOBL_gzd_dQcA,24255
 fiqus/data/DataMultipole.py,sha256=-T1RWiK9Z5WDOeRrzozR3M5hUN5GjJcr6E95NNeVzE0,7577
@@ -40,7 +40,7 @@ fiqus/mains/MainConductorAC_CC.py,sha256=R4hwF7uLScZDs6vUlt63JxPTEpcAkiCmpP_m5nv
 fiqus/mains/MainConductorAC_Rutherford.py,sha256=nmV5pAiMbypFQ-sRts5iAgEPOOsZyJNRTnKNvFQWdxQ,3084
 fiqus/mains/MainConductorAC_Strand.py,sha256=taZ10hr-c3Mmn83WwsKtar6Ezm3DvODwvmkem5_XZI4,5511
 fiqus/mains/MainHomogenizedConductor.py,sha256=MoxSJq1ypnldsOMyxq8kS-57WTDqCvCl-s6Jo-eqc8E,3962
-fiqus/mains/MainMultipole.py,sha256=jzMVszA5CNGlSh2RW1E-5UGU0sQSTFCNTcJBuR2mtog,14592
+fiqus/mains/MainMultipole.py,sha256=lkf4sTdjiDo6OMmzMVIeabr44dQm672u4-IO77Xa9p8,13790
 fiqus/mains/MainPancake3D.py,sha256=JgmKqcjUOGmodxZoWXfLxKpp-w6_bX1r6XIhqNTQduU,23561
 fiqus/mains/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/mesh_generators/MeshCCT.py,sha256=e2oERrb2Vp7W8eAptijFq1vi-cUbYS_T3jCDqH3foIg,11227
@@ -49,7 +49,7 @@ fiqus/mesh_generators/MeshConductorAC_Rutherford.py,sha256=xFrBLFInqrzZ-eTvHOv37
 fiqus/mesh_generators/MeshConductorAC_Strand.py,sha256=EvQ_adA1lUEcgfOQ9-m2G6FuWTioFRQrC0en-Nn_ztg,48041
 fiqus/mesh_generators/MeshConductorAC_Strand_RutherfordCopy.py,sha256=LundceEIHHgL3MDIVAk1pU1gyrEBtj2A43Jh7UoOdWE,48153
 fiqus/mesh_generators/MeshHomogenizedConductor.py,sha256=gkwBRssdV3IvCZybdbwKrOuOsp7kUO0yfsvavGGpYmY,13126
-fiqus/mesh_generators/MeshMultipole.py,sha256=fABC_BHIVagjHgAIcWewOopqROXCtUqwX7uHbEghfQg,137265
+fiqus/mesh_generators/MeshMultipole.py,sha256=k-AD8XeZnRavEWY1fzGdxVIbPjwafXuugS78SLe4-vA,137294
 fiqus/mesh_generators/MeshPancake3D.py,sha256=u31glrOUPGityJ5S0z4n3SvI_Vqqyh62jv7OXIq3-lY,126975
 fiqus/mesh_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/parsers/ParserCOND.py,sha256=qMx5S-oyMtD01OrbXUqvCEPU4mtZUxWYWFD-WWFx6Vs,41402
@@ -93,7 +93,7 @@ fiqus/pro_templates/separated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 fiqus/utils/Utils.py,sha256=3mPtDLYJfZR0cQBlKkeexyc53Vs_A227QbBV7ATyV9Y,35420
 fiqus/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/utils/update_data_settings.py,sha256=8q4Qa3PGvm4aRNxp9CtIeZeA-RCev5zevnJ4c2tvhUw,1299
-fiqus-2026.1.1.dist-info/licenses/LICENSE.txt,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+fiqus-2026.1.3.dist-info/licenses/LICENSE.txt,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_FiQuS.py,sha256=mlY5eRp-sE_ubaPG7HHAEsC4Q3iQwI76nfOclPg7m-M,15529
 tests/test_geometry_generators.py,sha256=D54RrPbh6MCH1MX-Z4ex_qE6ktoict8Moiw-jYBjDjc,10767
@@ -104,7 +104,7 @@ tests/utils/fiqus_test_classes.py,sha256=q7HxmvdZvDeA39KU8I410eYIb_dCePlQ75wGamM
 tests/utils/generate_reference_files_ConductorAC.py,sha256=F5KK1AmHg1AmjZL6wRoR4R4kPpQu5KyLZtk1EnDsS1I,1619
 tests/utils/generate_reference_files_Pancake3D.py,sha256=9sULcDOmbotrbYHz8DqGv6Km7ThfltnCHFojHUx193U,3126
 tests/utils/helpers.py,sha256=kG367_ZtjQbwKYLPL_UiIVyCU5RVLPBt-iYlydj4xbg,7048
-fiqus-2026.1.1.dist-info/METADATA,sha256=8hsubB5iGDhRky0B5vtSkLjrt1KQDxuH-A_PPnw6DZg,9219
-fiqus-2026.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fiqus-2026.1.1.dist-info/top_level.txt,sha256=oGzSIyoVc1zYg14o67zI3QFwWsJvqNzNT0-te9WbUQc,12
-fiqus-2026.1.1.dist-info/RECORD,,
+fiqus-2026.1.3.dist-info/METADATA,sha256=v29KGRXNEvJcjTxrPUbJlamB-R-8VWNc_2EDMsXX11A,9217
+fiqus-2026.1.3.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+fiqus-2026.1.3.dist-info/top_level.txt,sha256=oGzSIyoVc1zYg14o67zI3QFwWsJvqNzNT0-te9WbUQc,12
+fiqus-2026.1.3.dist-info/RECORD,,

{fiqus-2026.1.1.dist-info → fiqus-2026.1.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any