Commit 0f443722 authored by John Tourtellott's avatar John Tourtellott

Move induction-heating source from EM tab to induction coils tab

Anticipates a custom view to support specification of time-dependent source
frequency and coil current.
parent 8dede236
......@@ -186,8 +186,8 @@ format_table = {
'ELECTROMAGNETICS': [
card('em_domain_type', item_path='em-domain-type'),
card('symmetry_axis', item_path='symmetry-axis'),
card('source_frequency', item_path='source-type/constant-source-frequency'),
card('uniform_source', item_path='source-type/constant-uniform-source'),
card('source_frequency', att_type='em-source', item_path='source-type/constant-source-frequency'),
card('uniform_source', att_type='em-source', item_path='source-type/constant-uniform-source'),
card('cg_stopping_tolerance', item_path='cg-stopping-tolerance'),
card('maximum_cg_iterations', item_path='maximum-cg-iterations'),
card('num_etasq', item_path='num-etasq'),
......
......@@ -140,7 +140,7 @@
<View Type="Group" Name="Induction Heating" TabPosition="North">
<Views>
<View Title="Electromagnetics" />
<View Title="Induction Coils" />
<View Title="EM Sources" />
</Views>
</View>
<View Type="Instanced" Title="Electromagnetics">
......@@ -148,19 +148,28 @@
<Att Name="electromagnetics" Type="electromagnetics" />
</InstancedAttributes>
</View>
<View Type="Group" Name="EM Sources" Style="Tiled">
<Views>
<View Title="Source" />
<View Title="Induction Coils" />
</Views>
</View>
<View Type="Instanced" Title="Source">
<InstancedAttributes>
<Att Name="em-source" Type="em-source" />
</InstancedAttributes>
</View>
<View Type="Attribute" Title="Induction Coils">
<AttributeTypes>
<Att Type="induction-coil" />
</AttributeTypes>
</View>
<View Type="Instanced" Name="Solid Mechanics">
<InstancedAttributes>
</InstancedAttributes>
</View>
<View Type="Group" Title="Materials" TabPosition="North">
<Views>
<View Title="Phases" />
......
......@@ -3,7 +3,7 @@
<Cat>Induction Heating</Cat>
</Categories>
<Definitions>
<AttDef Type="electromagnetics" Label="Electromagnetics" BaseType="" Version="0" Unique="true">
<AttDef Type="electromagnetics" Label="Electromagnetics" BaseType="" Version="0">
<ItemDefinitions>
<Component Name="model" Label="Geometry" LockType="DoNotLock">
<Accepts>
......@@ -41,36 +41,6 @@
<Value Enum="z">z</Value>
</DiscreteInfo>
</String>
<String Name="source-type" Label="EM Source" Version="0">
<BriefDescription>Time-dependent source is not yet supported.</BriefDescription>
<Categories>
<Cat>Induction Heating</Cat>
</Categories>
<ChildrenDefinitions>
<Double Name="constant-source-frequency" Label="Frequency">
<BriefDescription>Frequency (cycles per unit time) of the sinusoidally-varyingmagnetic source fields that drive the Joule heat calculation.</BriefDescription>
<Categories>
<Cat>Induction Heating</Cat>
</Categories>
</Double>
<Double Name="constant-uniform-source" Label="Uniform Source" AdvanceLevel="1" Version="0">
<BriefDescription>Amplitude of a sinusiodal-varying, uniform magnetic source field thatdrives the Joule heat computation.</BriefDescription>
<Categories>
<Cat>Induction Heating</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
</Double>
</ChildrenDefinitions>
<DiscreteInfo DefaultIndex="0">
<Structure>
<Value Enum="Constant">constant</Value>
<Items>
<Item>constant-source-frequency</Item>
<Item>constant-uniform-source</Item>
</Items>
</Structure>
</DiscreteInfo>
</String>
<Double Name="cg-stopping-tolerance" Label="CG Stopping Tolerance" Version="0">
<Categories>
<Cat>Induction Heating</Cat>
......@@ -125,6 +95,40 @@
</Int>
</ItemDefinitions>
</AttDef>
<AttDef Type="em-source" Label="EM Source" BaseType="" Version="0">
<ItemDefinitions>
<String Name="source-type" Label="Type" Version="0">
<BriefDescription>Time-dependent source is not yet supported.</BriefDescription>
<Categories>
<Cat>Induction Heating</Cat>
</Categories>
<ChildrenDefinitions>
<Double Name="constant-source-frequency" Label="Frequency">
<BriefDescription>Frequency (cycles per unit time) of the sinusoidally-varyingmagnetic source fields that drive the Joule heat calculation.</BriefDescription>
<Categories>
<Cat>Induction Heating</Cat>
</Categories>
</Double>
<Double Name="constant-uniform-source" Label="Uniform Source" AdvanceLevel="1" Version="0">
<BriefDescription>Amplitude of a sinusiodal-varying, uniform magnetic source field thatdrives the Joule heat computation.</BriefDescription>
<Categories>
<Cat>Induction Heating</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
</Double>
</ChildrenDefinitions>
<DiscreteInfo DefaultIndex="0">
<Structure>
<Value Enum="Constant">constant</Value>
<Items>
<Item>constant-source-frequency</Item>
<Item>constant-uniform-source</Item>
</Items>
</Structure>
</DiscreteInfo>
</String>
</ItemDefinitions>
</AttDef>
<AttDef Type="induction-coil" Label="Induction Coil" BaseType="" Version="0">
<ItemDefinitions>
<String Name="type" Label="Type" Version="0">
......
......@@ -7,7 +7,8 @@
</Categories>
<!-- Attribute Definitions-->
<Definitions>
<AttDef Type="background-material" Label="Background Material" BaseType="" Version="0" Unique="true">
<AttDef Type="background-material" Label="Default Material" BaseType="" Version="0" Unique="true">
<BriefDescription>Material to use to fill any portion of the mesh not explicitlydefined in the "Body" namelists.</BriefDescription>
<ItemDefinitions>
<Component Name="background-material" Label="Select" NumberOfRequiredValues="1" Unique="true" Version="1">
<Accepts>
......
......@@ -5,7 +5,7 @@ SMTK_AttributeResource(Version="3")
Definitions
AttDef(Type="electromagnetics" Label="Electromagnetics"
BaseType="" Version="0" Unique="true")
BaseType="" Version="0")
ItemDefinitions
Component(Name="model" Label="Geometry" LockType="DoNotLock")
Accepts
......@@ -33,34 +33,6 @@ SMTK_AttributeResource(Version="3")
Value(Enum="y") y
Value(Enum="z") z
//- Todo source frequency and times are coupled
String(Name="source-type" Label="EM Source" Version="0")
BriefDescription Time-dependent source is not yet supported.
Categories #[Cat Induction Heating]
ChildrenDefinitions
Double(Name="constant-source-frequency" Label="Frequency")
BriefDescription Frequency (cycles per unit time) of the sinusoidally-varying
| magnetic source fields that drive the Joule heat calculation.
Categories #[Cat Induction Heating]
Double(Name="constant-uniform-source" Label="Uniform Source" AdvanceLevel="1" Version="0")
BriefDescription Amplitude of a sinusiodal-varying, uniform magnetic source field that
| drives the Joule heat computation.
Categories #[Cat Induction Heating]
DefaultValue 0.0
//- Todo time-dependent source
Double(Name="source-frequency" Label="Source Frequency" Extensible="true" NumberOfRequiredValues="1" Version="0")
Categories #[Cat Induction Heating]
Double(Name="source-times" Label="Source Times" Extensible="true" NumberOfRequiredValues="1" Version="0")
Categories #[Cat Induction Heating]
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="Constant") constant
Items
Item constant-source-frequency
Item constant-uniform-source
Double(Name="cg-stopping-tolerance" Label="CG Stopping Tolerance" Version="0")
Categories #[Cat Induction Heating]
DefaultValue 1e-8
......@@ -98,6 +70,36 @@ SMTK_AttributeResource(Version="3")
Value 3
Value 4
AttDef(Type="em-source" Label="EM Source" BaseType="" Version="0")
ItemDefinitions
//- Todo source frequency and times are coupled
String(Name="source-type" Label="Type" Version="0")
BriefDescription Time-dependent source is not yet supported.
Categories #[Cat Induction Heating]
ChildrenDefinitions
Double(Name="constant-source-frequency" Label="Frequency")
BriefDescription Frequency (cycles per unit time) of the sinusoidally-varying
| magnetic source fields that drive the Joule heat calculation.
Categories #[Cat Induction Heating]
Double(Name="constant-uniform-source" Label="Uniform Source" AdvanceLevel="1" Version="0")
BriefDescription Amplitude of a sinusiodal-varying, uniform magnetic source field that
| drives the Joule heat computation.
Categories #[Cat Induction Heating]
DefaultValue 0.0
//- Todo time-dependent source
Double(Name="source-frequency" Label="Source Frequency" Extensible="true" NumberOfRequiredValues="1" Version="0")
Categories #[Cat Induction Heating]
Double(Name="source-times" Label="Source Times" Extensible="true" NumberOfRequiredValues="1" Version="0")
Categories #[Cat Induction Heating]
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="Constant") constant
Items
Item constant-source-frequency
Item constant-uniform-source
AttDef(Type="induction-coil" Label="Induction Coil" BaseType="" Version="0")
ItemDefinitions
String(Name="type" Label="Type" Version="0")
......
......@@ -24,8 +24,10 @@ SMTK_AttributeResource(Version="3")
// Attribute Definitions
Definitions
AttDef(Type="background-material" Label="Background Material" BaseType=""
AttDef(Type="background-material" Label="Default Material" BaseType=""
Version="0" Unique="true")
BriefDescription Material to use to fill any portion of the mesh not explicitly
| defined in the "Body" namelists.
ItemDefinitions
//- (It appears that AttributeRef no longer displays)
//- AttributeRef(Name="background-material" Label="Background Material"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment