Commit ba563989 authored by John Tourtellott's avatar John Tourtellott

Change attribute naming convention to use "." in lieu of "/"

To avoid ambiguity with item paths, which use "/" by default
parent de169b2a
......@@ -353,11 +353,11 @@ namelist_sequence = [
namelist('MATERIAL', custom_method='_write_materials'),
namelist('DIFFUSION_SOLVER',
if_condition=ONLY_THERMAL_ANALYSIS,
att_type='ht/solver',
att_type='ht.solver',
base_item_path='analysis/thermal'),
namelist('DIFFUSION_SOLVER',
if_condition=[THERMAL_ANALYSIS, FLOW_ANALYSIS],
att_type='ht/solver',
att_type='ht.solver',
base_item_path='analysis/thermal-plus-fluid/thermal-solver'),
namelist('CHAPARRAL', att_type='enclosure-radiation',
base_item_path='chaparral',
......@@ -373,16 +373,16 @@ namelist_sequence = [
base_item_path='analysis/fluid/viscous-flow-model/viscous-linear-solver'),
namelist(
'DS_BOUNDARY_CONDITION',
att_type='ht/boundary',
att_type='ht.boundary',
custom_method='_write_thermal_condition'),
namelist(
'DS_INTERFACE_CONDITION',
att_type='ht/interface',
att_type='ht.interface',
custom_method='_write_thermal_condition'),
namelist('BC',
att_type='boundary-condition', custom_method='_write_bc'),
namelist('BODY', att_type='material', custom_method='_write_body'),
namelist('DS_SOURCE', att_type='ht/source'),
namelist('DS_SOURCE', att_type='ht.source'),
namelist('PROBE', att_type='probe'),
namelist(
'SIMULATION_CONTROL',
......
......@@ -70,21 +70,21 @@
<Exclusions>
<!-- HT BCs are either exterior (boundary) or interface -->
<Rule>
<Def>ht/boundary</Def>
<Def>ht/interface</Def>
<Def>ht.boundary</Def>
<Def>ht.interface</Def>
</Rule>
<!-- HT Dirichlet BCs are exclusive to other exterior BCs -->
<!-- HT Flux BCs are exclusinve to HTC and Radiation BCs-->
<Rule>
<Def>ht/boundary/dirichlet</Def>
<Def>ht/boundary/flux</Def>
<Def>ht/boundary/HTC</Def>
<Def>ht.boundary.dirichlet</Def>
<Def>ht.boundary.flux</Def>
<Def>ht.boundary.HTC</Def>
</Rule>
<Rule>
<Def>ht/boundary/dirichlet</Def>
<Def>ht/boundary/flux</Def>
<Def>ht/boundary/radiation</Def>
<Def>ht.boundary.dirichlet</Def>
<Def>ht.boundary.flux</Def>
<Def>ht.boundary.radiation</Def>
</Rule>
</Exclusions>
......@@ -165,6 +165,7 @@
<Views>
<View Title="Material" />
<View Title="Material Assignment Group" />
<View Title="Material Functions" />
</Views>
</View>
<View Type="Attribute" Title="Material" Label="Specification" HideAssociations="true">
......@@ -188,6 +189,11 @@
<Att Type="material" />
</AttributeTypes>
</View>
<View Type="Attribute" Title="Material Functions" Label="Functions">
<AttributeTypes>
<Att Type="fn.material" />
</AttributeTypes>
</View>
<View Type="Group" Title="Body" Label="Initial Conditions" TabPosition="North">
<Views>
......@@ -224,11 +230,6 @@
<Att Type="probe" />
</AttributeTypes>
</View>
<View Type="Attribute" Title="Functions">
<AttributeTypes>
<Att Type="fn" />
</AttributeTypes>
</View>
<View Type="Instanced" Title="General">
<InstancedAttributes>
......@@ -242,7 +243,6 @@
<View Type="Group" Title="Globals" Style="Tiled">
<Views>
<View Title="Global Constants" />
<View Title="Functions" />
</Views>
</View>
......
......@@ -10,7 +10,7 @@
<Definitions>
<!-- Note: BODY attribute replaced by standalone initial conditions defintiions (December 2018)-->
<!-- DS_SOURCE-->
<AttDef Type="ht/source" Label="Volumetric Heat Source" BaseType="" Version="0">
<AttDef Type="ht.source" Label="Volumetric Heat Source" BaseType="" Version="0">
<AssociationsDef Name="DSSourceAssociations" Version="0" NumberOfRequiredValues="0" Extensible="true">
<MembershipMask>volume</MembershipMask>
</AssociationsDef>
......
......@@ -5,9 +5,10 @@
</Categories>
<!-- Attribute definitions for item-specific functions-->
<Definitions>
<AttDef Type="fn" BaseType="" Abstract="true" Version="0"></AttDef>
<AttDef Type="fn.material" BaseType="" Abstract="true" Version="0"></AttDef>
<AttDef Type="fn.initial-condition" BaseType="" Abstract="true" Version="0"></AttDef>
<!-- Specific Heat function of Temp-->
<AttDef Type="fn/specific-heat" BaseType="fn" Label="Specific Heat" RootName="SpecificHeatFn" Version="0">
<AttDef Type="fn.material.specific-heat" BaseType="fn.material" Label="Specific Heat" RootName="SpecificHeatFn" Version="0">
<ItemDefinitions>
<String Name="type" Label="Function Type" Version="0" stuff="Heat Transfer">
<Categories>
......@@ -88,7 +89,7 @@
</ItemDefinitions>
</AttDef>
<!-- Thermal Conductivity function of Temp-->
<AttDef Type="fn/conductivity" BaseType="fn" Label="Conductivity" RootName="ConductivityFn" Version="0">
<AttDef Type="fn.material.conductivity" BaseType="fn.material" Label="Conductivity" RootName="ConductivityFn" Version="0">
<ItemDefinitions>
<String Name="type" Label="Function Type" Version="0" stuff="Heat Transfer">
<Categories>
......@@ -169,7 +170,7 @@
</ItemDefinitions>
</AttDef>
<!-- Initial Temperature function of x,y,z-->
<AttDef Type="fn/temperature" BaseType="fn" Label="Initial Temperature" RootName="TemperatureFn" Version="0">
<AttDef Type="fn.initial-condition.temperature" BaseType="fn.initial-condition" Label="Initial Temperature" RootName="TemperatureFn" Version="0">
<ItemDefinitions>
<String Name="type" Label="Function Type" Version="0">
<Categories>
......
......@@ -18,7 +18,7 @@
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<ExpressionType>fn/temperature</ExpressionType>
<ExpressionType>fn.initial-condition.temperature</ExpressionType>
</Double>
</ItemDefinitions>
</AttDef>
......
......@@ -67,7 +67,7 @@ density from the reference density</BriefDescription>
<Cat>Induction Heating</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<ExpressionType>fn/conductivity</ExpressionType>
<ExpressionType>fn.material.conductivity</ExpressionType>
<RangeInfo>
<Min Inclusive="false">0.0</Min>
</RangeInfo>
......@@ -94,7 +94,7 @@ density from the reference density</BriefDescription>
<Cat>Induction Heating</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<ExpressionType>fn/specific-heat</ExpressionType>
<ExpressionType>fn.material.specific-heat</ExpressionType>
<RangeInfo>
<Min Inclusive="false">0.0</Min>
</RangeInfo>
......
......@@ -87,7 +87,7 @@ moving-enclosure radiation is enabled</BriefDescription>
</ItemDefinitions>
</AttDef>
<!-- Thermal Solver Settings-->
<AttDef Type="ht/solver" Label="Solver" BaseType="" Version="0" Unique="true">
<AttDef Type="ht.solver" Label="Solver" BaseType="" Version="0" Unique="true">
<ItemDefinitions>
<String Name="analysis" Label="Analysis Type">
<Categories>
......
......@@ -14,7 +14,7 @@ SMTK_AttributeResource(Version="3")
// Note: BODY attribute replaced by standalone initial conditions defintiions (December 2018)
// DS_SOURCE
AttDef(Type="ht/source" Label="Volumetric Heat Source" BaseType="" Version="0")
AttDef(Type="ht.source" Label="Volumetric Heat Source" BaseType="" Version="0")
AssociationsDef(Name="DSSourceAssociations" Version="0"
NumberOfRequiredValues="0" Extensible="true")
MembershipMask volume
......
......@@ -64,24 +64,26 @@ SMTK_AttributeResource(Version="3")
// Attribute definitions for item-specific functions
Definitions
AttDef(Type="fn" BaseType="" Abstract="true" Version="0")
//-AttDef(Type="fn" BaseType="" Abstract="true" Version="0")
AttDef(Type="fn.material" BaseType="" Abstract="true" Version="0")
AttDef(Type="fn.initial-condition" BaseType="" Abstract="true" Version="0")
// Specific Heat function of Temp
AttDef(Type="fn/specific-heat" BaseType="fn" Label="Specific Heat" RootName="SpecificHeatFn" Version="0")
AttDef(Type="fn.material.specific-heat" BaseType="fn.material" Label="Specific Heat" RootName="SpecificHeatFn" Version="0")
+fn1('Heat Transfer',
['Tabular Data', 'Temp', 'Specific Heat'],
['Center Temperature', 'Polynomial Terms', 'Coefficient', 'Exponent (Temp)'])
// Thermal Conductivity function of Temp
AttDef(Type="fn/conductivity" BaseType="fn" Label="Conductivity" RootName="ConductivityFn" Version="0")
AttDef(Type="fn.material.conductivity" BaseType="fn.material" Label="Conductivity" RootName="ConductivityFn" Version="0")
+fn1('Heat Transfer',
['Tabular Data', 'Temp', 'Conductivity'],
['Center Temperature', 'Polynomial Terms', 'Coefficient', 'Exponent (Temp)'])
// Initial Temperature function of x,y,z
AttDef(Type="fn/temperature" BaseType="fn" Label="Initial Temperature" RootName="TemperatureFn" Version="0")
AttDef(Type="fn.initial-condition.temperature" BaseType="fn.initial-condition" Label="Initial Temperature" RootName="TemperatureFn" Version="0")
ItemDefinitions
String(Name="type" Label="Function Type" Version="0" stuff=category)
Categories #[Cat Heat Transfer]
......
......@@ -65,7 +65,7 @@ SMTK_AttributeResource(Version="3")
Double(Name="conductivity" Label="Conductivity (K)")
BriefDescription Thermal conductivity of the material phase
+categories-all
ExpressionType fn/conductivity
ExpressionType fn.material.conductivity
RangeInfo
Min(Inclusive="false") 0.0
Double(Name="viscosity" Label="Viscosity (nu)")
......@@ -79,7 +79,7 @@ SMTK_AttributeResource(Version="3")
Double(Name="specific-heat" Label="Specific Heat (Cp)")
BriefDescription Specific heat of the material phase
+categories-all
ExpressionType fn/specific-heat
ExpressionType fn.material.specific-heat
RangeInfo
Min(Inclusive="false") 0.0
......
......@@ -64,7 +64,7 @@ SMTK_AttributeResource(Version="3")
+categories-all
// Thermal Solver Settings
AttDef(Type="ht/solver" Label="Solver"
AttDef(Type="ht.solver" Label="Solver"
BaseType="" Version="0" Unique="true")
ItemDefinitions
String(Name="analysis" Label="Analysis Type")
......
......@@ -7,26 +7,26 @@ SMTK_AttributeResource(Version="3")
Definitions
// Boundary condition definitions
AttDef(Type="ht/boundary" BaseType="" Abstract="true" Version="0")
AttDef(Type="ht.boundary" BaseType="" Abstract="true" Version="0")
AssociationsDef(Name="ModelAssociations" Version="0"
NumberOfRequiredValues="0" Extensible="true")
MembershipMask face
AttDef(Type="ht/boundary/dirichlet" Label="Dirichlet" BaseType="ht/boundary" Unique="true" RootName="Dirichlet" Version="0")
AttDef(Type="ht.boundary.dirichlet" Label="Dirichlet" BaseType="ht.boundary" Unique="true" RootName="Dirichlet" Version="0")
ItemDefinitions
Double(Name="temperature" Label="Temperature")
Categories #[Cat Heat Transfer]
DefaultValue 0.0
ExpressionType tabular-function
AttDef(Type="ht/boundary/flux" Label="Flux" BaseType="ht/boundary" Unique="true" RootName="Flux" Version="0")
AttDef(Type="ht.boundary.flux" Label="Flux" BaseType="ht.boundary" Unique="true" RootName="Flux" Version="0")
ItemDefinitions
Double(Name="heat-flux" Label="Heat Flux")
Categories #[Cat Heat Transfer]
DefaultValue 0.0
ExpressionType tabular-function
AttDef(Type="ht/boundary/HTC" Label="HTC" BaseType="ht/boundary" Unique="true" RootName="HTC" Version="0")
AttDef(Type="ht.boundary.HTC" Label="HTC" BaseType="ht.boundary" Unique="true" RootName="HTC" Version="0")
ItemDefinitions
Double(Name="heat-transfer-coefficient" Label="Heat Transfer Coefficient (h)")
Categories #[Cat Heat Transfer]
......@@ -37,7 +37,7 @@ SMTK_AttributeResource(Version="3")
DefaultValue 0.0
ExpressionType tabular-function
AttDef(Type="ht/boundary/radiation" Label="Radiation" BaseType="ht/boundary" Unique="true" RootName="Radiation" Version="0")
AttDef(Type="ht.boundary.radiation" Label="Radiation" BaseType="ht.boundary" Unique="true" RootName="Radiation" Version="0")
ItemDefinitions
Double(Name="emissivity" Label="Emissivity (epsilon)")
Categories #[Cat Heat Transfer]
......@@ -54,19 +54,18 @@ SMTK_AttributeResource(Version="3")
// Interface condition definitions
AttDef(Type="ht/interface" BaseType="" Abstract="true" Version="0")
AttDef(Type="ht.interface" BaseType="" Abstract="true" Version="0")
AssociationsDef(Name="ModelAssociations" Version="0"
NumberOfRequiredValues="0" Extensible="true")
MembershipMask face
AttDef(Type="ht/interface/HTC" Label="HTC" BaseType="ht/interface" Unique="true" RootName="ifHTC" Version="0")
AttDef(Type="ht.interface.HTC" Label="HTC" BaseType="ht.interface" Unique="true" RootName="ifHTC" Version="0")
ItemDefinitions
Double(Name="heat-transfer-coefficient" Label="Heat Transfer Coefficient (alpha)")
Categories #[Cat Heat Transfer]
DefaultValue 0.0
ExpressionType tabular-function
AttDef(Type="ht/interface/radiation" Label="Gap Radiation" BaseType="ht/interface" Unique="true" RootName="ifRadiation" Version="0")
AttDef(Type="ht.interface.radiation" Label="Gap Radiation" BaseType="ht.interface" Unique="true" RootName="ifRadiation" Version="0")
ItemDefinitions
Double(Name="emissivity" Label="Emissivity (epsilon)")
Categories #[Cat Heat Transfer]
......
......@@ -6,12 +6,12 @@
<!-- Attribute definitions for thermal surface conditions-->
<Definitions>
<!-- Boundary condition definitions-->
<AttDef Type="ht/boundary" BaseType="" Abstract="true" Version="0">
<AttDef Type="ht.boundary" BaseType="" Abstract="true" Version="0">
<AssociationsDef Name="ModelAssociations" Version="0" NumberOfRequiredValues="0" Extensible="true">
<MembershipMask>face</MembershipMask>
</AssociationsDef>
</AttDef>
<AttDef Type="ht/boundary/dirichlet" Label="Dirichlet" BaseType="ht/boundary" Unique="true" RootName="Dirichlet" Version="0">
<AttDef Type="ht.boundary.dirichlet" Label="Dirichlet" BaseType="ht.boundary" Unique="true" RootName="Dirichlet" Version="0">
<ItemDefinitions>
<Double Name="temperature" Label="Temperature">
<Categories>
......@@ -22,7 +22,7 @@
</Double>
</ItemDefinitions>
</AttDef>
<AttDef Type="ht/boundary/flux" Label="Flux" BaseType="ht/boundary" Unique="true" RootName="Flux" Version="0">
<AttDef Type="ht.boundary.flux" Label="Flux" BaseType="ht.boundary" Unique="true" RootName="Flux" Version="0">
<ItemDefinitions>
<Double Name="heat-flux" Label="Heat Flux">
<Categories>
......@@ -33,7 +33,7 @@
</Double>
</ItemDefinitions>
</AttDef>
<AttDef Type="ht/boundary/HTC" Label="HTC" BaseType="ht/boundary" Unique="true" RootName="HTC" Version="0">
<AttDef Type="ht.boundary.HTC" Label="HTC" BaseType="ht.boundary" Unique="true" RootName="HTC" Version="0">
<ItemDefinitions>
<Double Name="heat-transfer-coefficient" Label="Heat Transfer Coefficient (h)">
<Categories>
......@@ -51,7 +51,7 @@
</Double>
</ItemDefinitions>
</AttDef>
<AttDef Type="ht/boundary/radiation" Label="Radiation" BaseType="ht/boundary" Unique="true" RootName="Radiation" Version="0">
<AttDef Type="ht.boundary.radiation" Label="Radiation" BaseType="ht.boundary" Unique="true" RootName="Radiation" Version="0">
<ItemDefinitions>
<Double Name="emissivity" Label="Emissivity (epsilon)">
<Categories>
......@@ -74,12 +74,12 @@
</ItemDefinitions>
</AttDef>
<!-- Interface condition definitions-->
<AttDef Type="ht/interface" BaseType="" Abstract="true" Version="0">
<AttDef Type="ht.interface" BaseType="" Abstract="true" Version="0">
<AssociationsDef Name="ModelAssociations" Version="0" NumberOfRequiredValues="0" Extensible="true">
<MembershipMask>face</MembershipMask>
</AssociationsDef>
</AttDef>
<AttDef Type="ht/interface/HTC" Label="HTC" BaseType="ht/interface" Unique="true" RootName="ifHTC" Version="0">
<AttDef Type="ht.interface.HTC" Label="HTC" BaseType="ht.interface" Unique="true" RootName="ifHTC" Version="0">
<ItemDefinitions>
<Double Name="heat-transfer-coefficient" Label="Heat Transfer Coefficient (alpha)">
<Categories>
......@@ -90,7 +90,7 @@
</Double>
</ItemDefinitions>
</AttDef>
<AttDef Type="ht/interface/radiation" Label="Gap Radiation" BaseType="ht/interface" Unique="true" RootName="ifRadiation" Version="0">
<AttDef Type="ht.interface.radiation" Label="Gap Radiation" BaseType="ht.interface" Unique="true" RootName="ifRadiation" Version="0">
<ItemDefinitions>
<Double Name="emissivity" Label="Emissivity (epsilon)">
<Categories>
......
......@@ -18,25 +18,25 @@
<View Type="Attribute" Title="HT Boundary Conditions" Label="Boundary">
<AttributeTypes>
<Att Type="ht/boundary"/>
<Att Type="ht.boundary"/>
</AttributeTypes>
</View>
<View Type="Attribute" Title="HT Interface Conditions" Label="Interface">
<AttributeTypes>
<Att Type="ht/interface"/>
<Att Type="ht.interface"/>
</AttributeTypes>
</View>
<View Type="Instanced" Title="HT Solver" Label="Solver">
<InstancedAttributes>
<Att Name="Solver" Type="ht/solver" />
<Att Name="Solver" Type="ht.solver" />
</InstancedAttributes>
</View>
<View Type="Attribute" Title="HT Sources" Label="Sources">
<AttributeTypes>
<Att Type="ht/source" />
<Att Type="ht.source" />
</AttributeTypes>
</View>
</Views>
......
......@@ -880,7 +880,7 @@ class Writer:
print('Enabled analyses: {}'.format(self.analyses))
print('Enabled categories: {}'.format(self.categories))
# Iterim logic during development
# att_list = self.sim_atts.findAttributes('ht/solver')
# att_list = self.sim_atts.findAttributes('ht.solver')
# for att in att_list:
# analysis_item = att.findString('analysis')
# if analysis_item is not None:
......@@ -935,7 +935,7 @@ class Writer:
self.enclosure_surface_set_ids = list()
self.moving_enclosure_surface_set_ids = list()
att_list = self.sim_atts.findAttributes('ht/interface')
att_list = self.sim_atts.findAttributes('ht.interface')
for att in att_list:
reference_item = att.associations()
if reference_item:
......
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