Commit c288c5aa authored by John Tourtellott's avatar John Tourtellott

Refactor materials into phase and phase-transition attributes

parent 46078015
......@@ -163,14 +163,20 @@
<View Type="Group" Title="Materials" TabPosition="North">
<Views>
<View Title="Material" />
<View Title="Phases" />
<View Title="Phase Transitions" />
<View Title="Material Assignment Group" />
<View Title="Material Functions" />
</Views>
</View>
<View Type="Attribute" Title="Material" Label="Specification" HideAssociations="true">
<View Type="Attribute" Title="Phases" HideAssociations="true">
<AttributeTypes>
<Att Type="material"/>
<Att Type="phase"/>
</AttributeTypes>
</View>
<View Type="Attribute" Title="Phase Transitions" HideAssociations="true">
<AttributeTypes>
<Att Type="phase-transition"/>
</AttributeTypes>
</View>
<View Type="Group" Name="Material Assignment Group" Label="Assignment" Style="Tiled">
......@@ -186,7 +192,7 @@
</View>
<View Type="Associations" Title="Material Assignment" Label="Element Block Assignment">
<AttributeTypes>
<Att Type="material" />
<Att Type="phase" />
</AttributeTypes>
</View>
<View Type="Attribute" Title="Material Functions" Label="Functions">
......
......@@ -66,7 +66,7 @@
<Group Name="inflow" Label="Inflow" Optional="true" IsEnabledByDefault="false">
<ItemDefinitions>
<AttributeRef Name="inflow-material" Label="Inflow Material" NumberOfRequiredValues="1">
<AttDef>material</AttDef>
<AttDef>phase</AttDef>
<Categories>
<Cat>Fluid Flow</Cat>
</Categories>
......
This diff is collapsed.
......@@ -51,7 +51,7 @@ SMTK_AttributeResource(Version="3")
ItemDefinitions
AttributeRef(Name="inflow-material" Label="Inflow Material"
NumberOfRequiredValues="1")
AttDef material
AttDef phase
+categories-all
Double(Name="inflow-temperature" Label="Inflow Temperature")
+categories-all
......
......@@ -6,19 +6,19 @@ mixin categories-all
Cat Solid Mechanics
mixin electrical
//- Group(Name="electrical properties" Label="Electrical Properties")
Group(Name="electrical properties" Label="Electrical Properties")
ItemDefinitions
Double(Name="electrical-conductivity" Label="Electrical Conductivity")
DefaultValue 0.0
ExpresionType tabular-function
ExpresionType fn.material
Categories #[Cat Induction Heating]
Double(Name="electrical-susceptibility" Label="Electrical Susceptibility" AdvanceLevel="1")
DefaultValue 0.0
ExpresionType tabular-function
ExpresionType fn.material
Categories #[Cat Induction Heating]
Double(Name="magnetic-susceptibility" Label="Magnetic Susceptibility" AdvanceLevel="1")
DefaultValue 0.0
ExpresionType tabular-function
ExpresionType fn.material
Categories #[Cat Induction Heating]
doctype xml
......@@ -38,10 +38,80 @@ SMTK_AttributeResource(Version="3")
Component(Name="background-material" Label="Select"
NumberOfRequiredValues="1" Unique="true" Version="1")
Accepts
Resource(Name="smtk::attribute::Resource" Filter="attribute[type='material']")
Resource(Name="smtk::attribute::Resource" Filter="attribute[type='phase']")
+categories-all
AttDef(Type="material" Label="Material" BaseType="" Version="0" Unique="true")
AttDef(Type="phase" Abstract="true" BaseType="" Version="0" Unique="true")
AssociationsDef(Name="MaterialAssociations" Version="0"
NumberOfRequiredValues="0" Extensible="true")
MembershipMask volume
ItemDefinitions
Double(Name="density" Label="Density (rho)" Optional="false")
BriefDescription Mass density of the material phase
+categories-all
RangeInfo
Min(Inclusive="false") 0.0
Double(Name="density-deviation" Label="Density Deviation"
Optional="true" IsEnabledByDefault="false")
BriefDescription
| The relative deviation of the true temperature-dependent
| density from the reference density
+categories-all
DefaultValue 0.0
ExpressionType fn.material
Double(Name="conductivity" Label="Conductivity (K)")
BriefDescription Thermal conductivity of the material phase
+categories-all
ExpressionType fn.material
RangeInfo
Min(Inclusive="false") 0.0
Double(Name="specific-heat" Label="Specific Heat (Cp)")
BriefDescription Specific heat of the material phase
+categories-all
ExpressionType fn.material
RangeInfo
Min(Inclusive="false") 0.0
// Electromagnetic properties
+electrical
AttDef(Type="phase-solid" BaseType="phase" Label="Solid")
AttDef(Type="phase-fluid" BaseType="phase" Label="Fluid")
ItemDefinitions
Double(Name="viscosity" Label="Viscosity (nu)")
BriefDescription
| The dynamic viscosity of a fluid phase
+categories-all
DefaultValue 0.0
ExpressionType fn.material
RangeInfo
Min(Inclusive="false") 0.0
AttDef(Type="phase-transition" BaseType="" Label="Transition" Version="0")
AssociationsDef(Name="MaterialAssociations" Version="0"
NumberOfRequiredValues="0" Extensible="true")
MembershipMask volume
ItemDefinitions
Component(Name="lower" Label="Lower Phase" NumberOfRequiredValues="1")
Accepts
Resource(Name="smtk::attribute::Resource" Filter="attribute[type='phase']")
+categories-all
Double(Name="latent-heat" Label="Latent Heat (Lf)")
+categories-all
RangeInfo
Min(Inclusive="false") 0.0
Double(Name="lower-transition-temperature" Label="Lower Transition Temperature (Ts)")
+categories-all
DefaultValue 0.0
Double(Name="upper-transition-temperature" Label="Upper Transition Temperature (Tl)")
+categories-all
DefaultValue 100.0
Component(Name="upper" Label="Upper Phase" NumberOfRequiredValues="1")
+categories-all
Accepts
Resource(Name="smtk::attribute::Resource" Filter="attribute[type='phase']")
//-AttDef(Type="material" Label="Material" BaseType="" Version="0" Unique="true")
AssociationsDef(Name="MaterialAssociations" Version="0"
NumberOfRequiredValues="0" Extensible="true")
MembershipMask volume
......
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