fiqus 2024.5.2__py3-none-any.whl → 2024.6.0__py3-none-any.whl

fiqus/pro_templates/combined/Multipole_template.pro

@@ -5,11 +5,11 @@ Group {
   // Physical regions:
   <<rm.air.vol.name>> = Region[ <<rm.air.vol.number>> ];  // Air
   <<rm.air_far_field.vol.names[0]>> = Region[ <<rm.air_far_field.vol.numbers[0]>> ];  // AirInf
-{% for name, number in zip(rm.powered.vol.names, rm.powered.vol.numbers) %}
+{% for name, number in zip(rm.powered['Multipole'].vol.names, rm.powered['Multipole'].vol.numbers) %}
   <<name>> = Region[ <<number>> ];
 {% endfor %}
 
-{% for name, number in zip(rm.induced.vol.names, rm.induced.vol.numbers) %}
+{% for name, number in zip(rm.induced['Multipole'].vol.names, rm.induced['Multipole'].vol.numbers) %}
   <<name>> = Region[ <<number>> ];
 {% endfor %}
 
@@ -21,9 +21,9 @@ Group {
   // Surface_bn0 = Region[ 1101 ];
   <<rm.air_far_field.surf.name>> = Region[ <<rm.air_far_field.surf.number>> ];
 
-  <<nc.omega>><<nc.powered>> = Region[ {<<rm.powered.vol.names|join(', ')>>} ];
+  <<nc.omega>><<nc.powered>> = Region[ {<<rm.powered['Multipole'].vol.names|join(', ')>>} ];
   <<nc.omega>><<nc.iron>> = Region[ {<<rm.iron.vol.names|join(', ')>>} ];
-  <<nc.omega>><<nc.induced>> = Region[ {<<rm.induced.vol.names|join(', ')>>} ];
+  <<nc.omega>><<nc.induced>> = Region[ {<<rm.induced['Multipole'].vol.names|join(', ')>>} ];
   <<nc.omega>><<nc.air_far_field>> = Region[ <<rm.air_far_field.vol.names[0]>> ];
   <<nc.omega>><<nc.conducting>> = Region[ {<<nc.omega>><<nc.powered>>, <<nc.omega>><<nc.iron>>, <<nc.omega>><<nc.induced>>} ];
   <<nc.omega>> = Region[ {<<rm.air.vol.name>>, <<rm.air_far_field.vol.names[0]>>, <<nc.omega>><<nc.powered>>, <<nc.omega>><<nc.iron>>, <<nc.omega>><<nc.induced>>} ];
@@ -52,7 +52,7 @@ Function {
 	//		 Help "Current injected in coil [A]"];
 
   // NbTurns = 1 ; // number of turns in the coil
-{% for name, current in zip(rm.powered.vol.names, rm.powered.vol.currents) %}
+{% for name, current in zip(rm.powered['Multipole'].vol.names, rm.powered['Multipole'].vol.currents) %}
   js_fct[ <<name>> ] = <<current>>/SurfaceArea[];
 {% endfor %}
   //js_fct[ PowPos ] = Current/SurfaceArea[];

fiqus/pro_templates/combined/Pancake3D_template.pro

@@ -302,7 +302,7 @@ Integral {
     // Division by area to compute Watts per meter squared
     // SurfaceArea function does not allow DOM_*** as argument, so we need to use
     // the actual ids
-    [  CFUN_PvsT_cryocooler_SHI_SRDE_418D4[{LOCALQUANT_T}]/SurfaceArea[]{<< rm.powered.surf_in.numbers | join(', ') >>, << rm.powered.surf_out.numbers | join(', ') >> }, {LOCALQUANT_T} ];
+    [  CFUN_P2vsT2_cryocooler_SHI_SRDE_418D4_T[{LOCALQUANT_T}]/SurfaceArea[]{<< rm.powered['Pancake3D'].surf_in.numbers | join(', ') >>, << rm.powered['Pancake3D'].surf_out.numbers | join(', ') >> }, {LOCALQUANT_T} ];
     In Region[{DOM_bottomTerminalSurface, DOM_topTerminalSurface}];
     Jacobian JAC_sur;
     Integration Int;
@@ -444,14 +444,19 @@ EndFor
 {# ================================================================================== #}
 {# ================================================================================== #}
 {# ================================================================================== #}
-{% macro RESOLUTION_tolerances(systemNames, systemTolerances, postOperationTolerances, type) %}
+{% macro RESOLUTION_tolerances(systemTolerances, postOperationTolerances, type) %}
+{% set map_quantity_to_system_name = {
+    "coupledSolutionVector": "SYSTEM_stronglyCoupled",
+    "thermalSolutionVector": "SYSTEM_thermal",
+    "electromagneticSolutionVector": "SYSTEM_electromagnetic",
+  }
+%}
 {% for tolerance in systemTolerances %}
     {% if loop.first %}
 System{
     {% endif %}
-    {% for systemName in systemNames %}
     {
-        <<systemName>>,
+        <<map_quantity_to_system_name[tolerance["quantity"]]>>,
         <<tolerance["relative"]>>,
         <<tolerance["absolute"]>>,
         {% if type == "nonlinearSolver" %}
@@ -463,7 +468,6 @@ System{
         // ERROR: wrong type for RESOLUTION_tolerances!
         {% endif %}
     }
-    {% endfor %}
     {% if loop.last %}
 }
     {% endif %}
@@ -500,7 +504,6 @@ IterativeLoopN[
     INPUT_NLSMaxNumOfIter,
     INPUT_NLSRelaxFactor,
     <<RESOLUTION_tolerances(
-        systemNames,
         dm.magnet.solve.nls.systemTolerances,
         dm.magnet.solve.nls.postOperationTolerances,
         type="nonlinearSolver")|indent(4)>>
@@ -581,6 +584,11 @@ SetExtrapolationOrder[INPUT_extrapolationOrder];
 {# ================================================================================== #}
 {# ================================================================================== #}
 {% macro RESOLUTION_SaveSolutions(systemNames, solveAfterThisTimes) %}
+{% for quantity in dm.magnet.postproc.timeSeriesPlots %}
+    {% if quantity.quantity == "maximumTemperature" %}
+        PostOperation[POSTOP_maximumTemperature];
+    {% endif %}
+{% endfor %}
 {% if dm.magnet.solve.save %}
     {% for quantity in dm.magnet.solve.save %}
         {% if quantity.timesToBeSaved %}
@@ -667,7 +675,6 @@ TimeLoopAdaptive[
     "<<dm.magnet.solve.t.adaptive.integrationMethod>>",
     List[INPUT_tAdaptiveBreakPoints],
     <<RESOLUTION_tolerances(
-        systemNames,
         dm.magnet.solve.t.adaptive.systemTolerances,
         dm.magnet.solve.t.adaptive.postOperationTolerances,
         type="timeLoop")|indent(4)>>
@@ -712,7 +719,9 @@ TimeLoopAdaptive[
     format="Default",
     name="None",
     fileName="None",
-    lastTimeStepOnly=False) %}
+    lastTimeStepOnly=False,
+    appendToExistingFile=False,
+    noTitle=False) %}
 Print[
     <<quantity>>,
 {% if onElementsOf != "None" %}
@@ -772,6 +781,12 @@ Print[
 {% if lastTimeStepOnly == True %}
     LastTimeStepOnly 1,
 {% endif %}
+{% if appendToExistingFile == True %}
+    AppendToExistingFile 1,
+{% endif %}
+{% if noTitle == True %}
+    NoTitle,
+{% endif %}
 {% if name != "None" %}
     Name "<<name>>"
 {% elif fileName != "None" %}
@@ -797,8 +812,8 @@ Group{
     DOM_terminalContactLayerSurface_0 = Region[{ <<rm.insulator.surf.numbers[-1]>> }];
 
     {% for i in range(1, NofSets+2) %}
-    DOM_windingMinus_<<i>> = Region[{ <<rm.powered.vol.numbers[:-2][(i-1)%NofSets]>> }];
-    DOM_windingPlus_<<i>> = Region[{ <<rm.powered.vol.numbers[:-2][(i-1+HalfNofSets)%NofSets]>> }];
+    DOM_windingMinus_<<i>> = Region[{ <<rm.powered["Pancake3D"].vol.numbers[:-2][(i-1)%NofSets]>> }];
+    DOM_windingPlus_<<i>> = Region[{ <<rm.powered["Pancake3D"].vol.numbers[:-2][(i-1+HalfNofSets)%NofSets]>> }];
 
     DOM_allInsulationSurface_<<i>> = Region[{ <<rm.insulator.surf.numbers[(2 * (i-1))%(2 * NofSets)]>> }];
     DOM_allInsulationSurface_<<i>> += Region[{ <<rm.insulator.surf.numbers[(2 * (i-1))%(2 * NofSets) + 1]>> }];
@@ -810,18 +825,18 @@ Group{
     {% endfor %}
 
     // Add terminals to winding region logic:
-    // <<rm.powered.vol_in.number>>: inner terminal
-    // <<rm.powered.vol_out.number>>: outer terminal
-    // <<rm.powered.vol.numbers[-2]>>: inner layer transition angle
-    // <<rm.powered.vol.numbers[-1]>>: outer layer transition angle
+    // <<rm.powered["Pancake3D"].vol_in.number>>: inner terminal
+    // <<rm.powered["Pancake3D"].vol_out.number>>: outer terminal
+    // <<rm.powered["Pancake3D"].vol.numbers[-2]>>: inner layer transition angle
+    // <<rm.powered["Pancake3D"].vol.numbers[-1]>>: outer layer transition angle
     {% for i in range(1, NofSets+2) %}
-    DOM_windingMinus_<<i>> += Region[{ <<rm.powered.vol_in.number>> }];
-    DOM_windingMinus_<<i>> += Region[{ <<rm.powered.vol.numbers[-2]>> }];
+    DOM_windingMinus_<<i>> += Region[{ <<rm.powered["Pancake3D"].vol_in.number>> }];
+    DOM_windingMinus_<<i>> += Region[{ <<rm.powered["Pancake3D"].vol.numbers[-2]>> }];
     {% endfor %}
 
     {% for i in range(1, NofSets+1) %}
-    DOM_windingPlus_<<i>> += Region[{ <<rm.powered.vol_out.number>> }];
-    DOM_windingPlus_<<i>> += Region[{ <<rm.powered.vol.numbers[-1]>> }];
+    DOM_windingPlus_<<i>> += Region[{ <<rm.powered["Pancake3D"].vol_out.number>> }];
+    DOM_windingPlus_<<i>> += Region[{ <<rm.powered["Pancake3D"].vol.numbers[-1]>> }];
     {% endfor %}
 
     DOM_allInsulationSurface = Region[{ <<rm.insulator.surf.numbers|join(', ')>> }];
@@ -837,13 +852,13 @@ Group{
 {% endif %}
 
     // create windings region:
-    DOM_allWindings = Region[{ <<rm.powered.vol.numbers[:-2]|join(', ')>> }];
+    DOM_allWindings = Region[{ <<rm.powered["Pancake3D"].vol.numbers[:-2]|join(', ')>> }];
 
     // create terminals region:
-    DOM_terminals = Region[{ <<rm.powered.vol_in.number>>, <<rm.powered.vol_out.number>>}];
+    DOM_terminals = Region[{ <<rm.powered["Pancake3D"].vol_in.number>>, <<rm.powered["Pancake3D"].vol_out.number>>}];
 
     // create layer transition angle region:
-    DOM_transitionNotchVolumes = Region[{<<rm.powered.vol.numbers[-2]>>, <<rm.powered.vol.numbers[-1]>>}];
+    DOM_transitionNotchVolumes = Region[{<<rm.powered["Pancake3D"].vol.numbers[-2]>>, <<rm.powered["Pancake3D"].vol.numbers[-1]>>}];
 
     // create powered region:
     DOM_powered = Region[{ DOM_allWindings, DOM_terminals, DOM_transitionNotchVolumes }];
@@ -899,9 +914,9 @@ Group{
 
     // boundary surface between the all conducting and non-conducting domains:
 {% if dm.magnet.geometry.ii.tsa or dm.magnet.solve.ii.resistivity != "perfectlyInsulating" %}
-    DOM_pancakeBoundary = Region[{ <<rm.powered.surf.numbers[0]>> }];
+    DOM_pancakeBoundary = Region[{ <<rm.powered["Pancake3D"].surf.numbers[0]>> }];
 {% else %}
-    DOM_pancakeBoundary = Region[{ <<rm.powered.surf.numbers[1]>> }];
+    DOM_pancakeBoundary = Region[{ <<rm.powered["Pancake3D"].surf.numbers[1]>> }];
 {% endif %}
 
     // support of magnetic scalar potential, i.e., all non-conducting doms:
@@ -921,9 +936,9 @@ Group{
     DOM_total = Region[{ DOM_allConducting, DOM_Phi }];
 
     // top and bottom surfaces of the terminals for constant temperature BC:
-    DOM_bottomTerminalSurface = Region[{ << rm.powered.surf_in.numbers | join(', ') >> }];
+    DOM_bottomTerminalSurface = Region[{ << rm.powered['Pancake3D'].surf_in.numbers | join(', ') >> }];
 
-    DOM_topTerminalSurface = Region[{ << rm.powered.surf_out.numbers | join(', ') >> }];
+    DOM_topTerminalSurface = Region[{ << rm.powered['Pancake3D'].surf_out.numbers | join(', ') >> }];
 }
 
 //======================================================================================
@@ -1123,7 +1138,8 @@ if (
         "Silver": 2,
         "Indium": 3,
         "StainlessSteel": 4,
-        "HTSSuperPower": 5
+        "HTSSuperPower": 5,
+        "HTSFujikura": 6,
     } %}
     rhoWindingAndDerivative[] = WindingWithSuperConductorRhoAndDerivativeV1[
         $Time,
@@ -1131,7 +1147,9 @@ if (
         $3,
         $2,
         $1
-    ]{
+    ]{  <<dm.magnet.solve.wi.superConductor.IcReferenceTemperature>>,
+        <<dm.magnet.solve.wi.superConductor.IcReferenceBmagnitude>>,
+        <<dm.magnet.solve.wi.superConductor.IcReferenceBangle>>,
         <<numberOfIcValues>>, // N of Ic Values
         {% for lengthValue in listOfLengthValues %}
         <<lengthValue>>,
@@ -1156,10 +1174,10 @@ if (
         <<dm.magnet.solve.wi.shuntLayer.material.relativeHeight>>,
         <<dm.magnet.solve.wi.shuntLayer.material.rrr>>,
         <<dm.magnet.solve.wi.shuntLayer.material.rrrRefT>>,
-        5, // material integer: HTSSuperPower
-        <<dm.magnet.solve.wi.relativeThicknessOfSuperConductor>>, // relative thickness of HTSSuperPower
-        <<dm.magnet.solve.wi.superConductor.electricFieldCriterion>>, // electric field criterion of HTSSuperPower
-        <<dm.magnet.solve.wi.superConductor.nValue>>, // n value of HTSSuperPower
+        <<materialCodes[dm.magnet.solve.wi.superConductor.name]>>, // material integer: HTS
+        <<dm.magnet.solve.wi.relativeThicknessOfSuperConductor>>, // relative thickness of HTS
+        <<dm.magnet.solve.wi.superConductor.electricFieldCriterion>>, // electric field criterion of HTS
+        <<dm.magnet.solve.wi.superConductor.nValue>>, // n value of HTS
         <<dm.magnet.solve.wi.superConductor.minimumPossibleResistivity>>, // winding minimum possible resistivity (or superconductor minimum? bug)
         <<dm.magnet.solve.wi.superConductor.maximumPossibleResistivity>>, // winding maximum possible resistivity (or superconductor maximum? bug)
         <<dm.magnet.solve.localDefects.jCritical.startTurn if dm.magnet.solve.localDefects.jCritical is not none else "0">>, // local defect start turn
@@ -2546,11 +2564,11 @@ FunctionSpace{
                 NameOfConstraint CONSTRAINT_zeroPhiAtOuterPoint;
             }
             {% if dm.magnet.geometry.ii.tsa and dm.magnet.solve.ii.resistivity != "perfectlyInsulating" %}
-            // {
-            //     NameOfCoef phin_bnd;
-            //     EntityType NodesOf;
-            //     NameOfConstraint CONSTRAINT_zeroPhiAtOuterPoint;
-            // }
+            {
+                NameOfCoef phin_bnd;
+                EntityType NodesOf;
+                NameOfConstraint CONSTRAINT_zeroPhiAtOuterPoint;
+            }
             {% endif %}
         }
     }
@@ -2939,6 +2957,17 @@ PostProcessing{
                 }
             }
 
+            {
+                Name RESULT_maximumTemperature; // voltages in cuts
+                Value{
+                    Term {
+                        Type Global;
+                        [ #999 ];
+                        In DOM_thermal;
+                    }
+                }
+            }
+
             {
                 Name RESULT_currentThroughCoil; // currents in cuts
                 Value{
@@ -3308,6 +3337,37 @@ PostOperation{
             )|indent(12)>>
         }
     }
+    {% if dm.magnet.solve.type in ["weaklyCoupled", "stronglyCoupled", "thermal"] %}
+    {
+        Name POSTOP_maximumTemperature;
+        NameOfPostProcessing POSTPRO_<<dm.magnet.solve.type>>;
+        Operation {
+            Print[ RESULT_temperature,
+                   OnElementsOf DOM_thermal,
+                   StoreMaxInRegister 999,
+                   Format Table,
+                   LastTimeStepOnly 1,
+                   SendToServer "No"
+                ] ;
+            // We can print the maximum temperature at any region that is part
+            // of the thermal domain since the `StoreMaxInRegister` command
+            // already searches all of the thermal region for the maximum and
+            //populates the same value for all physical regions of the thermal
+            // domain.
+            // 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,
+                format="TimeTable",
+                name="Maximum temperature [K]",
+                appendToExistingFile=True,
+                lastTimeStepOnly=True,
+                fileName="maximumTemperature(TimeSeriesPlot)",
+                noTitle=True
+            )|indent(12)>>
+        }
+    }
+    {% endif %}
     {
         Name POSTOP_currentThroughCoil;
         NameOfPostProcessing POSTPRO_<<dm.magnet.solve.type>>;
@@ -3383,21 +3443,23 @@ PostOperation{
         Name POSTOP_timeSeriesPlot_<<timeSeriesPlot.quantity>>;
         NameOfPostProcessing POSTPRO_<<dm.magnet.solve.type>>;
         Operation{
-    {% if timeSeriesPlot.quantity in ["currentThroughCoil", "voltageBetweenTerminals"] %}
+    {% if timeSeriesPlot.quantity == "maximumTemperature" %}
+
+    {% elif timeSeriesPlot.quantity in ["currentThroughCoil", "voltageBetweenTerminals"] %}
             <<POSTOPERATION_printResults(
                 quantity=timeSeriesPlot.getdpQuantityName,
                 onRegion="DOM_terminalCut",
                 format="TimeTable",
                 fileName=timeSeriesPlot.fileName
             )|indent(12)>>
-                {% elif timeSeriesPlot.quantity in ["totalResistiveHeating", "magneticEnergy"] %}
-                <<POSTOPERATION_printResults(
-                    quantity=timeSeriesPlot.getdpQuantityName,
-                    onGlobal=True,
-                    format="TimeTable",
-                    fileName=timeSeriesPlot.fileName
-                )|indent(12)>>
-                {% elif timeSeriesPlot.position.x is none %}
+    {% elif timeSeriesPlot.quantity in ["totalResistiveHeating", "magneticEnergy"] %}
+            <<POSTOPERATION_printResults(
+                quantity=timeSeriesPlot.getdpQuantityName,
+                onGlobal=True,
+                format="TimeTable",
+                fileName=timeSeriesPlot.fileName
+            )|indent(12)>>
+    {% elif timeSeriesPlot.position.x is none %}
             <<POSTOPERATION_printResults(
                 quantity=timeSeriesPlot.getdpQuantityName,
                 onGlobal=True,
@@ -3446,7 +3508,7 @@ PostOperation{
 {% endif %}
     // convergence criteria as postoperations:
 {% for tolerance in (dm.magnet.solve.nls.postOperationTolerances + dm.magnet.solve.t.adaptive.postOperationTolerances)|unique(attribute="quantity") %}
-    {% if tolerance.quantity in ["totalResistiveHeating", "magneticEnergy"] %}
+    {% if tolerance.quantity == "totalResistiveHeating" %}
     {
         Name POSTOP_CONV_totalResistiveHeating;
         NameOfPostProcessing POSTPRO_<<dm.magnet.solve.type>>;
@@ -3464,6 +3526,29 @@ PostOperation{
             Print[RESULT_<<tolerance.quantity>>, OnRegion DOM_terminalCut];
         }
     }
+    {% elif tolerance.quantity == "maximumTemperature" %}
+    {
+        Name POSTOP_CONV_maximumTemperature;
+        NameOfPostProcessing POSTPRO_<<dm.magnet.solve.type>>;
+        Operation {
+            Print[ RESULT_temperature,
+                OnElementsOf DOM_thermal,
+                StoreMaxInRegister 999,
+                Format Table,
+                LastTimeStepOnly 1,
+                SendToServer "No"
+             ] ;
+
+            <<POSTOPERATION_printResults(
+                quantity="RESULT_maximumTemperature",
+                onRegion="DOM_thermal",
+                format="TimeTable",
+                name="Maximum temperature [K]",
+                appendToExistingFile=True,
+                lastTimeStepOnly=True,
+                )|indent(12)>>
+        }
+    }
     {% else %}
     {
         Name POSTOP_CONV_<<tolerance.quantity>>;

fiqus/pro_templates/combined/materials.pro

@@ -1,6 +1,6 @@
 // Quench Heater Circuits:
-{% macro MATERIAL_QuenchHeater_SSteel_t_T(rho_SS="None", t_on="None", U_0="None", C="None", R_warm="None", w_SS="None", h_SS="None", l_SS="None", mode="None", time="$Time", T="$1") -%}
-CFUN_QHCircuit_t_T[<<time>>, <<T>>]{<<rho_SS>>, <<t_on>>, <<U_0>>, <<C>>, <<R_warm>>, <<w_SS>>, <<h_SS>>, <<l_SS>>, <<mode>>}
+{% macro MATERIAL_QuenchHeater_SSteel_t_T(t_on="None", U_0="None", C="None", R_warm="None", w_SS="None", h_SS="None", l_SS="None", mode="None", time="$Time", T="$1") -%}
+CFUN_QHCircuit_t_rhoSS[<<time>>, CFUN_rhoSS_T[<<T>>]]{<<t_on>>, <<U_0>>, <<C>>, <<R_warm>>, <<w_SS>>, <<h_SS>>, <<l_SS>>, <<mode>>}
 {%- endmacro %} // mode: 1 -> Power, 2 -> Current, 3 -> Resistance
 
 // Critical Currents:
@@ -12,24 +12,28 @@ CFUN_IcNbTi_T_a[<<T>>, <<area>>]{<<BMagnitude>>}
 {%- endmacro %}
 
 // Critical Current Densities:
-{% macro MATERIAL_CriticalCurrentDensity_NiobiumTitanium_T(C1="None", C2="None", Tc0="None", Bc20="None", wireDiameter="None", Cu_noCu="None", T="$1", BMagnitude="5") -%}
+{% macro MATERIAL_CriticalCurrentDensity_NiobiumTitanium_CUDI1_T(C1="None", C2="None", Tc0="None", Bc20="None", wireDiameter="None", Cu_noCu="None", T="$1", BMagnitude="5") -%}
 CFUN_Jc_NbTi_Cudi_fit1_T[<<T>>]{<<BMagnitude>>, <<Tc0>>, <<Bc20>>, <<C1>>, <<C2>>, <<wireDiameter>>, <<Cu_noCu>>}
 {%- endmacro %}
 
-{% macro MATERIAL_CriticalCurrentDensity_Niobium3Tin_T(Jc0="None", Tc0="None", Bc20="None", T="$1", BMagnitude="5") -%}
+{% macro MATERIAL_CriticalCurrentDensity_Niobium3Tin_Summers_T(Jc0="None", Tc0="None", Bc20="None", T="$1", BMagnitude="5") -%}
 CFUN_Jc_Nb3Sn_Summers_T[<<T>>]{<<BMagnitude>>, <<Jc0>>, <<Tc0>>, <<Bc20>>}
 {%- endmacro %}
 
-{% macro MATERIAL_CriticalCurrentDensity_BSCCO2212_T(f_scaling="None", T="$1", BMagnitude="5") -%}
+{% macro MATERIAL_CriticalCurrentDensity_Niobium3Tin_Bordini_T(Tc0="None", Bc20="None", C0="None", alpha="None", T="$1", BMagnitude="5") -%}
+CFUN_Jc_Bordini_T[<<T>>]{<<BMagnitude>>, <<Tc0>>, <<Bc20>>, <<C0>>, <<alpha>>}
+{%- endmacro %}
+
+{% macro MATERIAL_CriticalCurrentDensity_BSCCO2212_BSCCO_2212_LBNL_T(f_scaling="None", T="$1", BMagnitude="5") -%}
 CFUN_Jc_T_B_BSCCO2212_block20T_new_T[<<T>>]{<<BMagnitude>>, <<f_scaling>>}
 {%- endmacro %}
 
 // Resistivities:
 {% macro MATERIAL_Resistivity_Copper_T_B(RRR="None", rrrRefT="None", T="$1", BMagnitude="Norm[$2]") -%}
-CFUN_rhoCu_T_B[<<T>>, <<BMagnitude>>]{<<RRR>>, <<rrrRefT>>}
+CFUN_rhoCu_T_B[<<T>>, <<BMagnitude>>]{<<RRR>>}
 {%- endmacro %}
 {% macro MATERIAL_Resistivity_Copper_T(RRR="None", rrrRefT="None", T="$1", BMagnitude="5") -%}
-CFUN_rhoCu_T[<<T>>]{<<BMagnitude>>, <<RRR>>, <<rrrRefT>>}
+CFUN_rhoCu_T[<<T>>]{<<BMagnitude>>, <<RRR>>}
 {%- endmacro %}
 
 {% macro MATERIAL_Resistivity_Hastelloy_T(RRR="None", rrrRefT="None", T="$1", BMagnitude="Norm[$2]") -%}
@@ -53,11 +57,11 @@ CFUN_rhoSS_T[<<T>>]
 
 // Thermal Conductivities:
 {% macro MATERIAL_ThermalConductivity_Copper_T_B(RRR="None", rrrRefT="None", T="$1", BMagnitude="Norm[$2]") -%}
-CFUN_kCu_T_rho0_rho[<<T>>, CFUN_rhoCu_T[<<T>>]{0, <<RRR>>, <<rrrRefT>>}, CFUN_rhoCu_T_B[<<T>>, <<BMagnitude>>]{<<RRR>>, <<rrrRefT>>}]{<<RRR>>}
+CFUN_kCu_T_rho0_rho[<<T>>, CFUN_rhoCu_T[<<T>>]{0, <<RRR>>}, CFUN_rhoCu_T_B[<<T>>, <<BMagnitude>>]{<<RRR>>}]{<<RRR>>}
 {%- endmacro %}
 
 {% macro MATERIAL_ThermalConductivity_Copper_T(RRR="None", rrrRefT="None", T="$1", BMagnitude="5") -%}
-CFUN_kCu_T_rho0_rho[<<T>>, CFUN_rhoCu_T[<<T>>]{0, <<RRR>>, <<rrrRefT>>}, CFUN_rhoCu_T[<<T>>]{<<BMagnitude>>, <<RRR>>, <<rrrRefT>>}]{<<RRR>>}
+CFUN_kCu_T_rho0_rho[<<T>>, CFUN_rhoCu_T[<<T>>]{0, <<RRR>>}, CFUN_rhoCu_T[<<T>>]{<<BMagnitude>>, <<RRR>>}]{<<RRR>>}
 {%- endmacro %}
 
 {% macro MATERIAL_ThermalConductivity_Hastelloy_T(RRR="None", rrrRefT="None", T="$1", BMagnitude="Norm[$2]") -%}

{fiqus-2024.5.2.dist-info → fiqus-2024.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiqus
-Version: 2024.5.2
+Version: 2024.6.0
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team
@@ -72,6 +72,7 @@ Source code for STEAM **FiQuS** (**Fi**nite Element **Qu**ench **S**imulator).
 # Publications
 
 - S. Atalay et al, "An open-source 3D FE quench simulation tool for no-insulation HTS pancake coils", in Superconductor Science and Technology, doi: [10.1088/1361-6668/ad3f83](https://doi.org/10.1088/1361-6668/ad3f83)
+- J. Dular et al, "Coupled Axial and Transverse Currents Method for Finite Element Modelling of Periodic Superconductors", arXiv preprint, doi:[10.48550/arXiv.2404.09775](https://doi.org/10.48550/arXiv.2404.09775).
 - A. Vitrano et al, "An Open-Source Finite Element Quench Simulation Tool for Superconducting Magnets," in IEEE Transactions on Applied Superconductivity, vol. 33, no. 5, pp. 1-6, Aug. 2023, Art no. 4702006, doi: [10.1109/TASC.2023.3259332](https://ieeexplore.ieee.org/abstract/document/10077402).
 - M. Wozniak et al, "Fast Quench Propagation Conductor for Protecting Canted Cos-Theta Magnets," in IEEE Transactions on Applied Superconductivity, vol. 33, no. 5, pp. 1-5, Aug. 2023, Art no. 4701705, doi: [10.1109/TASC.2023.3247997](https://ieeexplore.ieee.org/document/10050158).
 

{fiqus-2024.5.2.dist-info → fiqus-2024.6.0.dist-info}/RECORD

@@ -1,29 +1,36 @@
-fiqus/MainFiQuS.py,sha256=BrMO50mlcU8WKbLnjqWL1IuzBnkxELiOMerLtKuIHPk,13700
+fiqus/MainFiQuS.py,sha256=iLfsYTqQ93AVT4E1b81z-cx6LsdBJBXjOhMQkt-k4dM,14343
 fiqus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fiqus/data/DataFiQuS.py,sha256=dJe8BOx5xbLDRc6DRNQoJVleUQfSMZV28UlID9OGiA4,6396
+fiqus/data/DataConductor.py,sha256=iBtmUOfz68yPqTq_5-dprigb4BgP_BCbFzSMSKoqN_c,13919
+fiqus/data/DataFiQuS.py,sha256=-lxp98aU3f-sHdbLYlBipBVr1w6zQi0kK7pWZQM3D5Y,6599
 fiqus/data/DataFiQuSCCT.py,sha256=j3K9ODSwOuP-tkie0o4fvkouEyDHhlX3Y2DH1zO58Eo,7287
+fiqus/data/DataFiQuSConductor.py,sha256=uxPR3cN38Kf93EN339JegM5GCg5wBtbfzCI-qeByMAQ,2710
+fiqus/data/DataFiQuSConductorAC_Strand.py,sha256=e1gJYudRcbWE7-cUt3avyUXgz-ZNi5xQ_U-pQr3mv-s,28186
 fiqus/data/DataFiQuSMultipole.py,sha256=cKa4JTzYUfUcbruoyALE1tgIDTy8zYhRFJuKZnnFuhc,2403
-fiqus/data/DataFiQuSPancake3D.py,sha256=mZK2tLn6437WmPO5AJJ78cHmNr_GUwWga-Uk46APglA,110178
+fiqus/data/DataFiQuSPancake3D.py,sha256=-xW4neYKIf9_10kRM1h9Vq1GQcrTQV1ABxiHw4ZT3tk,115543
 fiqus/data/DataMultipole.py,sha256=Ai-z_Ux2iLxZPnHvCDneeUWxeOlfQEbVa74r_Il9ym0,2304
 fiqus/data/DataRoxieParser.py,sha256=ysQfTnJ7nUHbjwgVWLtD_k0jggyEeNCXwRpm6ghVE8E,9036
 fiqus/data/DataWindingsCCT.py,sha256=qqqxO4VG6rsKpNEImkA1hjrUMyS4UFNfVG_ioQd4ML8,1709
-fiqus/data/RegionsModelFiQuS.py,sha256=YRgLy9NLYqhxP2NoRH2e_Ta7_vr03INIgyIZNRduz2A,7162
+fiqus/data/RegionsModelFiQuS.py,sha256=cOFyZNZEgE1xdvUfAvCpzBKp0dhjUORhGd6b0d1kDLY,7242
 fiqus/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fiqus/geom_generators/GeometryCCT.py,sha256=eUhcmver2rqVeo77qQ4OFC0tXV6uROzOpyRmLlTuiRg,49745
+fiqus/geom_generators/GeometryCCT.py,sha256=Xp-lRlYeKX1ZkrbSbmzrGCq_dFgiC4XqW8qtCw3Xadk,49972
+fiqus/geom_generators/GeometryConductorAC_Strand.py,sha256=GDMbPuYvE4Pwxy-qPlmTSurd1p92Nk6xDjgYZuXex2Q,76016
 fiqus/geom_generators/GeometryMultipole.py,sha256=App1thx8KZ1kGwGaIxgRhJfIbG-VrjJZmwSv3s2P9w0,24171
 fiqus/geom_generators/GeometryPancake3D.py,sha256=KefA9iK_pYeJKOZjfIYw8klYA1ToLXnfq6WiMwypPpk,167791
 fiqus/geom_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/getdp_runners/RunGetdpCCT.py,sha256=EPkckG8PPrBgACKG5oHSJrsBmBYvd9yJ8BvnaTeO3l4,3012
-fiqus/getdp_runners/RunGetdpMultipole.py,sha256=lbM9mZl-dCHQ8wTHlhVUzuzrYzU3-DzbhxhBE3KmEpo,4172
+fiqus/getdp_runners/RunGetdpConductorAC_Strand.py,sha256=N_CZp2rua6TtJK__dv0WMHD2QlxGCigWGzRmz-EzDpU,10198
+fiqus/getdp_runners/RunGetdpMultipole.py,sha256=6g5F1YBi0DzWWMBg0fVAIN0zbvgnIwY231NXShM_wK8,4224
 fiqus/getdp_runners/RunGetdpPancake3D.py,sha256=9iBAKEeHOlpE9nWLf7bmpj2xMOMslBRq62ZnP-e1I7s,9744
 fiqus/getdp_runners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/mains/MainCCT.py,sha256=egzRdGq-kCs-ZNIRGsBhmN7MCcF1Lp1n8r0XKBFImsA,4414
+fiqus/mains/MainConductorAC_Strand.py,sha256=TEPft6rzq4wxOc3ljJj1AkLe9oiVccSyFiM4lrRziE0,5147
 fiqus/mains/MainMultipole.py,sha256=2ntN2ACDIncQv-1yX5S6KlFG2nIK40-hpUxVnAogS-I,5075
 fiqus/mains/MainPancake3D.py,sha256=nfyTW_Km39G5NqzgRpg5vjWUBpDyqIs54xkmNpyANe4,21524
 fiqus/mains/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fiqus/mesh_generators/MeshCCT.py,sha256=cRiXyjOtzbFvaZ0Uf9wRWDENcVV9OMo5o3ugaMqwbjI,11338
-fiqus/mesh_generators/MeshMultipole.py,sha256=c042LJdesRy3Kd1smXGuMVkx5codZAlfAAVNxnO3KR4,14221
-fiqus/mesh_generators/MeshPancake3D.py,sha256=gJs750xwV0WpYfrZMCcu1f7VMQB335L8jNhdZBoO3bA,120547
+fiqus/mesh_generators/MeshCCT.py,sha256=j2Qj69tdFb-weQnNgv5zi6dkL3ZJxGRdzKqzjlYdIy8,11436
+fiqus/mesh_generators/MeshConductorAC_Strand.py,sha256=PjERjIQNRNej6eTLH8bSVA94VKcRtCOAfNQyCgwVWn8,43122
+fiqus/mesh_generators/MeshMultipole.py,sha256=hyDKt_3K_jo8pvfoA8I3gAsU4vnlfX3pie5afMkOq-A,14508
+fiqus/mesh_generators/MeshPancake3D.py,sha256=ClWH7sX00V6-LNptmWYY1nzeSyZCvGN_RKDnpdtsenc,120973
 fiqus/mesh_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/parsers/ParserDAT.py,sha256=eLbpr74BDoSw6UAeP_qkM55ZLRYPdk8t-RhTXU_oHE4,675
 fiqus/parsers/ParserGetDPOnSection.py,sha256=pTk2EqO1sitoNIztekyEtIy5xpFKou_L3KGsIjJV3R0,8408
@@ -33,35 +40,40 @@ fiqus/parsers/ParserPOS.py,sha256=hO4mLneIuSvX-Gaqeke27OLgnCfzNvg4E_9r6nFr6Wg,10
 fiqus/parsers/ParserRES.py,sha256=782GouJaw0j5u1RLGag6FauSUTuKV7gKa1G4EowSKBE,5984
 fiqus/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/plotters/PlotPythonCCT.py,sha256=YgphOuiTk0klqZh4d4u81hahtiDp-tx149EpBjyKH-Y,6333
+fiqus/plotters/PlotPythonConductorAC.py,sha256=GA_4dtzADlB64FsonYzWXlaBwhIJ4i5wg3y1Nv5KAag,45715
 fiqus/plotters/PlotPythonMultipole.py,sha256=SjJQKHX5mUoMW3yli97W6Kja0Hux8C16YE1U22hQRHY,481
 fiqus/plotters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/post_processors/PostProcessCCT.py,sha256=-lao2mxHRJNuLSqP2pdiXAIvLxdAw0e5NNEbTfhDQs0,28443
+fiqus/post_processors/PostProcessConductorAC.py,sha256=77E9nUOZUktgX8J_g03ASVyoZIKeZPcCl1y9s-CEs2Y,2184
 fiqus/post_processors/PostProcessMultipole.py,sha256=Jm4mbe8HUHHMbFT51PLXYM7We0Siltuw4ZclJ1A5Vus,15649
 fiqus/post_processors/PostProcessPancake3D.py,sha256=owXLKxAZ-tZw6oW0RemjH8HJTnINZuZnAgY0x-WLVgU,13195
 fiqus/post_processors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/pre_processors/PreProcessCCT.py,sha256=BDRei7uLdOHxNnsg-r17HcjtvvrST8HUj_lQ1GSmVZo,9217
 fiqus/pre_processors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fiqus/pro_assemblers/ProAssembler.py,sha256=2v_hRnaRVGE9urOdsHKg7wywZmoeDs-g-95yLV0eIF4,2770
+fiqus/pro_assemblers/ProAssembler.py,sha256=LyGpydWUJmw9hKpWsI72qyoG8y4Su2hKn3adykISMWc,2906
 fiqus/pro_assemblers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/pro_material_functions/ironBHcurves.pro,sha256=0Tz1KzZ63G_zaS6dYQ5NYwa9EAtJna0jR61OxsM9J_E,17835
 fiqus/pro_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fiqus/pro_templates/combined/CCT_template.pro,sha256=9bx82kbZh7fjnrUY7eoPsIyE1Ac5DgnxmOA1zma2wdo,13524
-fiqus/pro_templates/combined/Multipole_template.pro,sha256=XZDeo_TBncTxxglamHEPwvL1WXhRJEB-DL-hVxs-d1c,7956
-fiqus/pro_templates/combined/Pancake3D_template.pro,sha256=mSFzh1givrhSdSPAqJfKs3sCVMpFQGTXioXaWheaN08,146568
+fiqus/pro_templates/combined/CCT_template.pro,sha256=8dyBKotys4kr7FyUZJFZr0CMBjEupPJ3XIPPOQwJ2Ps,13832
+fiqus/pro_templates/combined/ConductorAC_template.pro,sha256=ocZgeGgqj49DYDbX9QUFtag9-i3dWsL2_MYkJgNN6BA,61725
+fiqus/pro_templates/combined/Multipole_template.pro,sha256=Tuheajy32uZFyTe-OsvCyIRsDiOyYm0yoOe4LxfcSi8,8060
+fiqus/pro_templates/combined/Pancake3D_template.pro,sha256=i0lr2hROYJVRff0S7PgJNfxxG0EHy_HrPCEbYftaKjs,150118
 fiqus/pro_templates/combined/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fiqus/pro_templates/combined/materials.pro,sha256=qUMlz0d6GjnSP8z9Jl2fjd4-7SUGArk7hfSaLvwlVrc,5525
+fiqus/pro_templates/combined/materials.pro,sha256=TMqOu93KqSn0FWy6As6oTLqYChXXz-pGq6AVhweLpg8,5709
 fiqus/pro_templates/separated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fiqus/utils/Utils.py,sha256=di-IYXD36cArEvkki8XbStXkpmmFL8EPOjMBAsNrT7I,18489
 fiqus/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_FiQuS.py,sha256=KN8qkXuUrkHg82rB_wsUEq_diP5mPOQpOpA0WBHMwpo,15537
-tests/test_geometry_generators.py,sha256=RAxyK-Fu3gOvVkCJeB8CA4DSfvAqpJ0lQV8MSzgKliY,2034
-tests/test_mesh_generators.py,sha256=JXksFjJArezAq7fTUgkybpj9ulXmVUphudzJ1YqBV_I,2112
-tests/test_solvers.py,sha256=GNmIxT5d1IdQk9gwRTCudqJO5-D9bzodTDPiY0TDYPQ,4224
+tests/test_geometry_generators.py,sha256=GtoykfajdGMO5GQHWjFLNbaCHCKQLFOzfsiHhfJja0Q,3908
+tests/test_mesh_generators.py,sha256=Ea0lZmTn0MeryrdQoZ1HUNpYmEFjourvH5eGK6T6szI,3988
+tests/test_solvers.py,sha256=nJXLELUZWAiLRqVkpD2FtYXhuStKRHYvuGkztiI1AUc,6407
 tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/utils/fiqus_test_classes.py,sha256=nTABZ4uw0SGUVRG1HecQ2xHU1LMbgxfrwRpAPkO91Bo,24891
+tests/utils/fiqus_test_classes.py,sha256=Il8T-Bz1WNJhOrTBFHNoRRr_QXQzzprZu9Y8SXRbLJ0,26948
+tests/utils/generate_reference_files_ConductorAC.py,sha256=_jEE6xcqiz52bnmY6Is11QmG-bZ2vdH0k99p733t4N4,1676
+tests/utils/generate_reference_files_Pancake3D.py,sha256=ufELeL8WMoWZFcOkVxR7w5OHCgIQ4Z3cLcXM-LtgvmM,3314
 tests/utils/helpers.py,sha256=BQxdHr8N4rGXc2C_YNEeOXxTIDJSUeRyyxLkvWfhiJY,4149
-fiqus-2024.5.2.dist-info/METADATA,sha256=JJo4w4RYXb9Y7xDLW21a7n4mlDWIolDF30D7BjFA3f0,4698
-fiqus-2024.5.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fiqus-2024.5.2.dist-info/top_level.txt,sha256=oGzSIyoVc1zYg14o67zI3QFwWsJvqNzNT0-te9WbUQc,12
-fiqus-2024.5.2.dist-info/RECORD,,
+fiqus-2024.6.0.dist-info/METADATA,sha256=d1e4oxzUM0oh38p7X2eVTs2bmIluQSf-Fytr8FBQBho,4914
+fiqus-2024.6.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+fiqus-2024.6.0.dist-info/top_level.txt,sha256=oGzSIyoVc1zYg14o67zI3QFwWsJvqNzNT0-te9WbUQc,12
+fiqus-2024.6.0.dist-info/RECORD,,

{fiqus-2024.5.2.dist-info → fiqus-2024.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_geometry_generators.py

@@ -45,6 +45,47 @@ class TestGeometryGenerators(FiQuSGeometryTests):
                     data_model=data_model, file_name=model_name, file_extension="vi"
                 )
                 self.compare_json_or_yaml_files(vi_file, reference_vi_file)
+                   
+    def test_ConductorAC_Strand(self):
+        """
+        Checks if ConductorAC geometry generators work correctly by comparing the number
+        of entities in the generated geometry file to the reference file that was
+        checked manually.
+        """
+        model_names = [
+            "TEST_CAC_Strand_adaptiveMesh",
+            "TEST_CAC_Strand_hexFilaments",
+            "TEST_CAC_wireInChannel",
+        ]
+
+        for model_name in model_names:
+            with self.subTest(model_name=model_name):
+                data_model = self.get_data_model(model_name)
+
+                # data_model can be modified here if necessary
+                # Example:
+
+                # data_model.magnet.geometry.N = 3
+
+                self.generate_geometry(data_model, model_name)
+
+                # Compare the number of entities with the reference file:
+                geometry_file = self.get_path_to_generated_file(
+                    data_model=data_model, file_name=model_name, file_extension="brep"
+                )
+                reference_file = self.get_path_to_reference_file(
+                    data_model=data_model, file_name=model_name, file_extension="brep"
+                )
+                self.compare_number_of_entities(geometry_file, reference_file)
+
+                # Compare the Geometry YAML files:
+                geometry_yaml_file = self.get_path_to_generated_file(
+                    data_model=data_model, file_name='GeometryModel', file_extension="yaml"
+                )
+                reference_geometry_yaml_file = self.get_path_to_reference_file(
+                    data_model=data_model, file_name='GeometryModel', file_extension="yaml"
+                )
+                self.compare_json_or_yaml_files(geometry_yaml_file, reference_geometry_yaml_file, tolerance=1e-9)
 
 if __name__ == "__main__":
     unittest.main()