Commit 78c28c33 authored by John Tourtellott's avatar John Tourtellott

Update background-material def and other definitions

* AttributeRef display not working, so migrated to Component definition
* Start internal/dev folder to put working exemplars
parent c8b696ea
......@@ -127,22 +127,28 @@
<View Type="Group" Title="Materials" TabPosition="North">
<Views>
<!--View Title="Background Material" /-->
<View Title="Material" />
<View Title="Material Assignment" />
<View Title="Material Assignment Group" />
<View Title="Background Material" />
</Views>
</View>
<!-- <View Type="Instanced" Title="Background Material">
<View Type="Instanced" Title="Background Material">
<InstancedAttributes>
<Att Name="Background Material" Type="background-material" />
</InstancedAttributes>
</View> -->
</View>
<View Type="Attribute" Title="Material" Label="Specification" HideAssociations="true">
<AttributeTypes>
<Att Type="material"/>
</AttributeTypes>
</View>
<View Type="Associations" Title="Material Assignment" Label="Assignment">
<View Type="Group" Name="Material Assignment Group" Label="Assignment" Style="Tiled">
<Views>
<View Title="Background Material" />
<View Title="Material Assignment" />
</Views>
</View>
<View Type="Associations" Title="Material Assignment" Label="Element Block Assignment">
<AttributeTypes>
<Att Type="material" />
</AttributeTypes>
......
<SMTK_AttributeResource Version="3">
<!--
This example shows the syntax for <Component> definitions, which
replace the <AttributeRef> defintions, which do not appear to
display any more.
-->
<Definitions>
<AttDef Type="material">
</AttDef>
<!-- AttributeRef items do NOT appear -->
<AttDef Type="material-attref">
<ItemDefinitions>
<AttributeRef Name="material-ref" NumberOfRequiredValues="1">
<AttDef>material</AttDef>
</AttributeRef>
</ItemDefinitions>
</AttDef>
<!-- Component items DO appear -->
<AttDef Type="material-comp">
<ItemDefinitions>
<Component Name="att" NumberOfRequiredValues="1">
<Accepts>
<!-- Note that the predicate [type='...'] is REQUIRED -->
<Resource Name="smtk::attribute::Resource" Filter="attribute[type='material']" />
</Accepts>
</Component>
</ItemDefinitions>
</AttDef>
<!-- Reference items do NOT appear -->
<AttDef Type="material-ref">
<ItemDefinitions>
<Reference Name="att" NumberOfRequiredValues="1">
<Accepts>
<Resource Name="smtk::attribute::Resource" Filter="attribute[type='material']" />
</Accepts>
</Reference>
</ItemDefinitions>
</AttDef>
<AttDef Type="data">
<ItemDefinitions>
<Double Name="Some Data">
<DefaultValue>3.14159</DefaultValue>
</Double>
</ItemDefinitions>
</AttDef>
</Definitions>
<Views>
<View Type="Group" Title="AttRefs" TopLevel="true">
<Views>
<View Title="Material" />
<View Title="InstanceAttRef" />
<View Title="InstanceComp" />
<View Title="InstanceRef" />
</Views>
</View>
<View Type="Attribute" Title="Material">
<AttributeTypes>
<Att Type="material" />
</AttributeTypes>
</View>
<View Type="Instanced" Title="InstanceAttRef">
<InstancedAttributes>
<Att Name="Ref" Type="material-attref" />
<Att Name="Data" Type="data" />
</InstancedAttributes>
</View>
<View Type="Instanced" Title="InstanceComp">
<InstancedAttributes>
<Att Name="Comp" Type="material-comp" />
<Att Name="Data" Type="data" />
</InstancedAttributes>
</View>
<View Type="Instanced" Title="InstanceRef">
<InstancedAttributes>
<Att Name="Ref" Type="material-ref" />
<Att Name="Data" Type="data" />
</InstancedAttributes>
</View>
</Views>
</SMTK_AttributeResource>
<SMTK_AttributeResource Version="3">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -9,14 +8,16 @@
<Definitions>
<AttDef Type="background-material" Label="Background Material" BaseType="" Version="0" Unique="true">
<ItemDefinitions>
<AttributeRef Name="background-material" Label="Background Material" NumberOfRequiredValues="1">
<AttDef>material</AttDef>
</AttributeRef>
<Void Name="placeholder" AdvanceLevel="99">
<Component Name="background-material" Label="Background Material" NumberOfRequiredValues="1" Unique="true" Version="1">
<Accepts>
<Resource Name="smtk::attribute::Resource" Filter="attribute[type='material']"/>
</Accepts>
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
</Void>
</Component>
</ItemDefinitions>
</AttDef>
<AttDef Type="material" Label="Material" BaseType="" Version="0" Unique="true">
......@@ -26,7 +27,6 @@
<ItemDefinitions>
<String Name="material-type" Label="Material Type">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -35,7 +35,6 @@
<Double Name="density" Label="Density (rho)" Optional="false">
<BriefDescription>Mass density of the material phase</BriefDescription>
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -50,7 +49,6 @@
<BriefDescription>The relative deviation of the true temperature-dependent
density from the reference density</BriefDescription>
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -60,7 +58,6 @@ density from the reference density</BriefDescription>
<Double Name="conductivity" Label="Conductivity (K)">
<BriefDescription>Thermal conductivity of the material phase</BriefDescription>
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -74,7 +71,6 @@ density from the reference density</BriefDescription>
<Double Name="viscosity" Label="Viscosity (nu)">
<BriefDescription>The dynamic viscosity of a fluid phase</BriefDescription>
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -87,7 +83,6 @@ density from the reference density</BriefDescription>
</Double>
<String Name="thermal" Label="Thermal Specification">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -96,7 +91,6 @@ density from the reference density</BriefDescription>
<Double Name="specific-heat" Label="Specific Heat (Cp)">
<BriefDescription>Specific heat of the material phase</BriefDescription>
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -109,7 +103,6 @@ density from the reference density</BriefDescription>
</Double>
<Double Name="enthalpy" Label="Enthalpy (E)">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -138,7 +131,6 @@ density from the reference density</BriefDescription>
</String>
<String Name="thermal-two-phase" Label="Thermal Specification">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -147,7 +139,6 @@ density from the reference density</BriefDescription>
<Double Name="specific-heat" Label="Specific Heat (Cp)">
<BriefDescription>Specific heat of the material phase</BriefDescription>
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -161,7 +152,6 @@ density from the reference density</BriefDescription>
<Double Name="latent-heat" Label="Latent Heat (Lf)">
<BriefDescription>The latent heats of the phase transformations.</BriefDescription>
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -173,7 +163,6 @@ density from the reference density</BriefDescription>
</Double>
<Double Name="enthalpy" Label="Enthalpy (E)">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -204,7 +193,6 @@ density from the reference density</BriefDescription>
<!-- Two phase properties-->
<Double Name="solid-transition-temperature" Label="Solidus Temperature (Ts)">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -213,7 +201,6 @@ density from the reference density</BriefDescription>
</Double>
<Double Name="liquid-transition-temperature" Label="Liquidus Temperature (Tl)">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -223,7 +210,6 @@ density from the reference density</BriefDescription>
<!-- Void material properties-->
<Double Name="void-temperature" Label="Temperature">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......@@ -232,7 +218,6 @@ density from the reference density</BriefDescription>
</Double>
<Double Name="sound-speed" Label="Speed of Sound" AdvanceLevel="1">
<Categories>
<Cat>Enclosure Radiation</Cat>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
......
......@@ -9,7 +9,7 @@
<Definitions>
<AttDef Type="mesh" Label="Mesh" BaseType="" Version="0" Unique="true">
<ItemDefinitions>
<Double Name="coordinate-scale-factor" Label="Coordinate Scale Factor" Version="0" AdvanceLevel="1" Optional="true" IsEnabledByDefault="false">
<Double Name="coordinate-scale-factor" Label="Coordinate Scale Factor" Version="0" Optional="true" IsEnabledByDefault="false">
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
......@@ -54,13 +54,13 @@
<Min Inclusive="true">0.0</Min>
</RangeInfo>
</Double>
<Double Name="output-dt" Label="Output Delta-Time Multiplier" Version="0">
<Double Name="output-dt" Label="Initial Output Delta-Time" Version="0">
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<DefaultValue>0.1</DefaultValue>
<DefaultValue>1.0</DefaultValue>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
</RangeInfo>
......@@ -75,7 +75,7 @@
</Categories>
<ComponentLabels>
<Label>After time:</Label>
<Label>Use delta time multiplier:</Label>
<Label>Use delta time:</Label>
</ComponentLabels>
</Double>
</ItemDefinitions>
......
mixin categories-all
Categories
Cat Enclosure Radiation
Cat Fluid Flow
Cat Heat Transfer
Cat Solid Mechanics
......@@ -14,12 +13,15 @@ SMTK_AttributeResource(Version="3")
AttDef(Type="background-material" Label="Background Material" BaseType=""
Version="0" Unique="true")
ItemDefinitions
AttributeRef(Name="background-material" Label="Background Material"
NumberOfRequiredValues="1")
AttDef material
Void(Name="placeholder" AdvanceLevel="99")
Categories
Cat Heat Transfer
//- AttributeRef(Name="background-material" Label="Background Material"
//- NumberOfRequiredValues="1")
//- AttDef material
//- +categories-all
Component(Name="background-material" Label="Background Material"
NumberOfRequiredValues="1" Unique="true" Version="1")
Accepts
Resource(Name="smtk::attribute::Resource" Filter="attribute[type='material']")
+categories-all
AttDef(Type="material" Label="Material" BaseType="" Version="0" Unique="true")
AssociationsDef(Name="MaterialAssociations" Version="0"
......
......@@ -13,7 +13,7 @@ SMTK_AttributeResource(Version="3")
AttDef(Type="mesh" Label="Mesh" BaseType="" Version="0" Unique="true")
ItemDefinitions
Double(Name="coordinate-scale-factor" Label="Coordinate Scale Factor" Version="0"
AdvanceLevel="1" Optional="true" IsEnabledByDefault="false")
Optional="true" IsEnabledByDefault="false")
+categories-all
DefaultValue 1.0
Int(Name="exodus-block-modulus" Label="Exodus Block Modulus" Version="0"
......@@ -35,9 +35,9 @@ SMTK_AttributeResource(Version="3")
DefaultValue 1.0
RangeInfo
Min(Inclusive="true") 0.0
Double(Name="output-dt" Label="Output Delta-Time Multiplier" Version="0")
Double(Name="output-dt" Label="Initial Output Delta-Time" Version="0")
+categories-all
DefaultValue 0.1
DefaultValue 1.0
RangeInfo
Min(Inclusive="true") 0.0
Group(Name="output-times" Label="Additional Output Control"
......@@ -47,7 +47,7 @@ SMTK_AttributeResource(Version="3")
+categories-all
ComponentLabels
Label After time:
Label Use delta time multiplier:
Label Use delta time:
AttDef(Type="physics" Label="Physics" BaseType="" Version="0" Unique="true")
ItemDefinitions
......
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