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

fiqus/data/DataFiQuSMultipole.py

@@ -104,32 +104,84 @@ class MultipoleSolveBoundaryConditionsThermal(BaseModel):
                     "The keys are chosen names for each boundary condition.",
     )
 
+class MultipoleSolveTransient_parent(BaseModel):
+    """
+    Level 4: Class for FiQuS Multipole
+    """
+    initial_time: Optional[float] = Field(
+        default=0.,
+        description="It specifies the initial time of the simulation.",
+    )
+    final_time: Optional[float] = Field(
+        default=0.0,
+        description="It specifies the final time of the simulation.",
+    )
+    initial_time_step: Optional[float] = Field(
+        default=1E-10,
+        description="It specifies the initial time step used at the beginning of the transient simulation.",
+    )
+    min_time_step: Optional[float] = Field(
+        default=1E-12,
+        description="It specifies the minimum possible value of the time step.",
+    )
+    max_time_step: Optional[float] = Field(
+        default=10,
+        description="It specifies the maximum possible value of the time step.",
+    )
+    breakpoints: Optional[List[float]] = Field(
+        default=[],
+        description="It forces the transient simulation to hit the time instants contained in this list.",
+    )
+    integration_method: Optional[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.",
+    )
+    rel_tol_time: Optional[float] = Field(
+        default=1E-4,
+        description="It specifies the relative tolerance.",
+    )
+    abs_tol_time: Optional[float] = Field(
+        default=1e-4,
+        description="It specifies the absolute tolerance.",
+    )
+    norm_type: Optional[Literal["L1Norm", "MeanL1Norm", "L2Norm", "MeanL2Norm", "LinfNorm"]] = Field(
+        default='LinfNorm',
+        description="It specifies the type of norm to be calculated for convergence assessment.",
+    )
 
-# class MultipoleSolveTransientElectromagnetics(BaseModel):
-#     """
-#     Level 4: Class for FiQuS Multipole
-#     """
-#     time_stepping: Optional[Literal["adaptive", "fixed"]] = Field(
-#         default="adaptive",
-#         description="It specifies the type of time stepping.",
-#     )
-#     initial_time: Optional[float] = Field(
-#         default=0.,
-#         description="It specifies the initial time of the simulation.",
-#     )
-#     final_time: Optional[float] = Field(
-#         default=None,
-#         description="It specifies the final time of the simulation.",
-#     )
-#     fixed: MultipoleSolveTimeParametersFixed = Field(
-#         default=MultipoleSolveTimeParametersFixed(),
-#         description="This dictionary contains the information about the time parameters of the fixed time stepping.",
-#     )
-#     adaptive: MultipoleSolveTimeParametersAdaptive = Field(
-#         default=MultipoleSolveTimeParametersAdaptive(),
-#         description="This dictionary contains the information about the time parameters of the adaptive time stepping.",
-#     )
+class MultipoleSolveTransientElectromagnetics(MultipoleSolveTransient_parent):
+    """
+    Level 4: Class for FiQuS Multipole
+    """
+    T_sim: Optional[float] = Field(
+        default=1.9,
+        description="It specifies the temperature used to calculate the resistivity of the superconductor during the transient sim.",
+    )
 
+class MultipleSolveCollarHeCooling(BaseModel):
+    enabled: Optional[bool] = Field(
+        default=False,
+        description="It determines whether the helium cooling is enabled or not (adiabatic conditions).",
+    )
+    which: Optional[Union[Literal['all'], List]] = Field(
+        default='all',
+        description="It specifies the boundaries where the collar cooling is applied. If 'all', it applies to all boundaries. If a list, it applies to the specified boundaries numbered counter-clockwise."
+    )
+    heat_transfer_coefficient: Optional[Union[float, str]] = Field(
+        default= 'CFUN_hHe_T_THe',
+        description="It specifies the value or name of the function of the constant heat transfer coefficient.",
+    )
+    ref_temperature: Optional[float] = Field(
+        default = 0.0,
+        description="It specifies the reference temperature for the collar cooling. If not specified, it takes the value of the initial temperature.",
+    )
+    move_cooling_holes: Optional[Union[str, int, List[List[float]]]] = Field(
+        default=None,
+        description= "It specifies if and how cooling holes are to be moved. Either choose '1' or '2' for predefined positions or a list [[dx,dy], [dx2,dy2]].. to shift each hole manually"
+    )
 
 class MultipoleSolveHeCooling(BaseModel):
     """
@@ -149,6 +201,7 @@ class MultipoleSolveHeCooling(BaseModel):
         description="It specifies the value or name of the function of the constant heat transfer coefficient.",
     )
 
+
 class MultipoleSolveNonLinearSolver(BaseModel):
     """
     Level 4: Class for FiQuS Multipole
