fiqus 2024.12.2__tar.gz → 2025.1.0__tar.gz

{fiqus-2024.12.2 → fiqus-2025.1.0}/PKG-INFO

@@ -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 → fiqus-2025.1.0}/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-2024.12.2 → fiqus-2025.1.0}/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-2024.12.2 → fiqus-2025.1.0}/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 → fiqus-2025.1.0}/fiqus.egg-info/PKG-INFO

@@ -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 → fiqus-2025.1.0}/setup.py

@@ -37,7 +37,7 @@ all_requirements = required + docs_require + tests_require + build_require
 
 setup(
     name="fiqus",
-    version="2024.12.2",
+    version="2025.1.0",
     author="STEAM Team",
     author_email="steam-team@cern.ch",
     description="Source code for STEAM FiQuS tool",