Commit 4d50eff4 authored by John Tourtellott's avatar John Tourtellott

Refactor & add back fluid and enclosure attributes

parent 65fa6bc4
......@@ -12,6 +12,7 @@ declare -a names=( \
"thermal-surface-condition" \
"material" \
"numerics-solver" \
"fluid-numerics" \
"enclosure" \
"other" \
)
......
......@@ -52,6 +52,9 @@
<String Name="description" Label="Description" MultipleLInes="true" Optional="true" IsEnabledByDefault="false"></String>
<Double Name="coords" Label="Coordinates" NumberOfRequiredValues="3">
<BriefDescription>Used to define the location of the probe</BriefDescription>
<Categories>
<Cat>Heat Transfer</Cat>
</Categories>
<ComponentLabels>
<Label>x:</Label>
<Label>y:</Label>
......
This diff is collapsed.
......@@ -8,9 +8,15 @@
<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">
<Categories>
<Cat>Heat Transfer</Cat>
</Categories>
<DefaultValue>1.0</DefaultValue>
</Double>
<Int Name="exodus-block-modulus" Label="Exodus Block Modulus" Version="0" AdvanceLevel="1" Optional="true" IsEnabledByDefault="false">
<Categories>
<Cat>Heat Transfer</Cat>
</Categories>
<DefaultValue>10000</DefaultValue>
<RangeInfo>
<Min Inclusive="false">0</Min>
......
......@@ -58,6 +58,8 @@ SMTK_AttributeResource(Version="3")
Optional="true" IsEnabledByDefault="false")
Double(Name="coords" Label="Coordinates" NumberOfRequiredValues="3")
BriefDescription Used to define the location of the probe
Categories
Cat Heat Transfer
ComponentLabels
Label x:
Label y:
......
......@@ -11,9 +11,13 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
Double(Name="coordinate-scale-factor" Label="Coordinate Scale Factor" Version="0"
AdvanceLevel="1" Optional="true" IsEnabledByDefault="false")
Categories
Cat Heat Transfer
DefaultValue 1.0
Int(Name="exodus-block-modulus" Label="Exodus Block Modulus" Version="0"
AdvanceLevel="1" Optional="true" IsEnabledByDefault="false")
Categories
Cat Heat Transfer
DefaultValue 10000
RangeInfo
Min(Inclusive="false") 0
......
<?xml version="1.0" encoding="utf-8" ?>
<SMTK_AttributeSystem Version="2">
<Views>
<View Type="Group" Title="Fluid Flow" TabPosition="North" TabIcons="false">
<Views>
<View Title="FF Boundary Conditions" />
<View Title="FF Solver" />
</Views>
</View>
<View Type="Attribute" Title="FF Boundary Conditions" Label="Boundary Conditions">
<AttributeTypes>
<Att Type="boundary-condition"/>
</AttributeTypes>
</View>
<View Type="Instanced" Title="FF Solver" Label="Solver">
<InstancedAttributes>
<Att Type="fluid-solver" Name="fluid-solver" />
</InstancedAttributes>
</View>
</Views>
</SMTK_AttributeSystem>
<?xml version="1.0" encoding="utf-8" ?>
<SMTK_AttributeSystem Version="2">
<Views>
<View Type="Group" Title="Heat Transfer" TabPosition="North" TabIcons="false">
<Views>
<View Title="HT Surface Conditions" />
<View Title="HT Solver" />
<View Title="HT Sources" />
</Views>
</View>
<View Type="Group" Title="HT Surface Conditions" Label="Boundary Conditions" TabPosition="North" TabIcon="false">
<Views>
<View Title="HT Boundary Conditions"/>
<View Title="HT Interface Conditions"/>
</Views>
</View>
<View Type="Attribute" Title="HT Boundary Conditions" Label="Boundary">
<AttributeTypes>
<Att Type="thermal-boundary-condition"/>
</AttributeTypes>
</View>
<View Type="Attribute" Title="HT Interface Conditions" Label="Interface">
<AttributeTypes>
<Att Type="thermal-interface-condition"/>
</AttributeTypes>
</View>
<View Type="Instanced" Title="HT Solver" Label="Solver">
<InstancedAttributes>
<Att Name="Solver" Type="thermal-solver" />
</InstancedAttributes>
</View>
<View Type="Attribute" Title="HT Sources" Label="Sources">
<AttributeTypes>
<Att Type="ds-source" />
</AttributeTypes>
</View>
</Views>
</SMTK_AttributeSystem>
......@@ -23,14 +23,19 @@
<File>internal/templates/material.sbt</File>
<File>internal/templates/thermal-surface-condition.sbt</File>
<File>internal/templates/boundary-condition.sbt</File>
<File>internal/templates/fluid-numerics.sbt</File>
<File>internal/templates/numerics-solver.sbt</File>
<File>internal/templates/body-source-probe.sbt</File>
<File>internal/templates/enclosure.sbt</File>
<File>internal/templates/other.sbt</File>
<File>internal/templates/initial-conditions.sbt</File>
<File>internal/templates/views/fluid-flow-views.sbt</File>
<File>internal/templates/views/heat-transfer-views.sbt</File>
</Includes>
<Definitions>
<!-- For enabling simulation modules -->
<AttDef Type="analysis">
<ItemDefinitions>
<Group Name="Heat Transfer" Optional="true" IsEnabledByDefault="false">
......@@ -79,7 +84,7 @@
</AttDef>
<!-- Selector attribute - used by selector view-->
<AttDef Type="ModuleSelectorAtt" Version="0">
<!-- <AttDef Type="ModuleSelectorAtt" Version="0">
<ItemDefinitions>
<String Name="ModuleSelectorItem" Label="Select Module:">
<DiscreteInfo DefaultIndex="1">
......@@ -91,7 +96,7 @@
</DiscreteInfo>
</String>
</ItemDefinitions>
</AttDef>
</AttDef> -->
</Definitions>
......@@ -101,15 +106,15 @@
FilterByAdvanceLevel="true" FilterByCategory="false">
<Views>
<View Title="Analysis" />
<!--View Title="Selector SimBuilder" /-->
<View Title="Materials" />
<View Title="SimBuilderModules" />
<!--View Title="Material Assignment" /-->
<View Title="Modules" />
<View Title="Body" />
<View Title="Globals" />
<View Title="Other" />
</Views>
</View>
<!-- Placeholder for "analysis view" Todo -->
<View Type="Group" Title="Analysis" Style="Tiled">
<Views>
<View Title="SelectModules" />
......@@ -123,21 +128,11 @@
</InstancedAttributes>
</View>
<!-- <View Type="Category" Title="SimBuilder" TopLevel="false"
FilterByAdvanceLevel="true" FilterByCategoryMode="alwaysOn" FilterByCategoryLabel="Modules">
<DefaultColor>1., 1., 0.5, 1.</DefaultColor>
<InvalidColor>1, 0.5, 0.5, 1</InvalidColor>
<AdvancedFontEffects />
<Views>
<View Title="Heat Transfer" Category="Heat Transfer" />
</Views>
</View>
-->
<View Type="Group" Name="SimBuilderModules" Label="Modules" TabPosition="North">
<View Type="Group" Name="Modules" Label="Modules" TabPosition="North">
<Views>
<View Title="Enclosure Radiation" />
<View Title="Fluid Flow" />
<View Title="Heat Transfer" />
<View Title="Fluid Flow" /> <!-- In views/fluid-flow-views.sbt -->
<View Title="Heat Transfer" /> <!-- In views/heat-transfer-views.sbt -->
<View Title="Induction Heating" />
<View Title="Solid Mechanics" />
</Views>
......@@ -145,30 +140,20 @@
<View Type="Instanced" Name="Enclosure Radiation">
<InstancedAttributes>
<!--Att Name="enclosure-radiation" Type="enclosure-radiation" /-->
</InstancedAttributes>
</View>
<View Type="Instanced" Name="Fluid Flow">
<InstancedAttributes>
<Att Name="enclosure-radiation" Type="enclosure-radiation" />
</InstancedAttributes>
</View>
<View Type="Instanced" Name="Induction Heating">
<InstancedAttributes>
</InstancedAttributes>
</View>
<View Type="Instanced" Name="Solid Mechanics">
<InstancedAttributes>
</InstancedAttributes>
</View>
<View Type="Group" Title="Heat Transfer" TabPosition="North" TabIcons="false">
<Views>
<View Title="Boundary Conditions" />
<View Title="Solver" />
<View Title="Sources" />
<!--View Title="Functions"/-->
</Views>
</View>
<View Type="Group" Title="Materials" TabPosition="North">
<Views>
......@@ -177,41 +162,18 @@
<View Title="Material Assignment" />
</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">
<AttributeTypes>
<Att Type="material"/>
</AttributeTypes>
</View>
<View Type="Instanced" Title="Material Assignment" Label="Assignment">
</View>
<View Type="Group" Title="Boundary Conditions" TabPosition="North" TabIcon="false">
<Views>
<View Title="Thermal Boundary Conditions"/>
<View Title="Thermal Interface Conditions"/>
</Views>
</View>
<View Type="Attribute" Title="Thermal Boundary Conditions" Label="Boundary">
<AttributeTypes>
<Att Type="thermal-boundary-condition"/>
</AttributeTypes>
</View>
<View Type="Attribute" Title="Thermal Interface Conditions" Label="Interface">
<AttributeTypes>
<Att Type="thermal-interface-condition"/>
</AttributeTypes>
</View>
<View Type="Instanced" Title="Solver">
<InstancedAttributes>
<Att Name="Solver" Type="thermal-solver" />
</InstancedAttributes>
<!-- Todo association view -->
</View>
<View Type="Group" Title="Body" Label="Initial Conditions" TabPosition="North">
......@@ -233,30 +195,15 @@
</AttributeTypes>
</View>
<View Type="Attribute" Title="Sources">
<AttributeTypes>
<Att Type="ds-source" />
</AttributeTypes>
</View>
<View Type="Instanced" Title="Enclosure">
<InstancedAttributes>
<Att Name="Enclosure" Type="enclosure-radiation" />
</InstancedAttributes>
</View>
<View Type="Group" Title="Other" Style="tiled">
<View Type="Group" Title="Other" Style="tiled">
<Views>
<View Title="Other Instanced" />
<View Title="Probes" />
</Views>
</View>
<View Type="Instanced" Title="Other Instanced">
<View Type="Instanced" Title="Other Instanced" Label="Mesh">
<InstancedAttributes>
<Att Name="Mesh" Type="mesh" />
<Att Name="Outputs" Type="outputs" />
<Att Name="Physics" Type="physics" />
<Att Name="Physical Constants" Type="physical-constants" />
</InstancedAttributes>
</View>
<View Type="Attribute" Title="Probes">
......@@ -273,6 +220,7 @@
<Att Name="numerics-att" Type="numerics" />
<Att Name="outputs-att" Type="outputs" />
<Att Name="simulation-control-att" Type="simulation-control" />
<!-- <Att Name="Mesh" Type="mesh" /> -->
</InstancedAttributes>
</View>
......
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