@@ -173,36 +226,6 @@ class MultipoleSolveNonLinearSolver(BaseModel):
         default='LinfNorm',
         description="It specifies the type of norm to be calculated for convergence assessment.",
     )
-
-
-class MultipoleSolveTransientThermal(BaseModel):
-    """
-    Level 4: Class for FiQuS Multipole
-    """
-    initial_time: Optional[float] = Field(
-        default=0.,
-        description="It specifies the initial time of the simulation.",
-    )
-    final_time: Optional[float] = Field(
-        default=None,
-        description="It specifies the final time of the simulation.",
-    )
-    initial_time_step: Optional[float] = Field(
-        default=1E-10,
-        description="It specifies the initial time step used at the beginning of the transient simulation.",
-    )
-    min_time_step: Optional[float] = Field(
-        default=1E-12,
-        description="It specifies the minimum possible value of the time step.",
-    )
-    max_time_step: Optional[float] = Field(
-        default=10,
-        description="It specifies the maximum possible value of the time step.",
-    )
-    breakpoints: Optional[List[float]] = Field(
-        default=[],
-        description="It forces the transient simulation to hit the time instants contained in this list.",
-    )
     integration_method: Union[None, Literal[
        "Euler", "Gear_2", "Gear_3", "Gear_4", "Gear_5", "Gear_6"
     ]] = Field(
@@ -210,23 +233,40 @@ class MultipoleSolveTransientThermal(BaseModel):
         title="Integration Method",
         description="It specifies the type of integration method to be used.",
     )
