Commit 3df8c6e3 authored by John Tourtellott's avatar John Tourtellott

WIP update functions and other refinements

parent 74a19595
......@@ -292,9 +292,9 @@ format_table = {
],
'PHASE': [
card('density', item_path='material-type/density', as_property=True),
card('specific heat', item_path='material-type/thermal/specific-heat',
card('specific heat', item_path='material-type/specific-heat',
if_condition='fluid', as_property=True),
card('specific heat', item_path='material-type/thermal/specific-heat',
card('specific heat', item_path='material-type/specific-heat',
if_condition='solid', as_property=True),
card('specific heat',
item_path='material-type/thermal-two-phase/specific-heat',
......
......@@ -73,17 +73,16 @@
<Def>ht/interface</Def>
</Rule>
<!-- HT Diriclet BCs are exclusive to other exterior BCs -->
<!-- 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>
</Rule>
<Rule>
<Def>ht/boundary/dirichlet</Def>
<Def>ht/boundary/HTC</Def>
</Rule>
<Rule>
<Def>ht/boundary/dirichlet</Def>
<Def>ht/boundary/flux</Def>
<Def>ht/boundary/radiation</Def>
</Rule>
</Exclusions>
......
This diff is collapsed.
......@@ -39,9 +39,8 @@
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
<Min Inclusive="false">0.0</Min>
</RangeInfo>
</Double>
<Double Name="density-deviation" Label="Density Deviation" Optional="true" IsEnabledByDefault="false">
......@@ -62,10 +61,9 @@ density from the reference density</BriefDescription>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
<ExpressionType>fn/conductivity</ExpressionType>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
<Min Inclusive="false">0.0</Min>
</RangeInfo>
</Double>
<Double Name="viscosity" Label="Viscosity (nu)">
......@@ -78,119 +76,33 @@ density from the reference density</BriefDescription>
<DefaultValue>0.0</DefaultValue>
<ExpressionType>tabular-function</ExpressionType>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
<Min Inclusive="false">0.0</Min>
</RangeInfo>
</Double>
<String Name="thermal" Label="Thermal Specification">
<Double Name="specific-heat" Label="Specific Heat (Cp)">
<BriefDescription>Specific heat of the material phase</BriefDescription>
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<ChildrenDefinitions>
<Double Name="specific-heat" Label="Specific Heat (Cp)">
<BriefDescription>Specific heat of the material phase</BriefDescription>
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
<ExpressionType>fn/specific-heat</ExpressionType>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
</RangeInfo>
</Double>
<Double Name="enthalpy" Label="Enthalpy (E)">
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
<ExpressionType>tabular-function</ExpressionType>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
</RangeInfo>
</Double>
</ChildrenDefinitions>
<DiscreteInfo DefaultIndex="0">
<Structure>
<Value Enum="Specific Heat">specific-heat</Value>
<Items>
<Item>specific-heat</Item>
</Items>
</Structure>
<Structure>
<Value Enum="Enthalpy">enthalpy</Value>
<Items>
<Item>enthalpy</Item>
</Items>
</Structure>
</DiscreteInfo>
</String>
<String Name="thermal-two-phase" Label="Thermal Specification">
<ExpressionType>fn/specific-heat</ExpressionType>
<RangeInfo>
<Min Inclusive="false">0.0</Min>
</RangeInfo>
</Double>
<!-- Two phase properties-->
<Double Name="latent-heat" Label="Latent Heat (Lf)">
<BriefDescription>The latent heats of the phase transformations.</BriefDescription>
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<ChildrenDefinitions>
<Double Name="specific-heat" Label="Specific Heat (Cp)">
<BriefDescription>Specific heat of the material phase</BriefDescription>
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
<ExpressionType>fn/specific-heat</ExpressionType>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
</RangeInfo>
</Double>
<Double Name="latent-heat" Label="Latent Heat (Lf)">
<BriefDescription>The latent heats of the phase transformations.</BriefDescription>
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
</RangeInfo>
</Double>
<Double Name="enthalpy" Label="Enthalpy (E)">
<Categories>
<Cat>Fluid Flow</Cat>
<Cat>Heat Transfer</Cat>
<Cat>Solid Mechanics</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
<ExpressionType>tabular-function</ExpressionType>
<RangeInfo>
<Min Inclusive="true">0.0</Min>
</RangeInfo>
</Double>
</ChildrenDefinitions>
<DiscreteInfo DefaultIndex="0">
<Structure>
<Value Enum="Specific Heat">specific-heat</Value>
<Items>
<Item>specific-heat</Item>
<Item>latent-heat</Item>
</Items>
</Structure>
<Structure>
<Value Enum="Enthalpy">enthalpy</Value>
<Items>
<Item>enthalpy</Item>
</Items>
</Structure>
</DiscreteInfo>
</String>
<!-- Two phase properties-->
<RangeInfo>
<Min Inclusive="false">0.0</Min>
</RangeInfo>
</Double>
<Double Name="solid-transition-temperature" Label="Solidus Temperature (Ts)">
<Categories>
<Cat>Fluid Flow</Cat>
......@@ -239,7 +151,7 @@ used to permit collapse of small void bubbles.</BriefDescription>
<Item>density</Item>
<Item>density-deviation</Item>
<Item>conductivity</Item>
<Item>thermal</Item>
<Item>specific-heat</Item>
</Items>
</Structure>
<Structure>
......@@ -249,7 +161,7 @@ used to permit collapse of small void bubbles.</BriefDescription>
<Item>density-deviation</Item>
<Item>conductivity</Item>
<Item>viscosity</Item>
<Item>thermal</Item>
<Item>specific-heat</Item>
</Items>
</Structure>
<Structure>
......@@ -259,7 +171,8 @@ used to permit collapse of small void bubbles.</BriefDescription>
<Item>density-deviation</Item>
<Item>conductivity</Item>
<Item>viscosity</Item>
<Item>thermal-two-phase</Item>
<Item>specific-heat</Item>
<Item>latent-heat</Item>
<Item>solid-transition-temperature</Item>
<Item>liquid-transition-temperature</Item>
</Items>
......
......@@ -65,7 +65,7 @@
<Min Inclusive="true">0.0</Min>
</RangeInfo>
</Double>
<Group Name="output-times" Label="Additional Output Control" AdvanceLevel="1" Extensible="true" NumberOfRequiredGroups="0">
<Group Name="output-times" Label="Additional Output Control" Extensible="true" NumberOfRequiredGroups="0">
<ItemDefinitions>
<Double Name="time" Label="Output Times" NumberOfRequiredValues="2">
<Categories>
......
......@@ -35,9 +35,8 @@ SMTK_AttributeResource(Version="3")
Double(Name="density" Label="Density (rho)" Optional="false")
BriefDescription Mass density of the material phase
+categories-all
DefaultValue 0.0
RangeInfo
Min(Inclusive="true") 0.0
Min(Inclusive="false") 0.0
Double(Name="density-deviation" Label="Density Deviation"
Optional="true" IsEnabledByDefault="false")
BriefDescription
......@@ -49,10 +48,9 @@ SMTK_AttributeResource(Version="3")
Double(Name="conductivity" Label="Conductivity (K)")
BriefDescription Thermal conductivity of the material phase
+categories-all
DefaultValue 0.0
ExpressionType fn/conductivity
RangeInfo
Min(Inclusive="true") 0.0
Min(Inclusive="false") 0.0
Double(Name="viscosity" Label="Viscosity (nu)")
BriefDescription
| The dynamic viscosity of a fluid phase
......@@ -60,66 +58,20 @@ SMTK_AttributeResource(Version="3")
DefaultValue 0.0
ExpressionType tabular-function
RangeInfo
Min(Inclusive="true") 0.0
String(Name="thermal" Label="Thermal Specification")
Min(Inclusive="false") 0.0
Double(Name="specific-heat" Label="Specific Heat (Cp)")
BriefDescription Specific heat of the material phase
+categories-all
ChildrenDefinitions
Double(Name="specific-heat" Label="Specific Heat (Cp)")
BriefDescription Specific heat of the material phase
+categories-all
DefaultValue 0.0
ExpressionType fn/specific-heat
RangeInfo
Min(Inclusive="true") 0.0
Double(Name="enthalpy" Label="Enthalpy (E)")
+categories-all
DefaultValue 0.0
ExpressionType tabular-function
RangeInfo
Min(Inclusive="true") 0.0
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="Specific Heat") specific-heat
Items
Item specific-heat
Structure
Value(Enum="Enthalpy") enthalpy
Items
Item enthalpy
String(Name="thermal-two-phase" Label="Thermal Specification")
+categories-all
ChildrenDefinitions
Double(Name="specific-heat" Label="Specific Heat (Cp)")
BriefDescription Specific heat of the material phase
+categories-all
DefaultValue 0.0
ExpressionType fn/specific-heat
RangeInfo
Min(Inclusive="true") 0.0
Double(Name="latent-heat" Label="Latent Heat (Lf)")
BriefDescription The latent heats of the phase transformations.
+categories-all
DefaultValue 0.0
RangeInfo
Min(Inclusive="true") 0.0
Double(Name="enthalpy" Label="Enthalpy (E)")
+categories-all
DefaultValue 0.0
ExpressionType tabular-function
RangeInfo
Min(Inclusive="true") 0.0
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="Specific Heat") specific-heat
Items
Item specific-heat
Item latent-heat
Structure
Value(Enum="Enthalpy") enthalpy
Items
Item enthalpy
ExpressionType fn/specific-heat
RangeInfo
Min(Inclusive="false") 0.0
// Two phase properties
Double(Name="latent-heat" Label="Latent Heat (Lf)")
BriefDescription The latent heats of the phase transformations.
+categories-all
RangeInfo
Min(Inclusive="false") 0.0
Double(Name="solid-transition-temperature" Label="Solidus Temperature (Ts)")
+categories-all
DefaultValue 0.0
......@@ -149,7 +101,7 @@ SMTK_AttributeResource(Version="3")
Item density
Item density-deviation
Item conductivity
Item thermal
Item specific-heat
Structure
Value(Enum="Fluid") fluid
Items
......@@ -157,7 +109,7 @@ SMTK_AttributeResource(Version="3")
Item density-deviation
Item conductivity
Item viscosity
Item thermal
Item specific-heat
Structure
Value(Enum="Two Phase") two-phase
Items
......@@ -165,7 +117,8 @@ SMTK_AttributeResource(Version="3")
Item density-deviation
Item conductivity
Item viscosity
Item thermal-two-phase
Item specific-heat
Item latent-heat
Item solid-transition-temperature
Item liquid-transition-temperature
Structure
......
......@@ -41,7 +41,7 @@ SMTK_AttributeResource(Version="3")
RangeInfo
Min(Inclusive="true") 0.0
Group(Name="output-times" Label="Additional Output Control"
AdvanceLevel="1" Extensible="true" NumberOfRequiredGroups="0")
Extensible="true" NumberOfRequiredGroups="0")
ItemDefinitions
Double(Name="time" Label="Output Times" NumberOfRequiredValues="2")
+categories-all
......
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