Commit d79ab5fa authored by John Tourtellott's avatar John Tourtellott

Merge branch 'ace3p/thermo-elastic' into 'master'

ACE3P/ThermoElastic

See merge request !53
parents 21335f96 80a9070d
......@@ -111,11 +111,12 @@ def ExportCMB(spec):
's3p': 'S3P Analysis',
't3p': 'T3P Analysis',
'track3p': 'Track3P Analysis',
'tem3p-eigen': 'TEM3P Structural Eigenmode',
'tem3p-structure': 'TEM3P Structural Static',
'tem3p-eigen': 'TEM3P Eigenmode',
'tem3p-elastic': 'TEM3P Elastic',
'tem3p-harmonic': 'TEM3P Harmonic Response',
'tem3p-thermal-linear': 'TEM3P Thermal Linear',
'tem3p-thermal-nonlinear': 'TEM3P Thermal Nonlinear'
'tem3p-thermal-nonlinear': 'TEM3P Thermal Nonlinear',
'tem3p-thermo-elastic': 'TEMP3P ThermoElastic'
}
# Loop over all solvers and write corresponding files
......@@ -127,7 +128,7 @@ def ExportCMB(spec):
# Get full analysis name
analysis = analysis_lookup.get(solver)
if not analysis:
msg = 'The ACE3P analysis is not specified, solver %s' % solver
msg = 'The ACE3P analysis is not specified, solver %s ' % solver
scope.logger.addError(msg)
raise Exception(msg)
print 'Writing %s' % analysis
......@@ -138,14 +139,7 @@ def ExportCMB(spec):
print 'Using categories: %s' % scope.categories
# Initialize output file
extension_lookup = {
'tem3p-eigen': 'tem3p',
'tem3p-structure': 'tem3p',
'tem3p-harmonic': 'tem3p',
'tem3p-thermal-linear': 'tem3p',
'tem3p-thermal-nonlinear': 'tem3p'
}
file_ext = extension_lookup.get(solver, solver)
file_ext = 'tem3p' if solver.startswith('tem3p') else solver
filename = '%s.%s' % (scope.output_file_prefix, file_ext)
output_path = os.path.join(scope.output_folder, filename)
print 'Output file %s' % output_path
......
......@@ -75,6 +75,13 @@
<Item>OutputFilePrefix</Item>
</Items>
</Structure>
<Structure>
<Value Enum="Track3P">track3p</Value>
<Items>
<Item>OutputFolder</Item>
<Item>OutputFilePrefix</Item>
</Items>
</Structure>
<Structure>
<Value Enum="TEM3P Eigenmode">tem3p-eigen</Value>
<Items>
......@@ -111,7 +118,7 @@
</Items>
</Structure>
<Structure>
<Value Enum="Track3P">track3p</Value>
<Value Enum="TEM3P ThermoElastic">tem3p-thermo-elastic</Value>
<Items>
<Item>OutputFolder</Item>
<Item>OutputFilePrefix</Item>
......
......@@ -11,6 +11,7 @@
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<Analyses>
<Analysis Type="Omega3P Analysis">
......@@ -25,21 +26,24 @@
<Analysis Type="Track3P Analysis">
<Cat>Track3P</Cat>
</Analysis>
<Analysis Type="TEM3P Structural Eigenmode">
<Analysis Type="TEM3P Eigenmode">
<Cat>TEM3P-Eigen</Cat>
</Analysis>
<Analysis Type="TEM3P Elastic">
<Cat>TEM3P-Static</Cat>
</Analysis>
<Analysis Type="TEM3P Harmonic Response">
<Cat>TEM3P-Harmonic</Cat>
</Analysis>
<Analysis Type="TEM3P Structural Static">
<Cat>TEM3P-Static</Cat>
</Analysis>
<Analysis Type="TEM3P Thermal Linear">
<Cat>TEM3P-Linear-Thermal</Cat>
</Analysis>
<Analysis Type="TEM3P Thermal Nonlinear">
<Cat>TEM3P-Nonlinear-Thermal</Cat>
</Analysis>
<Analysis Type="TEM3P ThermoElastic">
<Cat>TEM3P-ThermoElastic</Cat>
</Analysis>
</Analyses>
<!--********** Include files ***********-->
......@@ -69,10 +73,11 @@
<View Title="T3P" Category="T3P"/>
<View Title="Track3P" Category="Track3P" />
<View Title="TEM3P Harmonic Response" Category="TEM3P-Harmonic" />
<View Title="TEM3P Structural Eigenmode" Category="TEM3P-Eigen" />
<View Title="TEM3P Structural Static" Category="TEM3P-Static" />
<View Title="TEM3P Eigenmode" Category="TEM3P-Eigen" />
<View Title="TEM3P Elastic" Category="TEM3P-Static" />
<View Title="TEM3P Thermal Linear" Category="TEM3P-Linear-Thermal" />
<View Title="TEM3P Thermal Nonlinear" Category="TEM3P-Nonlinear-Thermal" />
<View Title="TEM3P ThermoElastic" Category="TEM3P-ThermoElastic" />
</Views>
</View>
......@@ -111,25 +116,25 @@
<View Type="Group" Title="TEM3P Harmonic Response" TabPosition="North" TabIcons="false">
<Views>
<View Title="TEM3P Mechanical BC" />
<View Title="TEM3P Material" />
<View Title="TEM3P Analysis"/>
<View Title="TEM3P Elastic Material" />
<View Title="TEM3P Elastic Analysis"/>
</Views>
</View>
<View Type="Group" Title="TEM3P Structural Eigenmode" TabPosition="North" TabIcons="false">
<View Type="Group" Title="TEM3P Eigenmode" TabPosition="North" TabIcons="false">
<Views>
<View Title="TEM3P Mechanical BC" />
<View Title="TEM3P Material" />
<View Title="TEM3P Analysis"/>
<View Title="TEM3P Elastic Material" />
<View Title="TEM3P Elastic Analysis"/>
<View Title="Mesh Output" />
</Views>
</View>
<View Type="Group" Title="TEM3P Structural Static" TabPosition="North" TabIcons="false">
<View Type="Group" Title="TEM3P Elastic" TabPosition="North" TabIcons="false">
<Views>
<View Title="TEM3P Mechanical BC" />
<View Title="TEM3P Material" />
<View Title="TEM3P Analysis"/>
<View Title="TEM3P Elastic Material" />
<View Title="TEM3P Elastic Analysis"/>
<View Title="Mesh Output" />
</Views>
</View>
......@@ -137,8 +142,8 @@
<View Type="Group" Title="TEM3P Thermal Linear" TabPosition="North" TabIcons="false">
<Views>
<View Title="TEM3P Thermal BC" />
<View Title="TEM3P Material" />
<View Title="TEM3P Analysis"/>
<View Title="TEM3P Thermal Material" />
<View Title="TEM3P Thermal Analysis"/>
<View Title="Thermal Shells" />
<View Title="Heat Sources" />
</Views>
......@@ -147,13 +152,21 @@
<View Type="Group" Title="TEM3P Thermal Nonlinear" TabPosition="North" TabIcons="false">
<Views>
<View Title="TEM3P Thermal BC" />
<View Title="TEM3P Material" />
<View Title="TEM3P Analysis"/>
<View Title="TEM3P Thermal Material" />
<View Title="TEM3P Thermal Analysis"/>
<View Title="Thermal Shells" />
<View Title="Heat Sources" />
</Views>
</View>
<View Type="Group" Title="TEM3P ThermoElastic" TabPosition="North" TabIcons="false">
<Views>
<View Title="TEM3P Elastic" />
<View Title="TEM3P Thermal Nonlinear" />
</Views>
</View>
<!-- EM Views (O3P, S3P, T3P) -->
<View Type="Group" Title="EMBC" Label="Boundary Conditions" Style="Tiled">
<Views>
......
......@@ -6,29 +6,30 @@ SMTK_AttributeSystem(Version="2")
Cat TEM3P-Static
Cat TEM3P-Linear-Thermal
Cat TEM3P-Nonlinear-Thermal
Cat TEM3P-ThermoElastic
Definitions
// Volume material properties
AttDef(Type="TEM3PMaterial" Label="Material" BaseType="" Abstract="true" Version="0")
//- Thermal and Elastic materials are completely distinct, so they can be used
concurrently in ThermoElastic analyses
AttDef(Type="TEM3PElasticMaterial" Label="Material" BaseType="" Unique="true" Version="0")
AssociationsDef(Name="TEM3PMaterialAssociations" Version="0"
NumberOfRequiredValues="0" Extensible="true")
MembershipMask volume
AttDef(Type="TEM3PElasticMaterial" Label="Material" BaseType="TEM3PMaterial" Unique="true" Version="0")
ItemDefinitions
String(Name="Material" Label="Material" Version="0")
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
Double(Name="YoungsModulus" Label="Young's Modulus" Version="0" Units="Pa")
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
RangleInfo #[Min(Exclusive="true") 0.0]
Double(Name="PoissonsRatio" Label="Poisson's Ratio" Version="0")
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
RangleInfo #[Min(Exclusive="true") 0.0]
Double(Name="ElasticAlpha" Label="Elastic Alpha" Version="0"
Optional="true" IsEnabledByDefault="true" Units="1/K")
BriefDescription Thermal expansion coefficient (not relevant for eigenmode solver)
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
DefaultValue 0.0
Double(Name="Density" Label="Density" Units="kg/m^3" Version="0")
BriefDescription Material density (only relevant for eigenmode solver)
......@@ -52,18 +53,21 @@ SMTK_AttributeSystem(Version="2")
Item ElasticAlpha
Item Density
AttDef(Type="TEM3PThermalMaterial" Label="Material" BaseType="TEM3PMaterial" Unique="true" Version="0")
AttDef(Type="TEM3PThermalMaterial" Label="Material" BaseType="" Unique="true" Version="0")
AssociationsDef(Name="TEM3PMaterialAssociations" Version="0"
NumberOfRequiredValues="0" Extensible="true")
MembershipMask volume
ItemDefinitions
String(Name="NonlinearMaterial" Label="Material" Version="0")
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
Double(Name="ConstantThermalConductivity" Label="Thermal Conductivity" Units="W/m*K" Version="0")
BriefDescription Thermal conductivity
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
File(Name="NonlinearThermalConductivity" Label="Input File"
NumberOfRequiredValues="1" ShouldExist="true" Version="0")
BriefDescription File that defines the function for the material nonlinearity
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo
// The values are filenames to be included in the input deck
Value(Enum="Aluminum 6061") AL6061
......
......@@ -3,6 +3,7 @@ SMTK_AttributeSystem(Version="2")
Categories
Cat TEM3P-Eigen
Cat TEM3P-Static
Cat TEM3P-ThermoElastic
Definitions
AttDef(Type="MeshDump" Label="Mesh Dump" BaseType="" Version="0")
......@@ -12,21 +13,21 @@ SMTK_AttributeSystem(Version="2")
Void(Name="WriteDeformedMesh" Label="Write Deformed Mesh"
Optional="true" IsEnabledByDefault="true" Version="0")
BriefDescription Write the deformed mesh
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Group(Name="WriteDeformedEMMesh" Label="Write Deformed EM Mesh"
Optional="true" IsEnabledByDefault="false" Version="0")
ItemDefinitions
String(Name="Source" Label="EM Mesh Folder" Version="0")
BriefDescription The source for the omega3p input mesh
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
//- Directory(Name="LocalDirectory" Label="Local Directory" Version="0" ShouldExist="true")
//- BriefDescription An existing directory on the local filesystem
//- Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static]
//- Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
String(Name="NERSCDirectory" Label="NERSC Directory" Version="0")
BriefDescription Full path to existing directory on a NERSC file system. where the omega3p results are stored
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="NERSC Directory") NERSCDirectory
......@@ -37,14 +38,14 @@ SMTK_AttributeSystem(Version="2")
Items
Item LocalDirectory
Double(Name="MeshDeformedScale" Label="Mesh Deformed Scale" Version="0")
Double(Name="MeshDeformScale" Label="Mesh Deform Scale" Version="0")
BriefDescription Deformation scale factor
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0
Void(Name="WriteStressStrain" Label="Write Stress/Strain Mode Files"
Optional="true" IsEnabledByDefault="false" Version="0")
BriefDescription Write the stress/strain .mod files
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
= '\n'
......@@ -12,32 +12,32 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
Int(Name="BasisOrder" Label="Basis Order" Version="0")
BriefDescirption The order of finite elements
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1
RangeInfo #[Min(Inclusive="true") 0]
Void(Name="CurvedSurfaces" Label="Curved Surfaces"
Optional="true" IsEnabledByDefault="true" Version="0")
BriefDescription Use curved surfaces to better approximate the geometry
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
AttDef(Type="TEM3PLinearSolver" Label="Linear Solver" Version="0")
ItemDefinitions
String(Name="Type" Label="Linear Solver Type" Version="0")
BriefDescription Type of solver
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo
Value CG
Value GMRES
Value MUMPS
Void(Name="Verify" Label="Verify" Version="0" Optional="true" IsEnabledByDefault="false")
BriefDescription Calculate the solution residual or not
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
Void(Name="SaveDOFs" Label="Save DOFs" Version="0" Optional="true" IsEnabledByDefault="false")
BriefDescription Save degrees of freedom for further post-processing
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
String(Name="Preconditioner" Label="Preconditioner" Version="0")
BriefDescription Type of preconditioner
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo
Value DIAGONAL
Value CHOLESKY
......@@ -45,17 +45,17 @@ SMTK_AttributeSystem(Version="2")
Value ILU
Double(Name="AbsoluteTolerance" Label="Absolute Tolerance" Version="0")
BriefDescription Absolute convergence tolerance
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0e-18
RangeInfo #[Min(Inclusive="true") 0.0]
Double(Name="Tolerance" Label="Tolerance" Version="0")
BriefDescription Relative convergence tolerance
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0e-10
RangeInfo #[Min(Inclusive="true") 0.0]
Int(Name="MaxIterations" Label="Max Iterations" Version="0")
BriefDescription Maximum number of iterations when the solver process terminates even if the tolerance has not been reached
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 100000
RangeInfo #[Min(Inclusive="true") 1]
......@@ -63,18 +63,18 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
String(Name="Solver" Label="Picard Solver Type" Version="0")
BriefDescription Type of solver
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex="0")
Value CG
Void(Name="Verify" Label="Verify" Version="0" Optional="true" IsEnabledByDefault="false")
BriefDescription Calculate the solution residual or not
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
Void(Name="SaveDOFs" Label="Save DOFs" Version="0" Optional="true" IsEnabledByDefault="false")
BriefDescription Save degrees of freedom for further post-processing
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
String(Name="Preconditioner" Label="Preconditioner" Version="0")
BriefDescription Type of preconditioner
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo
Value DIAGONAL
Value CHOLESKY
......@@ -82,17 +82,17 @@ SMTK_AttributeSystem(Version="2")
Value ILU
Double(Name="AbsoluteTolerance" Label="Absolute Tolerance" Version="0")
BriefDescription Absolute convergence tolerance
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0e-18
RangeInfo #[Min(Inclusive="true") 0.0]
Double(Name="Tolerance" Label="Tolerance" Version="0")
BriefDescription Relative convergence tolerance
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0e-10
RangeInfo #[Min(Inclusive="true") 0.0]
Int(Name="MaxIterations" Label="Max Iterations" Version="0")
BriefDescription Maximum number of iterations when the solver process terminates even if the tolerance has not been reached
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 100000
RangeInfo #[Min(Inclusive="true") 1]
......@@ -100,27 +100,27 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
String(Name="Type" Label="Nonlinear Solver Type" Version="0")
BriefDescription Type of solver
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex="0")
Value Newton
Int(Name="PicardIteration" Label="Picard Iterations" Version="0")
BriefDescription Number of iterations before switching from Picard to Newton update
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 10
RangeInfo #[Min(Inclusive="true") 1]
Int(Name="MaxIterations" Label="Max Iterations" Version="0")
BriefDescription Maximum number of iterations when the solver process terminates even if the tolerance has not been reached
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 40
RangeInfo #[Min(Inclusive="true") 1]
Double(Name="AbsTolerance" Label="Absolute Tolerance" Version="0")
BriefDescription Absolute convergence tolerance
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0e-10
RangeInfo #[Min(Inclusive="true") 0.0]
Double(Name="RelTolerance" Label="Relative Tolerance" Version="0")
BriefDescription Relative convergence tolerance
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0e-8
RangeInfo #[Min(Inclusive="true") 0.0]
......
......@@ -3,6 +3,7 @@ SMTK_AttributeSystem(Version="2")
Categories
Cat TEM3P-Linear-Thermal
Cat TEM3P-Nonlinear-Thermal
Cat TEM3P-ThermoElastic
Definitions
// Definitions specific to TEM3P-Thermal
......@@ -16,25 +17,25 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
// Specify ConditionType as discrete, even though only 1 value (RFHeating) currently used
String(Name="ConditionType" Label="Type" Version="0")
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
Double(Name="DielectricConstantE" Label="Dielectric Constant" Version="0")
BriefDescription The dielectric constant
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0
RangeInfo #[Min(Inclusive="true") 0.0]
Double(Name="LossTangentE" Label="Loss Tangent" Version="0")
BriefDescription The dielectric loss tangent
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 0.0
String(Name="Source" Label="Source" Version="0")
BriefDescription The source for the omega3p or s3p data simulation results
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
String(Name="NERSCDirectory" Label="NERSC Directory" Version="0")
BriefDescription Full path existing directory on a NERSC file system. where the omega3p or s3p results are stored
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="Use NERSC Directory") NERSCDirectory
......@@ -42,18 +43,18 @@ SMTK_AttributeSystem(Version="2")
Item NERSCDirectory
Int(Name="WhichMode" Label="Mode Number" Version="0")
BriefDescription The mode number calculated from the omega3p or s3p data imported into tem3p
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
RangeInfo #[Min(Inclusive="true") 0]
// Specify Method as discrete, even though only 1 value (Powerinput) currently used
String(Name="Method" Label="Method" Version="0")
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
Double(Name="TargetPowerinput" Label="Target Power Input" Units="W" Version="0")
BriefDescription Total power input to the system
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
DiscreteInfo(DefaultIndex="0")
Structure
......@@ -77,7 +78,7 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
File(Name="DataFile" Label="Data File" ShouldExist="true" NumberOfRequiredValues="1" Version="0")
BriefDescription File name of the external volume heating data
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
= '\n'
AttDef(Type="ThermalShell" Label="Thermal" BaseType="" Unique="true" Version="0")
......@@ -87,25 +88,25 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
Int(Name="BasisOrder" Label="Basis Order" Version="0")
BriefDescription Order of the basis functions of shell elements
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1
RangeInfo #[Min(Inclusive="true") 0]
Double(Name="Thickness" Label="Thickness" Version="0")
BriefDescription Thickness of the shell
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 0.0
RangeInfo #[Min(Inclusive="true") 0.0]
String(Name="GeneralThermalConductivity" Label="Material" Version="0")
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
Double(Name="ConstantThermalConductivity" Label="Thermal Conductivity" Units="W/m*K" Version="0")
BriefDescription Thermal conductivity
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
File(Name="NonlinearThermalConductivity" Label="Nonlinear Thermal Conductivity (File)"
NumberOfRequiredValues="1" ShouldExist="true" Version="0")
BriefDescription File that defines the function for the material nonlinearity
Categories #[Cat TEM3P-Nonlinear-Thermal]
Categories #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo
// The values are filenames to be included in the input deck
Value(Enum="Aluminum 6061") AL6061
......
......@@ -17,16 +17,18 @@ SMTK_AttributeSystem(Version="2")
Views
//- To compile as toplevel, add to command line: -O "{toplevel: 'true'}"
//- Note the quotes around 'true'
//-View(Type="Group" Title="TEM3P" TopLevel=toplevel TabPosition="North"
FilterByAdvanceLevel="false")
Views
View(Title="TEM3P Mechanical BC")/
View(Title="TEM3P Thermal BC")/
View(Title="TEM3P Material")/
View(Title="TEM3P Analysis")/
View(Title="TEM3P Mesh Output")/
View(Title="TEM3P Thermal Shells")/
View(Title="Heat Sources")
// View(Type="Group" Title="TEM3P" TopLevel=toplevel TabPosition="North"
// FilterByAdvanceLevel="false")
// Views
// View(Title="TEM3P Mechanical BC")/
// View(Title="TEM3P Thermal BC")/
// View(Title="TEM3P Elastic Material")/
// View(Title="TEM3P Thermal Material")/
// View(Title="TEM3P Elastic Analysis")/
// View(Title="TEM3P Thermal Analysis")/
// View(Title="TEM3P Mesh Output")/
// View(Title="TEM3P Thermal Shells")/
// View(Title="Heat Sources")
= '\n'
View(Type="ModelEntity" Title="TEM3P Mechanical BC" Label="Boundary Conditions" ModelEntityFilter="f" ColHeader2="Boundary Condition" NoValueLabel="-please-select-")
......@@ -37,18 +39,31 @@ SMTK_AttributeSystem(Version="2")
AttributeTypes
Att(Type="TEM3PThermalBC")
View(Type="Attribute" Title="TEM3P Material" Label="Materials")
View(Type="Attribute" Title="TEM3P Elastic Material" Label="Materials")
AttributeTypes
Att(Type="TEM3PMaterial")
Att(Type="TEM3PElasticMaterial")
View(Type="Instanced" Name="TEM3P Analysis" Label="Analysis")
View(Type="Attribute" Title="TEM3P Thermal Material" Label="Materials")
AttributeTypes
Att(Type="TEM3PThermalMaterial")
// Need separate elastic and thermal analysis attributes (for ThermoElastic)
View(Type="Instanced" Name="TEM3P Elastic Analysis" Label="Analysis")
InstancedAttributes
Att(Name="ElasticOrderAtt" Type="Order")/
Att(Name="ElasticEigenSolverAtt" Type="EigenSolver")/
Att(Name="ElasticLinearSolverAtt" Type="TEM3PLinearSolver")/
Att(Name="ElasticHarmonicAnalysisAtt" Type="HarmonicAnalysis")/
Att(Name="ElasticNonlinearSolverAtt" Type="NonlinearSolver")/
Att(Name="ElasticPicardSolverAtt" Type="PicardSolver")/
View(Type="Instanced" Name="TEM3P Thermal Analysis" Label="Analysis")
InstancedAttributes
Att(Name="OrderAtt" Type="Order")/
Att(Name="EigenSolverAtt" Type="EigenSolver")/
Att(Name="TEM3PLinearSolverAtt" Type="TEM3PLinearSolver")/
Att(Name="HarmonicAnalysisAtt" Type="HarmonicAnalysis")/
Att(Name="NonlinearSolverAtt" Type="NonlinearSolver")/
Att(Name="PicardSolverAtt" Type="PicardSolver")/
Att(Name="ThermalOrderAtt" Type="Order")/
Att(Name="ThermalEigenSolverAtt" Type="EigenSolver")/
Att(Name="ThermalLinearSolverAtt" Type="TEM3PLinearSolver")/
Att(Name="ThermalHarmonicAnalysisAtt" Type="HarmonicAnalysis")/
Att(Name="ThermalNonlinearSolverAtt" Type="NonlinearSolver")/
Att(Name="ThermalPicardSolverAtt" Type="PicardSolver")/
View(Type="Instanced" Title="Mesh Output")
InstancedAttributes
......
......@@ -6,28 +6,28 @@
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<Definitions>
<!-- Volume material properties-->
<AttDef Type="TEM3PMaterial" Label="Material" BaseType="" Abstract="true" Version="0">
<AttDef Type="TEM3PElasticMaterial" Label="Material" BaseType="" Unique="true" Version="0">
<AssociationsDef Name="TEM3PMaterialAssociations" Version="0" NumberOfRequiredValues="0" Extensible="true">
<MembershipMask>volume</MembershipMask>
</AssociationsDef>
</AttDef>
<AttDef Type="TEM3PElasticMaterial" Label="Material" BaseType="TEM3PMaterial" Unique="true" Version="0">
<ItemDefinitions>
<String Name="Material" Label="Material" Version="0">
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ChildrenDefinitions>
<Double Name="YoungsModulus" Label="Young's Modulus" Version="0" Units="Pa">
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<RangleInfo>
<Min Exclusive="true">0.0</Min>
......@@ -37,7 +37,8 @@
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<RangleInfo>
<Min Exclusive="true">0.0</Min>
......@@ -47,7 +48,8 @@
<BriefDescription>Thermal expansion coefficient (not relevant for eigenmode solver)</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
</Double>
......@@ -82,23 +84,29 @@
</String>
</ItemDefinitions>
</AttDef>
<AttDef Type="TEM3PThermalMaterial" Label="Material" BaseType="TEM3PMaterial" Unique="true" Version="0">
<AttDef Type="TEM3PThermalMaterial" Label="Material" BaseType="" Unique="true" Version="0">
<AssociationsDef Name="TEM3PMaterialAssociations" Version="0" NumberOfRequiredValues="0" Extensible="true">
<MembershipMask>volume</MembershipMask>
</AssociationsDef>
<ItemDefinitions>
<String Name="NonlinearMaterial" Label="Material" Version="0">
<Categories>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ChildrenDefinitions>
<Double Name="ConstantThermalConductivity" Label="Thermal Conductivity" Units="W/m*K" Version="0">
<BriefDescription>Thermal conductivity</BriefDescription>
<Categories>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</Double>
<File Name="NonlinearThermalConductivity" Label="Input File" NumberOfRequiredValues="1" ShouldExist="true" Version="0">
<BriefDescription>File that defines the function for the material nonlinearity</BriefDescription>
<Categories>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</File>
</ChildrenDefinitions>
......
......@@ -3,6 +3,7 @@
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<Definitions>
<AttDef Type="MeshDump" Label="Mesh Dump" BaseType="" Version="0">
......@@ -13,7 +14,8 @@
<BriefDescription>Write the deformed mesh</BriefDescription>
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</Void>
<Group Name="WriteDeformedEMMesh" Label="Write Deformed EM Mesh" Optional="true" IsEnabledByDefault="false" Version="0">
......@@ -22,14 +24,16 @@
<BriefDescription> The source for the omega3p input mesh</BriefDescription>
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>