-    rel_tol_time: Optional[float] = Field(
-        default=1E-4,
+
+class MultipoleSolveTransientThermal(MultipoleSolveTransient_parent):
+    """
+    Level 4: Class for FiQuS Multipole
+    """
+    stop_temperature: Optional[float] = Field(
+        default=300,
+        description="If one half turn reaches this temperature, the simulation is stopped.",
+    )
+
+class MultipoleSolveTransientCoupled(MultipoleSolveTransient_parent):
+    """
+    Level 4: Class for FiQuS Multipole
+    """
+    rel_tol_time: Optional[List[float]] = Field(
+        default=[1E-4,1E-4],
         description="It specifies the relative tolerance.",
     )
-    abs_tol_time: Optional[float] = Field(
-        default=1e-4,
+    abs_tol_time: Optional[List[float]] = Field(
+        default=[1e-4,1e-4],
         description="It specifies the absolute tolerance.",
     )
-    norm_type: Literal["L1Norm", "MeanL1Norm", "L2Norm", "MeanL2Norm", "LinfNorm"] = Field(
-        default='LinfNorm',
+    norm_type: List[Literal["L1Norm", "MeanL1Norm", "L2Norm", "MeanL2Norm", "LinfNorm"]] = Field(
+        default=['LinfNorm','LinfNorm'],
         description="It specifies the type of norm to be calculated for convergence assessment.",
     )
     stop_temperature: Optional[float] = Field(
         default=300,
         description="If one half turn reaches this temperature, the simulation is stopped.",
     )
-
+    seq_NL: Optional[bool] = Field(
+    default=True,
+    description="The non-linear solver is sequential Mag->Thermal, or its fully coupled.",
+    )
 
 class MultipoleSolveInsulationBlockToBlock(BaseModel):
     """
@@ -273,25 +313,38 @@ class MultipoleSolveInsulationExterior(BaseModel):
         description="It specifies the list of thicknesses of the specified insulation layers. The order must match the one of the materials list.",
     )
 
-
-class MultipoleSolveWedge(BaseModel):
+class MultipoleSolveSpecificMaterial(BaseModel):
     """
     Level 3: Class for FiQuS Multipole
     """
     material: Optional[str] = Field(
         default=None,
-        description="It specifies the material of the wedge regions.",
+        description="It specifies the material of the region.",
     )
     RRR: Optional[float] = Field(
         default=None,
-        description="It specifies the RRR of the wedge regions.",
+        description="It specifies the RRR of the region.",
     )
     T_ref_RRR_high: Optional[float] = Field(
         default=None,
         description="It specifies the reference temperature associated with the RRR.",
     )
+    transient_effects_enabled: Optional[bool] = Field(
+        default=False,
+        description="It determines whether the transient effects are enabled or not.",
+    )
+    # rel_magnetic_permeability: Optional[float] = Field(
+    #     default = 1.0,
+    #     description = 'It specifies the material relative magnetic permeability against vacuum for EM calculations'
+    # )
 
 
+class MultipoleSolveInsulationCollar(BaseModel):
+    material: Optional[str] = Field(
+        default=None,
+        description="It specifies the default material of the insulation regions between collar and outer insulation.",
+    )
+
 class MultipoleSolveInsulationTSA(BaseModel):
     """
     Level 3: Class for FiQuS Multipole
@@ -304,9 +357,22 @@ class MultipoleSolveInsulationTSA(BaseModel):
         default=MultipoleSolveInsulationExterior(),
         description="This dictionary contains the information about the materials and thicknesses of the outer insulation regions (exterior boundaries) modeled via thin-shell approximation.",
     )
+    between_collar: Optional[MultipoleSolveInsulationBlockToBlock] = Field(
+        default=MultipoleSolveInsulationCollar(),
+        description="This dictionary contains the information about the materials and thicknesses of the insulation regions between the collar and the outer insulation regions for thin-shell approximation.",
+    )
+
+class MultipoleSolve_parent(BaseModel):
+    """
+    Level 3: Class for FiQuS Multipole
+    """
+    non_linear_solver: MultipoleSolveNonLinearSolver = Field(
+        default=MultipoleSolveNonLinearSolver(),
+        description="This dictionary contains the information about the parameters for the non-linear solver.",
+    )
 
 
-class MultipoleSolveThermal(BaseModel):
+class MultipoleSolveThermal(MultipoleSolve_parent):
     """
     Level 3: Class for FiQuS Multipole
     """
@@ -322,14 +388,14 @@ class MultipoleSolveThermal(BaseModel):
         default=MultipoleSolveHeCooling(),
         description="This dictionary contains the information about the Robin boundary condition for generic groups of boundaries.",
     )
+    collar_cooling: MultipleSolveCollarHeCooling = Field(
+        default=MultipleSolveCollarHeCooling(),
+        description="This dictionary contains the information about the cooling for the collar region.",
+    )
     overwrite_boundary_conditions: Optional[MultipoleSolveBoundaryConditionsThermal] = Field(
         default=MultipoleSolveBoundaryConditionsThermal(),
         description="This dictionary contains the information about boundary conditions for explicitly specified boundaries.",
     )
-    non_linear_solver: MultipoleSolveNonLinearSolver = Field(
-        default=MultipoleSolveNonLinearSolver(),
-        description="This dictionary contains the information about the parameters for the non-linear solver.",
-    )
     time_stepping: MultipoleSolveTransientThermal = Field(
         default=MultipoleSolveTransientThermal(),
         description="This dictionary contains the information about the parameters for the transient solver.",
@@ -347,24 +413,18 @@ class MultipoleSolveThermal(BaseModel):
         description="It determines whether the initial temperature is enforced as the minimum temperature of the simulation.",
     )
 
-class MultipoleSolveElectromagnetics(BaseModel):
+class MultipoleSolveElectromagnetics(MultipoleSolve_parent):
     """
     Level 3: Class for FiQuS Multipole
     """
-    solve_type: Optional[Literal[None, "stationary"]] = Field(
+    solve_type: Optional[Literal[None, "stationary","transient"]] = Field(
         default=None,
         description="It determines whether the magneto-static problem is solved ('stationary') or not ('null').",
     )
-
-    non_linear_solver: MultipoleSolveNonLinearSolver = Field(
-        default=MultipoleSolveNonLinearSolver(),
-        description="This dictionary contains the information about the parameters for the non-linear solver.",
+    time_stepping: Optional[MultipoleSolveTransientElectromagnetics] = Field(
+        default=MultipoleSolveTransientElectromagnetics(),
+        description="This dictionary contains the information about the parameters for the transient solver.",
     )
-    # currently not needed since stationary only, we will be able to reuse it from the thermal solver
-    # time_stepping_parameters: MultipoleSolveTransientElectromagnetics = Field(
-    #     default=MultipoleSolveTransientElectromagnetics(),
-    #     description="This dictionary contains the information about the parameters for the transient solver.",
-    # )
 
 
 class MultipoleMeshThinShellApproximationParameters(BaseModel):
@@ -383,7 +443,22 @@ class MultipoleMeshThinShellApproximationParameters(BaseModel):
         default=1,
         description="It specifies the number of minimum spacial discretizations across a thin-shell.",
     )
-
+    global_size_COL: Optional[float] = Field(
+        default=1e-4,
+        description="The thickness of the region between ht and collar is divided by this parameter to determine the number of spacial discretizations across the thin-shell.",
+    )
+    minimum_discretizations_COL: Optional[int] = Field(
+        default=1,
+        description="It specifies the number of minimum spacial discretizations across a thin-shell.",
+    )
+    scale_factor_radial: Optional[float] = Field(
+        default=-1.0,
+        description="Scaling factor for radially directed thin-shells (e.g. halfturns to collar). Set to -1.0 to use default scaling. Wedge scalings are always ignored.",
+    )
+    scale_factor_azimuthal: Optional[float] = Field(
+        default=-1.0,
+        description="Scaling factor for azimuthally directed thin-shells (e.g. halfturns to pole). Set to -1.0 to use default scaling. Wedge scalings are always ignored.",
+    )
 
 class MultipoleMeshThreshold(BaseModel):
     """
@@ -410,6 +485,15 @@ class MultipoleMeshThreshold(BaseModel):
         description="It sets gmsh Mesh.MeshDistMax.",
     )
 
+class MultipoleMeshThresholdCollar(MultipoleMeshThreshold):
+    """
+    Level 3: Class for FiQuS Multipole
+    """
+    Enforce_TSA_mapping: Optional[bool] = Field(
+        default=False,
+        description="Enfocres matching nodes for the TSA layer. Uses SizeMin to determine the size of the nodes.", # only for the collar layer
+    )
+
 class MultipoleMeshTransfinite(BaseModel):
     """
     Level 3: Class for FiQuS Multipole
@@ -439,7 +523,7 @@ class MultipoleMeshTransfiniteOrField(BaseModel):
         description="This dictionary contains the gmsh Field information.",
     )
 
-class MultipolePostProcThermal(BaseModel):
+class MultipolePostProc_parent(BaseModel):
     """
     Level 2: Class for FiQuS Multipole
     """
@@ -459,15 +543,21 @@ class MultipolePostProcThermal(BaseModel):
         default=False,
         description="It determines whether the solution for the .txt file is saved at the end of the simulation or during run time.",
     )
