fiqus 2025.2.0__py3-none-any.whl → 2025.11.0__py3-none-any.whl

fiqus/geom_generators/GeometryMultipole.py

@@ -9,12 +9,13 @@ from fiqus.utils.Utils import FilesAndFolders as Util
 from fiqus.utils.Utils import GeometricFunctions as Func
 from fiqus.data import DataFiQuS as dF
 from fiqus.data import DataMultipole as dM
+from fiqus.data.DataRoxieParser import FiQuSGeometry
 from fiqus.data.DataRoxieParser import Corner
 from fiqus.data.DataRoxieParser import Coord
-
+import re
 
 class Geometry:
-    def __init__(self, data: dF.FDM() = None, geom: dF.FiQuSGeometry() = None,
+    def __init__(self, data: dF.FDM() = None, geom: FiQuSGeometry() = None,
                  geom_folder: str = None, verbose: bool = False):
         """
         Class to generate geometry
@@ -23,7 +24,7 @@ class Geometry:
         :param verbose: If True more information is printed in python console.
         """
         self.data: dF.FDM() = data
-        self.geom: dF.RoxieData() = geom.Roxie_Data
+        self.geom: FiQuSGeometry() = geom.Roxie_Data
         self.geom_folder = geom_folder
         self.verbose: bool = verbose
 
@@ -121,7 +122,7 @@ class Geometry:
         gmsh.open(os.path.join(f'{self.model_file}_{run_type}.brep'))
 
     def saveAuxiliaryFile(self, run_type):
-        Util.write_data_to_yaml(f'{self.model_file}_{run_type}.aux', self.md.dict())
+        Util.write_data_to_yaml(f'{self.model_file}_{run_type}.aux', self.md.model_dump())
 
     @staticmethod
     def findMidLayerPoint(bc_current, bc_next, center, mean_rad):

fiqus/geom_generators/GeometryPancake3D.py

@@ -4158,7 +4158,7 @@ class Geometry(Base):
             self.geometry_data_file, Pancake3DGeometry
         )
 
-        if previousGeo.dict() != self.geo.dict():
+        if previousGeo.model_dump() != self.geo.model_dump():
             raise ValueError(
                 "Geometry data has been changed. Please regenerate the geometry or load"
                 " the previous geometry data."

fiqus/getdp_runners/RunGetdpCCT.py

@@ -1,6 +1,7 @@
 import os
 import timeit
 from pathlib import Path
+import subprocess
 
 import gmsh
 
@@ -17,6 +18,7 @@ class RunGetdpCCT:
         :param fdm: FiQuS data model
         :param verbose: If True more information is printed in python console.
         """
+        self.fdm = fdm
         self.cctdm = fdm.magnet
         self.GetDP_path = GetDP_path
         self.model_folder = os.path.join(os.getcwd())
@@ -28,6 +30,7 @@ class RunGetdpCCT:
         self.gu = GmshUtils(self.model_folder, self.verbose)
         self.gu.initialize(verbosity_Gmsh=fdm.run.verbosity_Gmsh)
         self.pos_names = []
+        self.call_method = 'subprocess'
         # for variable, volume, file_ext in zip(self.cctdm.solve.variables, self.cctdm.solve.volumes, self.cctdm.solve.file_exts):
         #     self.pos_names.append(f'{variable}_{volume}.{file_ext}')
 
@@ -37,7 +40,7 @@ class RunGetdpCCT:
             start_time = timeit.default_timer()
         if self.verbose:
             print('Assembling pro file')
-        self.ap.assemble_combined_pro(template=self.cctdm.solve.pro_template, rm=self.cctrm, dm=self.cctdm)
+        self.ap.assemble_combined_pro(template=self.cctdm.solve.pro_template, rm=self.cctrm, dm=self.cctdm, mf=f"{os.path.join(self.mesh_folder, self.magnet_name)}.msh")
         if self.verbose:
             print(f'Assembling Pro File Took {timeit.default_timer() - start_time:.2f} s')
 
@@ -55,9 +58,15 @@ class RunGetdpCCT:
         if self.verbose:
             print('Solving Started !!!')
             start_time = timeit.default_timer()
-        getdp_binary = self.GetDP_path
-        gmsh.onelab.run(f"{self.magnet_name}", f"{getdp_binary} {os.path.join(self.model_folder, self.magnet_name)}.pro {command} -msh {os.path.join(self.mesh_folder, self.magnet_name)}.msh")
-        gmsh.onelab.setChanged("GetDP", 0)
+        mpi_prefix = []
+        res = 'MagDynAVComplex'
+        post_op = 'Get_LocalFields'
+
+        if self.call_method == 'onelab':
+            gmsh.onelab.run(f"{self.magnet_name}", f"{self.GetDP_path} {os.path.join(self.model_folder, self.magnet_name)}.pro {command} -msh {os.path.join(self.mesh_folder, self.magnet_name)}.msh")
+        elif self.call_method == 'subprocess':
+            command = ["-solve", res, "-v2", "-pos", post_op, "-verbose", str(self.fdm.run.verbosity_GetDP), '-sub_pc_type lu', '-pc_type lu', '-pc_factor_mat_solver_type mumps']
+            subprocess.call(mpi_prefix + [f"{self.GetDP_path}", f"{os.path.join(self.model_folder, self.magnet_name)}.pro"] + command + [f"-msh {os.path.join(self.mesh_folder, self.magnet_name)}.msh"])
 
         self.model_file = os.path.join(self.model_folder, model_file)
         if self.verbose: