Commit 744d6c4c authored by John Tourtellott's avatar John Tourtellott

Next view revision

* Redo material/body into 3 parts: material library,
  material assignment, and initial conditions
* Moved General tab contents to Analysis tab
parent bf950d6c
...@@ -14,18 +14,7 @@ ...@@ -14,18 +14,7 @@
<MembershipMask>volume</MembershipMask> <MembershipMask>volume</MembershipMask>
</AssociationsDef> </AssociationsDef>
<ItemDefinitions> <ItemDefinitions>
<Component Name="material-ref" Label="Material" NumberOfRequiredValues="1" Version="0"> <Double Name="temperature" Label="Temperature" Optional="true" IsEnabledByDefault="true">
<Accepts>
<Resource Name="smtk::attribute::Resource" Filter="attribute"></Resource>
</Accepts>
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Induction Heating</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
</Component>
<Double Name="temperature" Label="Temperature">
<BriefDescription>Initial temperature of the material body</BriefDescription> <BriefDescription>Initial temperature of the material body</BriefDescription>
<Categories> <Categories>
<Cat>Fluid Flow</Cat> <Cat>Fluid Flow</Cat>
...@@ -33,7 +22,7 @@ ...@@ -33,7 +22,7 @@
</Categories> </Categories>
<ExpressionType>tabular-function</ExpressionType> <ExpressionType>tabular-function</ExpressionType>
</Double> </Double>
<Double Name="velocity" Label="Velocity" NumberOfRequiredValues="3"> <Double Name="velocity" Label="Velocity" NumberOfRequiredValues="3" Optional="true" IsEnabledByDefault="false">
<BriefDescription>Initial velocity of the material body</BriefDescription> <BriefDescription>Initial velocity of the material body</BriefDescription>
<Categories> <Categories>
<Cat>Fluid Flow</Cat> <Cat>Fluid Flow</Cat>
......
...@@ -53,7 +53,7 @@ when estimating the next cycle time step.</BriefDescription> ...@@ -53,7 +53,7 @@ when estimating the next cycle time step.</BriefDescription>
<!-- Simulation Control--> <!-- Simulation Control-->
<AttDef Type="simulation-control" Label="Simulation Control" BaseType="" Version="0" Unique="true"> <AttDef Type="simulation-control" Label="Simulation Control" BaseType="" Version="0" Unique="true">
<ItemDefinitions> <ItemDefinitions>
<Group Name="simulation-control" Label="Simulation Control (for non-radiation only)" Optional="true" IsEnabledByDefault="false"> <Group Name="simulation-control" Label="Simulation Control" Optional="true" IsEnabledByDefault="false">
<BriefDescription>This item is superseded by the displacement sequence when <BriefDescription>This item is superseded by the displacement sequence when
moving-enclosure radiation is enabled</BriefDescription> moving-enclosure radiation is enabled</BriefDescription>
<ItemDefinitions> <ItemDefinitions>
......
...@@ -17,23 +17,23 @@ SMTK_AttributeResource(Version="3") ...@@ -17,23 +17,23 @@ SMTK_AttributeResource(Version="3")
NumberOfRequiredValues="0" Extensible="true") NumberOfRequiredValues="0" Extensible="true")
MembershipMask volume MembershipMask volume
ItemDefinitions ItemDefinitions
Component(Name="material-ref" Label="Material" NumberOfRequiredValues="1" Version="0") //- Component(Name="material-ref" Label="Material" NumberOfRequiredValues="1" Version="0")
Accepts //- Accepts
Resource(Name="smtk::attribute::Resource" Filter="attribute") //- Resource(Name="smtk::attribute::Resource" Filter="attribute")
Categories //- Categories
Cat Fluid Flow //- Cat Fluid Flow
Cat Heat Transfer //- Cat Heat Transfer
Cat Induction Heating //- Cat Induction Heating
Cat Solid Mechanics //- Cat Solid Mechanics
Double(Name="temperature" Label="Temperature") Double(Name="temperature" Label="Temperature" Optional="true" IsEnabledByDefault="true")
BriefDescription Initial temperature of the material body BriefDescription Initial temperature of the material body
Categories Categories
Cat Fluid Flow Cat Fluid Flow
Cat Heat Transfer Cat Heat Transfer
ExpressionType tabular-function ExpressionType tabular-function
Double(Name="velocity" Label="Velocity" NumberOfRequiredValues="3") Double(Name="velocity" Label="Velocity" NumberOfRequiredValues="3" Optional="true" IsEnabledByDefault="false")
BriefDescription Initial velocity of the material body BriefDescription Initial velocity of the material body
Categories Categories
Cat Fluid Flow Cat Fluid Flow
......
...@@ -48,7 +48,7 @@ SMTK_AttributeSystem(Version="2") ...@@ -48,7 +48,7 @@ SMTK_AttributeSystem(Version="2")
Version="0" Unique="true") Version="0" Unique="true")
ItemDefinitions ItemDefinitions
Group(Name="simulation-control" Group(Name="simulation-control"
Label="Simulation Control (for non-radiation only)" Label="Simulation Control"
Optional="true" IsEnabledByDefault="false") Optional="true" IsEnabledByDefault="false")
BriefDescription BriefDescription
| This item is superseded by the displacement sequence when | This item is superseded by the displacement sequence when
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</Includes> </Includes>
<Definitions> <Definitions>
<AttDef Type="configuration"> <AttDef Type="analysis">
<ItemDefinitions> <ItemDefinitions>
<Group Name="Heat Transfer" Optional="true" IsEnabledByDefault="false"> <Group Name="Heat Transfer" Optional="true" IsEnabledByDefault="false">
<ItemDefinitions> <ItemDefinitions>
...@@ -99,22 +99,32 @@ ...@@ -99,22 +99,32 @@
<View Type="Group" Title="TopLevel" TopLevel="true" TabPosition="North" <View Type="Group" Title="TopLevel" TopLevel="true" TabPosition="North"
FilterByAdvanceLevel="true" FilterByCategory="false"> FilterByAdvanceLevel="true" FilterByCategory="false">
<Views> <Views>
<View Title="Configuration" /> <View Title="Analysis" />
<View Title="Selector SimBuilder" /> <View Title="Selector SimBuilder" />
<View Title = "Export" /> <View Title="Material Assignment" />
<View Title="Body" />
<View Title="Globals" />
<View Title="Materials" />
</Views> </Views>
</View> </View>
<View Type="Instanced" Title="Configuration" Label="Analysis"> <!-- <View Type="Instanced" Title="Analysis">
<InstancedAttributes> <InstancedAttributes>
<Att Name="config-att" Type="configuration"></Att> <Att Name="analysis-att" Type="analysis"></Att>
</InstancedAttributes> </InstancedAttributes>
</View> </View>
-->
<View Type="Group" Title="Analysis" Style="Tiled">
<Views>
<View Title="Modules" />
<View Title="General" />
</Views>
</View>
<View Type="Instanced" Title="Export"> <View Type="Instanced" Title="Modules">
<InstancedAttributes> <InstancedAttributes>
<Att Name="export-att" Type="export"></Att> <Att Name="analysis-att" Type="analysis"></Att>
</InstancedAttributes> </InstancedAttributes>
</View> </View>
...@@ -138,18 +148,14 @@ ...@@ -138,18 +148,14 @@
<View Type="Group" Title="Heat Transfer" TabPosition="North" TabIcons="false"> <View Type="Group" Title="Heat Transfer" TabPosition="North" TabIcons="false">
<Views> <Views>
<View Title="Materials"/>
<View Title="Boundary Conditions" /> <View Title="Boundary Conditions" />
<View Title="Solver" /> <View Title="Solver" />
<View Title="Body" />
<View Title="Sources" /> <View Title="Sources" />
<View Title="General" />
<View Title="Globals" />
<!--View Title="Functions"/--> <!--View Title="Functions"/-->
</Views> </Views>
</View> </View>
<View Type="Group" Title="Materials" Style="Tiled"> <View Type="Group" Title="Materials" Label="Library" Style="Tiled">
<Views> <Views>
<View Title="Background Material" /> <View Title="Background Material" />
<View Title="Material" /> <View Title="Material" />
...@@ -166,6 +172,9 @@ ...@@ -166,6 +172,9 @@
</AttributeTypes> </AttributeTypes>
</View> </View>
<View Type="Instanced" Title="Material Assignment" Label="Materials">
</View>
<View Type="Group" Title="Boundary Conditions" TabPosition="North" TabIcon="false"> <View Type="Group" Title="Boundary Conditions" TabPosition="North" TabIcon="false">
<Views> <Views>
<View Title="Thermal Boundary Conditions"/> <View Title="Thermal Boundary Conditions"/>
...@@ -189,7 +198,7 @@ ...@@ -189,7 +198,7 @@
</InstancedAttributes> </InstancedAttributes>
</View> </View>
<View Type="ModelEntity" Title="Body" ModelEntityFilter="volume" ColHeader2="Body"> <View Type="ModelEntity" Title="Body" Label="Initial Conditions" ModelEntityFilter="volume" ColHeader2="Body">
<AttributeTypes> <AttributeTypes>
<Att Name="body" Type="body" /> <Att Name="body" Type="body" />
</AttributeTypes> </AttributeTypes>
......
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