-    take_average_conductor_temperature: Optional[bool] = Field(
-        default=True,
-        description="It determines whether the output files are based on the average conductor temperature or not (map2d).",
-    )
+
     plot_all: Optional[Union[bool, None]] = Field(
         default=False,
         description="It determines whether the figures are generated and shown (true), generated only (null), or not generated (false). Useful for tests.",
     )
-    variables: Optional[List[Literal["T", "jOverJc", "rho"]]] = Field(
+
+class MultipolePostProcThermal(MultipolePostProc_parent):
+    """
+    Level 2: Class for FiQuS Multipole
+    """
+    take_average_conductor_temperature: Optional[bool] = Field(
+        default=True,
+        description="It determines whether the output files are based on the average conductor temperature or not (map2d).",
+    )
+    variables: Optional[List[Literal["T", "jOverJc", "rho", "az_thermal", "ac_loss"]]] = Field(
         default=["T"],
         description="It specifies the physical quantity to be output.",
     )
@@ -478,44 +568,46 @@ class MultipolePostProcThermal(BaseModel):
     )
 
 
-class MultipolePostProcElectromagnetics(BaseModel):
+class MultipolePostProcElectromagnetics(MultipolePostProc_parent):
     """
     Level 2: Class for FiQuS Multipole
     """
-    output_time_steps_pos: Optional[Union[bool, int]] = Field(
-        default=True,
-        description="It determines whether the solution for the .pos file is saved for all time steps (True), none (False), or equidistant time steps (int).",
-    )
-    output_time_steps_txt: Optional[Union[bool, int]] = Field(
-        default=True,
-        description="It determines whether the solution for the .txt file is saved for all time steps (True), none (False), or equidistant time steps (int).",
-    )
-    save_pos_at_the_end: Optional[bool] = Field(
-        default=True,
-        description="It determines whether the solution for the .pos file is saved at the end of the simulation or during run time.",
-    )
-    save_txt_at_the_end: Optional[bool] = Field(
-        default=False,
-        description="It determines whether the solution for the .txt file is saved at the end of the simulation or during run time.",
-    )
     compare_to_ROXIE: Optional[str] = Field(
         default=None,
         description="It contains the absolute path to a reference ROXIE map2d file. If provided, comparative plots with respect to the reference are generated.",
     )
-    plot_all: Optional[Union[bool, None]] = Field(
-        default=False,
-        description="It determines whether the figures are generated and shown (true), generated only (null), or not generated (false). Useful for tests.",
-    )
-    variables: Optional[List[Literal["a", "az", "b", "h", "js"]]] = Field(
-        default=["b"],
+    variables: Optional[List[Literal["a", "az", "b", "h", "js","jOverJc", "sigma_collar","is"]]] = Field(
+        default=[],
         description="It specifies the physical quantity to be output.",
     )
     volumes: Optional[List[
         Literal["omega", "powered", "induced", "air", "air_far_field", "iron", "conducting", "insulator"]]] = Field(
-        default=["powered"],
+        default=[],
         description="It specifies the regions associated with the physical quantity to be output.",
     )
 
+class CCPostProc(BaseModel):
+    variables_I: Optional[List[Literal["I_PC","I_1","I_2","I_cpc","I_crowbar","I_3","I_c_r","I_EE","I_c","I_s","I_C",
+                                       "I_EE_n","I_c_n","I_s_n","I_QH","I_EQ","I_ESC",
+                                       "I_A","I_B","I_C",
+                                       "I_EQ",
+                                       "I_ESC","I_ESC_Diode","I_ESC_C"]]] = Field(
+        default=[],
+        description="Currents from the circuit that will be exported as csv",
+    )
+    variables_U: Optional[List[Literal["PS_currentsource","PS_R_1","PS_L_1","PS_C","PS_R_3","PS_L_3","PS_R_2","PS_L_2","PS_R_crowbar","PS_Ud_crowbar","PS_L_crowbar","PS_R_c_r","PS_Ud_c_r","PS_L_c_r",
+                                          "circ_R_circuit",
+                                          "EE_L","EE_V_EE","EE_Ud_snubber","EE_C","EE_R_c","EE_L_c","EE_Ud_switch","EE_R_s","EE_L_s","EE_L_n","EE_V_EE_n","EE_Ud_snubber_n","EE_C_n","EE_R_c_n","EE_L_c_n","EE_Ud_switch_n","EE_R_s_n","EE_L_s_n","EE_R_switch","EE_R_switch_n",
+                                          "CLIQ_R","CLIQ_L","CLIQ_C",
+                                          "ECLIQ_currentsource","ECLIQ_L_leads","ECLIQ_R_leads",
+                                          "ESC_C1","ESC_C2","ESC_R_leads","ESC_R_unit","ESC_L","ESC_L_Diode","ESC_Ud_Diode"]]] = Field(
+        default=[],
+        description="Voltages from the circuit that will be exported as csv",
+    )
+    assemble_veusz: Optional[bool] = Field(
+        default=False,
+        description="It determines whether the post-processing data is assembled in a veusz file.",
+    )
 
 class MultipolePostProc(BaseModel):
     """
@@ -529,12 +621,111 @@ class MultipolePostProc(BaseModel):
         default=MultipolePostProcThermal(),
         description="This dictionary contains the post-processing information for the thermal solution.",
     )
+    circuit_coupling: CCPostProc = Field(
+        default= CCPostProc(),
+        description="This dictionary contains the post-processing information for the circuit variables calculated in the solution.",
+    )
+
+class MultipoleSolveCoilWindingsElectricalOrder(BaseModel):
+    """
+    Level 2: Class for the order of the electrical pairs
+    """
+    group_together: Optional[List[List[int]]] = []  # elPairs_GroupTogether
+    reversed: Optional[List[int]] = []  # elPairs_RevElOrder
+    overwrite_electrical_order: Optional[List[int]] = []
+
+class MultipoleSolveCoilWindings(BaseModel):
+    """
+        Level 1: Class for winding information
+    """
+    conductor_to_group: Optional[List[int]] = []  # This key assigns to each group a conductor of one of the types defined with Conductor.name
+    group_to_coil_section: Optional[List[int]] = []  # This key assigns groups of half-turns to coil sections
+    polarities_in_group: Optional[List[int]] = []  # This key assigns the polarity of the current in each group #
+    half_turn_length: Optional[List[float]] = []
+    electrical_pairs: Optional[MultipoleSolveCoilWindingsElectricalOrder] = MultipoleSolveCoilWindingsElectricalOrder()  # Variables used to calculate half-turn electrical order
+    # Homogenized Multipole
+class HomogenizedConductorFormulationparametersROHM(BaseModel):
+    """
+    Level 4: Class for finite element formulation parameters
+    """
+    enabled: Optional[bool] = Field(
+        default=False,
+        description='Use ROHM to homogenize the magnetization hysteresis in the cables.'
+    )
+    parameter_csv_file: Optional[str] = Field(
+        default=None,
+        description='Name of the csv file containing the ROHM parameters within the inputs folder with expected row structure: [alpha,kappa,chi,gamma,lambda].'
+    )
+    gather_cell_systems: Optional[bool] = Field(
+        default = False,
+        description = 'when true, it generates a single system to solve the ROHM cells instead of one system per cell to decrease generation time.'
+    )
+    weight_scaling: Optional[float] = Field(
+        default=1.0,
+        description='Downscaling factor (s<1.0) which is applied to all weights except the first, which is scaled up to compensate.'
+    )
+    tau_scaling: Optional[float] = Field(
+        default=1.0,
+        description='Scaling factor which is applied uniformly to all coupling time constants.'
+    )
 
+class HomogenizedConductorFormulationparametersROHF(BaseModel):
+    """
+    Level 4: Class for finite element formulation parameters
+    """
+    enabled: Optional[bool] = Field(
+        default=False,
+        description='Use ROHF to homogenize the internal flux hysteresis in the cables.'
+    )
+    parameter_csv_file: Optional[str] = Field(
+        default=None,
+        description='Name of the csv file containing the ROHF parameters within the inputs folder with expected row structure: [alpha,kappa,tau].'
+    )
+    gather_cell_systems: Optional[bool] = Field(
+        default = False,
+        description = 'when true, it generates a single system to solve the ROHF cells instead of one system per cell to decrease generation time.'
+    )
+class HomogenizedConductorRunType(BaseModel):
+    """
+    Level 4: Class for runtype parameters
+    """
+    mode: Optional[Literal["ramp","isothermal_ramp","quench"]] = Field(
+        default="ramp",
+        description= "Type of simulation to run with homogenized conductors (ramp - real cooling conditions, isothermal_ramp - unlimited cooling, quench - non-zero initial conditions)"
+    )
+    ramp_file: Optional[str] = Field(
+        default=None,
+        description='Name of the ramp model from which to start the simulation'
+    )
+class HomogenizedConductor(BaseModel):
+    """
+    Level 3: Class for FiQuS Multipole
+    """
+    enabled: Optional[bool] = Field(
+        default=False,
+        description="It determines whether the homogenized conductor model is enabled or not."
+    )
+    run_type: HomogenizedConductorRunType = Field(
+        default=HomogenizedConductorRunType(),
+        description= "Type of simulation to run with homogenized conductors (ramp - real cooling conditions, isothermal_ramp - unlimited cooling, quench - non-zero initial conditions)"
+    )
+    rohm: HomogenizedConductorFormulationparametersROHM = Field(
+        default=HomogenizedConductorFormulationparametersROHM(),
+        description="This dictionary contains the information about the parameters for the ROHM model.",
+    )
+    rohf: HomogenizedConductorFormulationparametersROHF = Field(
+        default=HomogenizedConductorFormulationparametersROHF(),
+        description="This dictionary contains the information about the parameters for the ROHF model.",
+    )
 
 class MultipoleSolve(BaseModel):
     """
     Level 2: Class for FiQuS Multipole
     """
+    coil_windings: Optional[MultipoleSolveCoilWindings] = Field(
+        default=MultipoleSolveCoilWindings(),
+        description="This dictionary contains the information pertaining the number of coils and electrical order necessary to generate the associated electrical circuit"
+        )
     electromagnetics: MultipoleSolveElectromagnetics = Field(
         default=MultipoleSolveElectromagnetics(),
         description="This dictionary contains the solver information for the electromagnetic solution.",
@@ -543,10 +734,22 @@ class MultipoleSolve(BaseModel):
         default=MultipoleSolveThermal(),
         description="This dictionary contains the solver information for the thermal solution.",
     )
-    wedges: MultipoleSolveWedge = Field(
-        default=MultipoleSolveWedge(),
+    wedges: MultipoleSolveSpecificMaterial = Field(
+        default=MultipoleSolveSpecificMaterial(),
         description="This dictionary contains the material information of wedges.",
     )
+    collar: MultipoleSolveSpecificMaterial = Field(
+        default=MultipoleSolveSpecificMaterial(),
+        description="This dictionary contains the material information of the collar region.",
+    )
+    iron_yoke: MultipoleSolveSpecificMaterial = Field(
+        default=MultipoleSolveSpecificMaterial(),
+        description="This dictionary contains the material information of the iron yoke region.",
+    )
+    poles: MultipoleSolveSpecificMaterial = Field(
+        default=MultipoleSolveSpecificMaterial(),
+        description="This dictionary contains the material information of the pole region.",
+    )
     noOfMPITasks: Optional[Union[bool, int]] = Field(
         default=False,
         title="No. of tasks for MPI parallel run of GetDP",
@@ -556,6 +759,14 @@ class MultipoleSolve(BaseModel):
             " If False, GetDP will be run in serial without invoking mpiexec."
         ),
     )
+    time_stepping: Optional[MultipoleSolveTransientCoupled] = Field(
+        default=MultipoleSolveTransientCoupled(),
+        description="This dictionary contains the information about the parameters for the transient solver.",
+    )
+    cable_homogenization: Optional[HomogenizedConductor]= Field(
+        default=HomogenizedConductor(),
+        description="This dictionary contains the information about the homogenized conductor properties.",
+    )
 
 class MultipoleThermalInsulationMesh(BaseModel):
     """
@@ -569,14 +780,14 @@ class MultipoleThermalInsulationMesh(BaseModel):
         default=MultipoleMeshThinShellApproximationParameters(),
         description="This dictionary contains the mesh information for thin-shells.",
     )
