fiqus 2024.12.2__py3-none-any.whl → 2025.1.0__py3-none-any.whl

fiqus/data/DataFiQuSPancake3D.py

@@ -2375,7 +2375,7 @@ class Pancake3DSolveLocalDefects(BaseModel):
 
 class Pancake3DSolveConvectiveCooling(BaseModel):
 
-    heatTransferCoefficient: Optional[NonNegativeFloat] = Field(
+    heatTransferCoefficient: Optional[Union[NonNegativeFloat, Literal["nitrogenBath"]]] = Field(
         default=0,
         title="Heat Transfer Coefficient",
         description=(
@@ -3283,6 +3283,17 @@ class Pancake3DSolve(BaseModel):
         ),
     )
 
+    solveHeatEquationTerminalsTransitionNotch: bool = Field(
+        default=True,
+        title="Solve Heat Equation in Terminals",
+        description=(
+            "If True, the heat equation is solved in the terminals and transition notch."
+            "If False, the heat equation is not solved in the terminals and transition notches."
+            "In the latter case, neither heat conduction nor generation are considered."
+            "In other words, the temperature is not an unknown of the problem in the terminals."
+        ),
+    )
+
     heatFlowBetweenTurns: bool = Field(
         default=True,
         title="Heat Equation Between Turns",

fiqus/getdp_runners/RunGetdpPancake3D.py

@@ -161,8 +161,8 @@ class Solve(Base):
             posStringList = ["-pos"]
             if solve is False:
                 # Quantities to be saved:
-                if self.dm.magnet.solve.save is not None:
-                    for quantity in self.dm.magnet.solve.save:
+                if self.dm.magnet.solve.quantitiesToBeSaved is not None:
+                    for quantity in self.dm.magnet.solve.quantitiesToBeSaved:
                         posStringList.append(f"{quantity.getdpPostOperationName}")
 
                 if self.dm.magnet.postproc is not None:

fiqus/pro_templates/combined/Pancake3D_template.pro

@@ -625,6 +625,32 @@ Integral {
 {% endif %}
 
 {% if dm.magnet.solve.convectiveCooling.heatTransferCoefficient %}
+    {% if dm.magnet.solve.convectiveCooling.heatTransferCoefficient == "nitrogenBath" %}
+Integral {
+    [ CFUN_hN_Tdiff[{LOCALQUANT_T} - <<dm.magnet.solve.convectiveCooling.exteriorBathTemperature>>] * Dof{LOCALQUANT_T}, {LOCALQUANT_T} ];
+    In DOM_allConvectiveSurface;
+    Jacobian JAC_sur;
+    Integration Int;
+}
+Integral {
+    [ -CFUN_hN_Tdiff[{LOCALQUANT_T} - <<dm.magnet.solve.convectiveCooling.exteriorBathTemperature>>] * <<dm.magnet.solve.convectiveCooling.exteriorBathTemperature>>, {LOCALQUANT_T} ];
+    In DOM_allConvectiveSurface;
+    Jacobian JAC_sur;
+    Integration Int;
+}
+Integral {
+    JacNL [ CFUN_hN_dTdiff_Tdiff[{LOCALQUANT_T} - <<dm.magnet.solve.convectiveCooling.exteriorBathTemperature>>] * Dof{LOCALQUANT_T}, {LOCALQUANT_T} ];
+    In DOM_allConvectiveSurface;
+    Jacobian JAC_sur;
+    Integration Int;
+}
+Integral {
+    JacNL [ -CFUN_hN_dTdiff_Tdiff[{LOCALQUANT_T} - <<dm.magnet.solve.convectiveCooling.exteriorBathTemperature>>] * <<dm.magnet.solve.convectiveCooling.exteriorBathTemperature>>, {LOCALQUANT_T} ];
+    In DOM_allConvectiveSurface;
+    Jacobian JAC_sur;
+    Integration Int;
+}
+    {% else %}
 Integral {
     [ <<dm.magnet.solve.convectiveCooling.heatTransferCoefficient>> * Dof{LOCALQUANT_T}, {LOCALQUANT_T} ];
     In DOM_allConvectiveSurface;
@@ -637,6 +663,7 @@ Integral {
     Jacobian JAC_sur;
     Integration Int;
 }
+    {% endif %}
 {% endif %}
 
 {% elif type == "resistiveHeating" %}
@@ -1411,9 +1438,9 @@ Group{
         {% else %}
     DOM_resistiveHeating = Region[{ DOM_allWindings }];
         {% endif %}
-    DOM_thermal = Region[{ DOM_powered}];
-    {% else %}
-    DOM_thermal = Region[{ DOM_powered, DOM_allInsulations}];
+    DOM_thermal = Region[{ {% if dm.magnet.solve.solveHeatEquationTerminalsTransitionNotch %}DOM_powered{% else %}DOM_allWindings{% endif %}}];
+        {% else %}
+    DOM_thermal = Region[{ {% if dm.magnet.solve.solveHeatEquationTerminalsTransitionNotch %}DOM_powered, DOM_allInsulations{% else %}DOM_allWindings, DOM_allInsulations{% endif %}}];
     DOM_allConducting = Region[{ DOM_powered, DOM_terminalContactLayer}];
         {% if dm.magnet.solve.resistiveHeatingTerminals %}
     DOM_resistiveHeating = Region[{ DOM_allWindings, DOM_terminals, DOM_terminalContactLayer }];
@@ -1423,7 +1450,7 @@ Group{
     {% endif %}
 {% else %}
     {% if  dm.magnet.geometry.contactLayer.thinShellApproximation %}
-    DOM_thermal = Region[{ DOM_powered}];
+    DOM_thermal = Region[{ {% if dm.magnet.solve.solveHeatEquationTerminalsTransitionNotch %}DOM_powered{% else %}DOM_allWindings{% endif %}}];
     DOM_allConducting = Region[{ DOM_powered }];
         {% if dm.magnet.solve.resistiveHeatingTerminals %}
     DOM_resistiveHeating = Region[{ DOM_allWindings, DOM_terminals }];
@@ -1431,7 +1458,7 @@ Group{
     DOM_resistiveHeating = Region[{ DOM_allWindings }];
         {% endif %}
     {% else %}
-    DOM_thermal = Region[{ DOM_powered, DOM_allInsulations}];
+    DOM_thermal = Region[{ {% if dm.magnet.solve.solveHeatEquationTerminalsTransitionNotch %}DOM_powered, DOM_allInsulations{% else %}DOM_allWindings, DOM_allInsulations{% endif %}}];
     DOM_allConducting = Region[{ DOM_powered, DOM_allInsulations }];
         {% if dm.magnet.solve.resistiveHeatingTerminals %}
     DOM_resistiveHeating = Region[{ DOM_allWindings, DOM_terminals }];
@@ -4440,7 +4467,7 @@ PostOperation{
             // Printing in just one domain makes the parsing of the output easier.
             <<POSTOPERATION_printResults(
                 quantity="RESULT_maximumTemperature",
-                onRegion="Region[%d]" % rm.powered['Pancake3D'].vol_in.number,
+                onRegion="Region[%d]" % rm.powered['Pancake3D'].vol.numbers[0],
                 format="TimeTable",
                 name="Maximum temperature [K]",
                 appendToExistingFile=True,

{fiqus-2024.12.2.dist-info → fiqus-2025.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiqus
-Version: 2024.12.2
+Version: 2025.1.0
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team

{fiqus-2024.12.2.dist-info → fiqus-2025.1.0.dist-info}/RECORD

@@ -6,7 +6,7 @@ fiqus/data/DataFiQuSCCT.py,sha256=pXBYgeuAb10H46nB1oRJjz4uZDMzkgCgjotXc8phfHs,71
 fiqus/data/DataFiQuSConductor.py,sha256=sa_enAWP3yW0sJwpfmad173ewIv4eFC8G75UPnKnB5w,2626
 fiqus/data/DataFiQuSConductorAC_Strand.py,sha256=kkzcXLHKFScePjJ9tffAjBDbsV1RoCTVodZ-HBTdiO8,27909
 fiqus/data/DataFiQuSMultipole.py,sha256=_rX9zP-xNTZioVmu4NCaFVWF66ipesp8cSiB0pmKsG4,32377
-fiqus/data/DataFiQuSPancake3D.py,sha256=EI3ilF2rSbosUIWVDHeqJgkHZQ71wSujowl7W5I7RVo,136022
+fiqus/data/DataFiQuSPancake3D.py,sha256=czgDU-h_XBq3OLqFOllr8zLx_MxQoCiWo84DsyOhhbo,136611
 fiqus/data/DataMultipole.py,sha256=RObn5MGoe_Xtk-8mhB1eoil1Jd5DS6BhiLUuNmLbb-E,6793
 fiqus/data/DataRoxieParser.py,sha256=v2F8ytjNnKLrVFizeBELb2dXu-78NH44CDLXO3CAP3I,9157
 fiqus/data/DataSettings.py,sha256=zs5sEYUk4xjeMc_j8gt3PMji7V0yyMYizpXxBKv0aB0,3799
@@ -22,7 +22,7 @@ fiqus/geom_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 fiqus/getdp_runners/RunGetdpCCT.py,sha256=hXRy90LAFMFl52gV6SrEwW5KYyvF3D0fqTFoN0P017U,3043
 fiqus/getdp_runners/RunGetdpConductorAC_Strand.py,sha256=SjaRNxGs7J1RQWVS_zocHF0rtxtD6UcOf28kxWDHKNo,9997
 fiqus/getdp_runners/RunGetdpMultipole.py,sha256=mYinMVQDJx2zAZIypFbl7bybu7h3TKjlExZ5evZpqYU,8200
-fiqus/getdp_runners/RunGetdpPancake3D.py,sha256=Jd8gI054BhEk4kHXs2--8oa3KUD80pcDfA-vYX8y174,10822
+fiqus/getdp_runners/RunGetdpPancake3D.py,sha256=RLQbuYKdrelYgKBFcZ8-lZVSJLQ8gmNI0sXbJlrkYZk,10852
 fiqus/getdp_runners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/mains/MainCCT.py,sha256=XpDPlj5n8B70ksOF6AHaeTXB752kN7CMLktISoXqirA,4422
 fiqus/mains/MainConductorAC_Strand.py,sha256=UsZV7t6hRSkwUMwsoWn2m7x-PuVM6yABqBjgLpC_9Qg,5015
@@ -60,7 +60,7 @@ fiqus/pro_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 fiqus/pro_templates/combined/CCT_template.pro,sha256=6r_fz9bH7AReCfDn33lyu472kjB0rkTma9_r4vBqV0U,13558
 fiqus/pro_templates/combined/ConductorAC_template.pro,sha256=8aZwuRveHY2R0bEvC9Ysz_SISPLU7eNvi5szO_RUEtA,60694
 fiqus/pro_templates/combined/Multipole_template.pro,sha256=ptzdHdNqqavppvXSKBejvOuNAWzOWzTXTjubl1foui4,97027
-fiqus/pro_templates/combined/Pancake3D_template.pro,sha256=hFHr0sjmzL7_kSPCVJ-wAGO94XNx6jlXzCLBLvmsNds,209702
+fiqus/pro_templates/combined/Pancake3D_template.pro,sha256=CAmIVgzygFJSXDozuNeCL8eyId1HnMjVeyQOl-O4Suk,211330
 fiqus/pro_templates/combined/TSA_materials.pro,sha256=Ny_Vqee1oBgb0mt1ESwqOROBh3D9h2KQgz6hFPFAY5Q,10612
 fiqus/pro_templates/combined/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/pro_templates/combined/materials.pro,sha256=D-cBOIMaQyYffIfoR4yRiK69Z6sxHu2QtyjhDIKFiXc,7038
@@ -78,7 +78,7 @@ tests/utils/fiqus_test_classes.py,sha256=i7G0wWA7MNdj-pAnXnGrpnv3KXx9JMDRUbKwFMR
 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=bX3jz6Cux175TVWMpeaMo1SspQAewCSzKsC4ZwRBRR4,4052
-fiqus-2024.12.2.dist-info/METADATA,sha256=B_W4s7p0qL1LAw303x9ahMFLXZxux1vapUAYbJQFTRQ,7773
-fiqus-2024.12.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fiqus-2024.12.2.dist-info/top_level.txt,sha256=oGzSIyoVc1zYg14o67zI3QFwWsJvqNzNT0-te9WbUQc,12
-fiqus-2024.12.2.dist-info/RECORD,,
+fiqus-2025.1.0.dist-info/METADATA,sha256=f0Dwe3dZS7HVqZfQljRzMHrOI9gxnGQdfqv3grmWj9k,7772
+fiqus-2025.1.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fiqus-2025.1.0.dist-info/top_level.txt,sha256=oGzSIyoVc1zYg14o67zI3QFwWsJvqNzNT0-te9WbUQc,12
+fiqus-2025.1.0.dist-info/RECORD,,