Commit 926a57f8 authored by John Tourtellott's avatar John Tourtellott

Merge branch 'ace3p/bugfixes-jun29' into 'master'

ACE3P Bug Fixes June 29

See merge request !54
parents d79ab5fa 7ea79df1
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<Cat>Track3P</Cat> <Cat>Track3P</Cat>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
</Analysis> </Analysis>
<Analysis Type="TEM3P Elastic"> <Analysis Type="TEM3P Elastic">
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
</Analysis> </Analysis>
<Analysis Type="TEM3P Harmonic Response"> <Analysis Type="TEM3P Harmonic Response">
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<View Title="Track3P" Category="Track3P" /> <View Title="Track3P" Category="Track3P" />
<View Title="TEM3P Harmonic Response" Category="TEM3P-Harmonic" /> <View Title="TEM3P Harmonic Response" Category="TEM3P-Harmonic" />
<View Title="TEM3P Eigenmode" Category="TEM3P-Eigen" /> <View Title="TEM3P Eigenmode" Category="TEM3P-Eigen" />
<View Title="TEM3P Elastic" Category="TEM3P-Static" /> <View Title="TEM3P Elastic" Category="TEM3P-Elastic" />
<View Title="TEM3P Thermal Linear" Category="TEM3P-Linear-Thermal" /> <View Title="TEM3P Thermal Linear" Category="TEM3P-Linear-Thermal" />
<View Title="TEM3P Thermal Nonlinear" Category="TEM3P-Nonlinear-Thermal" /> <View Title="TEM3P Thermal Nonlinear" Category="TEM3P-Nonlinear-Thermal" />
<View Title="TEM3P ThermoElastic" Category="TEM3P-ThermoElastic" /> <View Title="TEM3P ThermoElastic" Category="TEM3P-ThermoElastic" />
...@@ -142,20 +142,20 @@ ...@@ -142,20 +142,20 @@
<View Type="Group" Title="TEM3P Thermal Linear" TabPosition="North" TabIcons="false"> <View Type="Group" Title="TEM3P Thermal Linear" TabPosition="North" TabIcons="false">
<Views> <Views>
<View Title="TEM3P Thermal BC" /> <View Title="TEM3P Thermal BC" />
<View Title="TEM3P Thermal Material" />
<View Title="TEM3P Thermal Analysis"/>
<View Title="Thermal Shells" /> <View Title="Thermal Shells" />
<View Title="TEM3P Thermal Material" />
<View Title="Heat Sources" /> <View Title="Heat Sources" />
<View Title="TEM3P Thermal Analysis"/>
</Views> </Views>
</View> </View>
<View Type="Group" Title="TEM3P Thermal Nonlinear" TabPosition="North" TabIcons="false"> <View Type="Group" Title="TEM3P Thermal Nonlinear" TabPosition="North" TabIcons="false">
<Views> <Views>
<View Title="TEM3P Thermal BC" /> <View Title="TEM3P Thermal BC" />
<View Title="TEM3P Thermal Material" />
<View Title="TEM3P Thermal Analysis"/>
<View Title="Thermal Shells" /> <View Title="Thermal Shells" />
<View Title="TEM3P Thermal Material" />
<View Title="Heat Sources" /> <View Title="Heat Sources" />
<View Title="TEM3P Thermal Analysis"/>
</Views> </Views>
</View> </View>
......
...@@ -3,7 +3,7 @@ SMTK_AttributeSystem(Version="2") ...@@ -3,7 +3,7 @@ SMTK_AttributeSystem(Version="2")
Categories Categories
Cat TEM3P-Eigen Cat TEM3P-Eigen
Cat TEM3P-Harmonic Cat TEM3P-Harmonic
Cat TEM3P-Static Cat TEM3P-Elastic
Cat TEM3P-Linear-Thermal Cat TEM3P-Linear-Thermal
Cat TEM3P-Nonlinear-Thermal Cat TEM3P-Nonlinear-Thermal
Cat TEM3P-ThermoElastic Cat TEM3P-ThermoElastic
...@@ -18,18 +18,18 @@ SMTK_AttributeSystem(Version="2") ...@@ -18,18 +18,18 @@ SMTK_AttributeSystem(Version="2")
MembershipMask volume MembershipMask volume
ItemDefinitions ItemDefinitions
String(Name="Material" Label="Material" Version="0") String(Name="Material" Label="Material" Version="0")
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions ChildrenDefinitions
Double(Name="YoungsModulus" Label="Young's Modulus" Version="0" Units="Pa") Double(Name="YoungsModulus" Label="Young's Modulus" Version="0" Units="Pa")
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
RangleInfo #[Min(Exclusive="true") 0.0] RangleInfo #[Min(Exclusive="true") 0.0]
Double(Name="PoissonsRatio" Label="Poisson's Ratio" Version="0") Double(Name="PoissonsRatio" Label="Poisson's Ratio" Version="0")
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
RangleInfo #[Min(Exclusive="true") 0.0] RangleInfo #[Min(Exclusive="true") 0.0]
Double(Name="ElasticAlpha" Label="Elastic Alpha" Version="0" Double(Name="ElasticAlpha" Label="Elastic Alpha" Version="0"
Optional="true" IsEnabledByDefault="true" Units="1/K") Optional="true" IsEnabledByDefault="true" Units="1/K")
BriefDescription Thermal expansion coefficient (not relevant for eigenmode solver) BriefDescription Thermal expansion coefficient (not relevant for eigenmode solver)
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0.0 DefaultValue 0.0
Double(Name="Density" Label="Density" Units="kg/m^3" Version="0") Double(Name="Density" Label="Density" Units="kg/m^3" Version="0")
BriefDescription Material density (only relevant for eigenmode solver) BriefDescription Material density (only relevant for eigenmode solver)
......
...@@ -2,7 +2,7 @@ doctype xml ...@@ -2,7 +2,7 @@ doctype xml
SMTK_AttributeSystem(Version="2") SMTK_AttributeSystem(Version="2")
Categories Categories
Cat TEM3P-Eigen Cat TEM3P-Eigen
Cat TEM3P-Static Cat TEM3P-Elastic
Cat TEM3P-ThermoElastic Cat TEM3P-ThermoElastic
Definitions Definitions
...@@ -13,21 +13,21 @@ SMTK_AttributeSystem(Version="2") ...@@ -13,21 +13,21 @@ SMTK_AttributeSystem(Version="2")
Void(Name="WriteDeformedMesh" Label="Write Deformed Mesh" Void(Name="WriteDeformedMesh" Label="Write Deformed Mesh"
Optional="true" IsEnabledByDefault="true" Version="0") Optional="true" IsEnabledByDefault="true" Version="0")
BriefDescription Write the deformed mesh BriefDescription Write the deformed mesh
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
Group(Name="WriteDeformedEMMesh" Label="Write Deformed EM Mesh" Group(Name="WriteDeformedEMMesh" Label="Write Deformed EM Mesh"
Optional="true" IsEnabledByDefault="false" Version="0") Optional="true" IsEnabledByDefault="false" Version="0")
ItemDefinitions ItemDefinitions
String(Name="Source" Label="EM Mesh Folder" Version="0") String(Name="Source" Label="EM Mesh Folder" Version="0")
BriefDescription The source for the omega3p input mesh BriefDescription The source for the omega3p input mesh
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions ChildrenDefinitions
//- Directory(Name="LocalDirectory" Label="Local Directory" Version="0" ShouldExist="true") //- Directory(Name="LocalDirectory" Label="Local Directory" Version="0" ShouldExist="true")
//- BriefDescription An existing directory on the local filesystem //- BriefDescription An existing directory on the local filesystem
//- Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] //- Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
String(Name="NERSCDirectory" Label="NERSC Directory" Version="0") 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 BriefDescription Full path to existing directory on a NERSC file system. where the omega3p results are stored
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex="0") DiscreteInfo(DefaultIndex="0")
Structure Structure
Value(Enum="NERSC Directory") NERSCDirectory Value(Enum="NERSC Directory") NERSCDirectory
...@@ -40,12 +40,12 @@ SMTK_AttributeSystem(Version="2") ...@@ -40,12 +40,12 @@ SMTK_AttributeSystem(Version="2")
Double(Name="MeshDeformScale" Label="Mesh Deform Scale" Version="0") Double(Name="MeshDeformScale" Label="Mesh Deform Scale" Version="0")
BriefDescription Deformation scale factor BriefDescription Deformation scale factor
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0 DefaultValue 1.0
Void(Name="WriteStressStrain" Label="Write Stress/Strain Mode Files" Void(Name="WriteStressStrain" Label="Write Stress/Strain Mode Files"
Optional="true" IsEnabledByDefault="false" Version="0") Optional="true" IsEnabledByDefault="false" Version="0")
BriefDescription Write the stress/strain .mod files BriefDescription Write the stress/strain .mod files
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
= '\n' = '\n'
...@@ -3,7 +3,7 @@ SMTK_AttributeSystem(Version="2") ...@@ -3,7 +3,7 @@ SMTK_AttributeSystem(Version="2")
Categories Categories
Cat TEM3P-Eigen Cat TEM3P-Eigen
Cat TEM3P-Harmonic Cat TEM3P-Harmonic
Cat TEM3P-Static Cat TEM3P-Elastic
Cat TEM3P-Linear-Thermal Cat TEM3P-Linear-Thermal
Cat TEM3P-Nonlinear-Thermal Cat TEM3P-Nonlinear-Thermal
...@@ -12,32 +12,32 @@ SMTK_AttributeSystem(Version="2") ...@@ -12,32 +12,32 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions ItemDefinitions
Int(Name="BasisOrder" Label="Basis Order" Version="0") Int(Name="BasisOrder" Label="Basis Order" Version="0")
BriefDescirption The order of finite elements BriefDescirption The order of finite elements
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1 DefaultValue 1
RangeInfo #[Min(Inclusive="true") 0] RangeInfo #[Min(Inclusive="true") 0]
Void(Name="CurvedSurfaces" Label="Curved Surfaces" Void(Name="CurvedSurfaces" Label="Curved Surfaces"
Optional="true" IsEnabledByDefault="true" Version="0") Optional="true" IsEnabledByDefault="true" Version="0")
BriefDescription Use curved surfaces to better approximate the geometry 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] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
AttDef(Type="TEM3PLinearSolver" Label="Linear Solver" Version="0") AttDef(Type="TEM3PLinearSolver" Label="Linear Solver" Version="0")
ItemDefinitions ItemDefinitions
String(Name="Type" Label="Linear Solver Type" Version="0") String(Name="Type" Label="Linear Solver Type" Version="0")
BriefDescription Type of solver BriefDescription Type of solver
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo DiscreteInfo
Value CG Value CG
Value GMRES Value GMRES
Value MUMPS Value MUMPS
Void(Name="Verify" Label="Verify" Version="0" Optional="true" IsEnabledByDefault="false") Void(Name="Verify" Label="Verify" Version="0" Optional="true" IsEnabledByDefault="false")
BriefDescription Calculate the solution residual or not BriefDescription Calculate the solution residual or not
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
Void(Name="SaveDOFs" Label="Save DOFs" Version="0" Optional="true" IsEnabledByDefault="false") Void(Name="SaveDOFs" Label="Save DOFs" Version="0" Optional="true" IsEnabledByDefault="false")
BriefDescription Save degrees of freedom for further post-processing BriefDescription Save degrees of freedom for further post-processing
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
String(Name="Preconditioner" Label="Preconditioner" Version="0") String(Name="Preconditioner" Label="Preconditioner" Version="0")
BriefDescription Type of preconditioner BriefDescription Type of preconditioner
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DiscreteInfo DiscreteInfo
Value DIAGONAL Value DIAGONAL
Value CHOLESKY Value CHOLESKY
...@@ -45,17 +45,17 @@ SMTK_AttributeSystem(Version="2") ...@@ -45,17 +45,17 @@ SMTK_AttributeSystem(Version="2")
Value ILU Value ILU
Double(Name="AbsoluteTolerance" Label="Absolute Tolerance" Version="0") Double(Name="AbsoluteTolerance" Label="Absolute Tolerance" Version="0")
BriefDescription Absolute convergence tolerance BriefDescription Absolute convergence tolerance
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0e-18 DefaultValue 1.0e-18
RangeInfo #[Min(Inclusive="true") 0.0] RangeInfo #[Min(Inclusive="true") 0.0]
Double(Name="Tolerance" Label="Tolerance" Version="0") Double(Name="Tolerance" Label="Tolerance" Version="0")
BriefDescription Relative convergence tolerance BriefDescription Relative convergence tolerance
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 1.0e-10 DefaultValue 1.0e-10
RangeInfo #[Min(Inclusive="true") 0.0] RangeInfo #[Min(Inclusive="true") 0.0]
Int(Name="MaxIterations" Label="Max Iterations" Version="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 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] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 100000 DefaultValue 100000
RangeInfo #[Min(Inclusive="true") 1] RangeInfo #[Min(Inclusive="true") 1]
......
...@@ -28,19 +28,9 @@ SMTK_AttributeSystem(Version="2") ...@@ -28,19 +28,9 @@ SMTK_AttributeSystem(Version="2")
BriefDescription The dielectric loss tangent BriefDescription The dielectric loss tangent
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 0.0 DefaultValue 0.0
String(Name="NERSCDirectory" Label="NERSC Directory" Version="0")
String(Name="Source" Label="Source" Version="0") BriefDescription Full path to existing directory on a NERSC file system, where the omega3p or s3p results are stored
BriefDescription The source for the omega3p or s3p data simulation results
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] 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] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="Use NERSC Directory") NERSCDirectory
Items
Item NERSCDirectory
Int(Name="WhichMode" Label="Mode Number" Version="0") Int(Name="WhichMode" Label="Mode Number" Version="0")
BriefDescription The mode number calculated from the omega3p or s3p data imported into tem3p BriefDescription The mode number calculated from the omega3p or s3p data imported into tem3p
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
...@@ -69,14 +59,18 @@ SMTK_AttributeSystem(Version="2") ...@@ -69,14 +59,18 @@ SMTK_AttributeSystem(Version="2")
Items Items
Item DielectricConstantE Item DielectricConstantE
Item LossTangentE Item LossTangentE
Item Source Item NERSCDirectory
Item WhichMode Item WhichMode
Item Method Item Method
= '\n' = '\n'
AttDef(Type="ExternalVolumeHeating" Label="External Volume Heating" BaseType="HeatSource" Version="0") AttDef(Type="ExternalVolumeHeating" Label="External Volume Heating" BaseType="HeatSource" Version="0")
ItemDefinitions ItemDefinitions
File(Name="DataFile" Label="Data File" ShouldExist="true" NumberOfRequiredValues="1" Version="0") //- Use hidden item to hard-code Condition type
String(Name="ConditionType" AdvanceLevel="99")
DefaultValue ExtVHeating
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
File(Name="ExtVHeatingFile" Label="External Heating Map File" ShouldExist="true" NumberOfRequiredValues="1" Version="0")
BriefDescription File name of the external volume heating data BriefDescription File name of the external volume heating data
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic] Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
<ChildrenDefinitions> <ChildrenDefinitions>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
<RangleInfo> <RangleInfo>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
<RangleInfo> <RangleInfo>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<BriefDescription>Thermal expansion coefficient (not relevant for eigenmode solver)</BriefDescription> <BriefDescription>Thermal expansion coefficient (not relevant for eigenmode solver)</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
<DefaultValue>0.0</DefaultValue> <DefaultValue>0.0</DefaultValue>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<SMTK_AttributeSystem Version="2"> <SMTK_AttributeSystem Version="2">
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
<Definitions> <Definitions>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<BriefDescription>Write the deformed mesh</BriefDescription> <BriefDescription>Write the deformed mesh</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
</Void> </Void>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<BriefDescription> The source for the omega3p input mesh</BriefDescription> <BriefDescription> The source for the omega3p input mesh</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
<ChildrenDefinitions> <ChildrenDefinitions>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<BriefDescription>Full path to existing directory on a NERSC file system. where the omega3p results are stored</BriefDescription> <BriefDescription>Full path to existing directory on a NERSC file system. where the omega3p results are stored</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
</String> </String>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<BriefDescription>Deformation scale factor</BriefDescription> <BriefDescription>Deformation scale factor</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
<DefaultValue>1.0</DefaultValue> <DefaultValue>1.0</DefaultValue>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<BriefDescription>Write the stress/strain .mod files</BriefDescription> <BriefDescription>Write the stress/strain .mod files</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
</Void> </Void>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
</Categories> </Categories>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<Categories> <Categories>
<Cat>TEM3P-Eigen</Cat> <Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<BriefDescription>Type of solver</BriefDescription> <BriefDescription>Type of solver</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<BriefDescription>Calculate the solution residual or not</BriefDescription> <BriefDescription>Calculate the solution residual or not</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<BriefDescription>Save degrees of freedom for further post-processing</BriefDescription> <BriefDescription>Save degrees of freedom for further post-processing</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<BriefDescription>Type of preconditioner</BriefDescription> <BriefDescription>Type of preconditioner</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<BriefDescription>Absolute convergence tolerance</BriefDescription> <BriefDescription>Absolute convergence tolerance</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<BriefDescription>Relative convergence tolerance</BriefDescription> <BriefDescription>Relative convergence tolerance</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<BriefDescription>Maximum number of iterations when the solver process terminates even if the tolerance has not been reached</BriefDescription> <BriefDescription>Maximum number of iterations when the solver process terminates even if the tolerance has not been reached</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Harmonic</Cat> <Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat> <Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
......
...@@ -44,31 +44,13 @@ ...@@ -44,31 +44,13 @@
</Categories> </Categories>
<DefaultValue>0.0</DefaultValue> <DefaultValue>0.0</DefaultValue>
</Double> </Double>
<String Name="Source" Label="Source" Version="0"> <String Name="NERSCDirectory" Label="NERSC Directory" Version="0">
<BriefDescription> The source for the omega3p or s3p data simulation results</BriefDescription> <BriefDescription>Full path to existing directory on a NERSC file system, where the omega3p or s3p results are stored</BriefDescription>
<Categories> <Categories>
<Cat>TEM3P-Linear-Thermal</Cat> <Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat> <Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat> <Cat>TEM3P-ThermoElastic</Cat>
</Categories> </Categories>
<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</BriefDescription>
<Categories>
<Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</String>
</ChildrenDefinitions>
<DiscreteInfo DefaultIndex="0">
<Structure>
<Value Enum="Use NERSC Directory">NERSCDirectory</Value>
<Items>
<Item>NERSCDirectory</Item>
</Items>
</Structure>
</DiscreteInfo>
</String> </String>
<Int Name="WhichMode" Label="Mode Number" Version="0"> <Int Name="WhichMode" Label="Mode Number" Version="0">
<BriefDescription>The mode number calculated from the omega3p or s3p data imported into tem3p</BriefDescription> <BriefDescription>The mode number calculated from the omega3p or s3p data imported into tem3p</BriefDescription>
...@@ -117,7 +99,7 @@ ...@@ -117,7 +99,7 @@
<Items> <Items>
<Item>DielectricConstantE</Item> <Item>DielectricConstantE</Item>
<Item>LossTangentE</Item> <Item>LossTangentE</Item>
<Item>Source</Item> <Item>NERSCDirectory</Item>
<Item>WhichMode</Item> <Item>WhichMode</Item>
<Item>Method</Item> <Item>Method</Item>
</Items> </Items>
...@@ -129,7 +111,15 @@ ...@@ -129,7 +111,15 @@