-    
-class MultipoleMeshThermal(BaseModel):
+
+class MultipoleMesh_parent(BaseModel):
     """
     Level 2: Class for FiQuS Multipole
     """
     create: bool = Field(
         default=True,
-        description="It determines whether the thermal mesh is built or not.",
+        description="It determines whether the mesh is built or not.",
     )
     conductors: Optional[MultipoleMeshTransfiniteOrField] = Field(
         default=MultipoleMeshTransfiniteOrField(),
@@ -590,16 +801,27 @@ class MultipoleMeshThermal(BaseModel):
         default=MultipoleMeshThreshold(),
         description="This dictionary contains the gmsh Field information for the iron yoke region.",
     )
-    insulation: Optional[MultipoleThermalInsulationMesh] = Field(
-        default=MultipoleThermalInsulationMesh(),
-        description="This dictionary contains the mesh information for the insulation regions.",
+    collar: Optional[MultipoleMeshThresholdCollar] = Field(
+        default=MultipoleMeshThresholdCollar(),
+        description="This dictionary contains the gmsh Field information for the collar region.",
     )
-   
-    iron_field: Optional[MultipoleMeshThreshold] = Field(
+    poles: Optional[MultipoleMeshThreshold] = Field(
         default=MultipoleMeshThreshold(),
-        description="This dictionary contains the gmsh Field information for the iron yoke region.",
+        description="This dictionary contains the mesh information for the poles region.",
     )
 
+class MultipoleMeshThermal(MultipoleMesh_parent):
+    """
+    Level 2: Class for FiQuS Multipole
+    """
+    reference: Optional[MultipoleMeshThreshold] = Field(
+        default=MultipoleMeshThreshold(),
+        description="It determines whether the reference mesh is built or not. If True, an additional layer between the insulation and collar is meshed",
+    )
+    insulation: Optional[MultipoleThermalInsulationMesh] = Field(
+        default=MultipoleThermalInsulationMesh(),
+        description="This dictionary contains the mesh information for the insulation regions.",
+    )
     isothermal_conductors: Optional[bool] = Field(
         default=False,
         description="It determines whether the conductors are considered isothermal or not using getDP constraints.",
@@ -609,26 +831,10 @@ class MultipoleMeshThermal(BaseModel):
         description="It determines whether the wedges are considered isothermal or not using getDP Link constraints.",
     )
 
-class MultipoleMeshElectromagnetics(BaseModel):
+class MultipoleMeshElectromagnetics(MultipoleMesh_parent):
     """
     Level 2: Class for FiQuS Multipole
     """
-    create: bool = Field(
-        default=True,
-        description="It determines whether the electromagnetic mesh is built or not.",
-    )
-    conductors: Optional[MultipoleMeshTransfiniteOrField] = Field(
-        default=MultipoleMeshTransfiniteOrField(),
-        description="This dictionary contains the mesh information for the conductor regions.",
-    )
-    wedges: Optional[MultipoleMeshTransfiniteOrField] = Field(
-        default=MultipoleMeshTransfiniteOrField(),
-        description="This dictionary contains the mesh information for the wedge regions.",
-    )
-    iron_field: Optional[MultipoleMeshThreshold] = Field(
-        default=MultipoleMeshThreshold(),
-        description="This dictionary contains the gmsh Field information for the iron yoke region.",
-    )
     bore_field: Optional[MultipoleMeshThreshold] = Field(
         default=MultipoleMeshThreshold(),
         description="This dictionary contains the gmsh Field information for the bore region.",
@@ -647,23 +853,24 @@ class MultipoleMesh(BaseModel):
         description="This dictionary contains the mesh information for the thermal solution.",
     )
 
-
-class MultipoleGeometryThermal(BaseModel):
-    """
-    Level 2: Class for FiQuS Multipole
-    """
+class MultipoleGeometry_parent(BaseModel):
     create: bool = Field(
         default=True,
-        description="It determines whether the thermal geometry is built or not.",
-    )
-    with_iron_yoke: Optional[bool] = Field(
-        default=False,
-        description="It determines whether the iron yoke region is built or not.",
+        description="It determines whether the geometry is built or not.",
     )
     with_wedges: Optional[bool] = Field(
         default=True,
         description="It determines whether the wedge regions are built or not.",
     )
+    areas: Optional[List[Literal["iron_yoke", "collar", "poles"]]] = Field(
+        default= [],
+        description="List with areas to build."
+    )
+
+class MultipoleGeometryThermal(MultipoleGeometry_parent):
+    """
+    Level 2: Class for FiQuS Multipole
+    """
     use_TSA: Optional[bool] = Field(
         default=False,
         description="It determines whether the insulation regions are explicitly built or modeled via thin-shell approximation.",
@@ -672,29 +879,20 @@ class MultipoleGeometryThermal(BaseModel):
         default=False,
         description="There is a bug in the TSA naming scheme for block coils, this flag activates a simple (not clean) bug fix that will be replaced in a future version.",
     )
+    use_TSA_new: Optional[bool] = Field(
+        default=False,
+        description="It determines whether the regions between collar and coils are modeled via thin-shell approximation.",
+    )
 
-class MultipoleGeometryElectromagnetics(BaseModel):
+class MultipoleGeometryElectromagnetics(MultipoleGeometry_parent):
     """
     Level 2: Class for FiQuS Multipole
     """
-    create: bool = Field(
-        default=True,
-        description="It determines whether the electromagnetic geometry is built or not.",
-    )
-    with_iron_yoke: Optional[bool] = Field(
-        default=True,
-        description="It determines whether the iron yoke region is built or not.",
-    )
-    with_wedges: Optional[bool] = Field(
-        default=True,
-        description="It determines whether the wedge regions are built or not.",
-    )
     symmetry: Optional[Literal["none", "xy", "x", "y"]] = Field(
         default='none',
         description="It determines the model regions to build according to the specified axis/axes.",
     )
 
-
 class MultipoleGeometry(BaseModel):
     """
     Level 2: Class for FiQuS Multipole
@@ -737,4 +935,4 @@ class Multipole(BaseModel):
     postproc: MultipolePostProc = Field(
         default=MultipolePostProc(),
         description="This dictionary contains the post-process information.",
-    )
+    )