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 @@
<Cat>Track3P</Cat>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
......@@ -30,7 +30,7 @@
<Cat>TEM3P-Eigen</Cat>
</Analysis>
<Analysis Type="TEM3P Elastic">
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
</Analysis>
<Analysis Type="TEM3P Harmonic Response">
<Cat>TEM3P-Harmonic</Cat>
......@@ -74,7 +74,7 @@
<View Title="Track3P" Category="Track3P" />
<View Title="TEM3P Harmonic Response" Category="TEM3P-Harmonic" />
<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 Nonlinear" Category="TEM3P-Nonlinear-Thermal" />
<View Title="TEM3P ThermoElastic" Category="TEM3P-ThermoElastic" />
......@@ -142,20 +142,20 @@
<View Type="Group" Title="TEM3P Thermal Linear" TabPosition="North" TabIcons="false">
<Views>
<View Title="TEM3P Thermal BC" />
<View Title="TEM3P Thermal Material" />
<View Title="TEM3P Thermal Analysis"/>
<View Title="Thermal Shells" />
<View Title="TEM3P Thermal Material" />
<View Title="Heat Sources" />
<View Title="TEM3P Thermal Analysis"/>
</Views>
</View>
<View Type="Group" Title="TEM3P Thermal Nonlinear" TabPosition="North" TabIcons="false">
<Views>
<View Title="TEM3P Thermal BC" />
<View Title="TEM3P Thermal Material" />
<View Title="TEM3P Thermal Analysis"/>
<View Title="Thermal Shells" />
<View Title="TEM3P Thermal Material" />
<View Title="Heat Sources" />
<View Title="TEM3P Thermal Analysis"/>
</Views>
</View>
......
......@@ -3,7 +3,7 @@ SMTK_AttributeSystem(Version="2")
Categories
Cat TEM3P-Eigen
Cat TEM3P-Harmonic
Cat TEM3P-Static
Cat TEM3P-Elastic
Cat TEM3P-Linear-Thermal
Cat TEM3P-Nonlinear-Thermal
Cat TEM3P-ThermoElastic
......@@ -21,7 +21,7 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
Double(Name="NeumannValue" Label="Normal Loading" Version="0" Units="Pa")
BriefDescription Fixed normal loading into the surface
Categories #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0.0
// Placeholder item for eigenmode (user cannot change value)
Void(Name="PlaceHolder" AdvanceLevel="99")
......@@ -32,7 +32,7 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
Double(Name="DirichletValue" Label="Displacement (Dirichlet)" Version="0" Units="m")
BriefDescription Fixed displacement
Categories #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0.0
// Placeholder item for eigenmode (user cannot change value)
Void(Name="PlaceHolder" AdvanceLevel="99")
......@@ -42,89 +42,69 @@ SMTK_AttributeSystem(Version="2")
ItemDefinitions
String(Name="MixedType" Label="Mixed Type" Version="0" NumberOfRequiredValues="3")
BriefDescription Boundary condition type in x, y, z directions
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
ComponentLabels #[Label x] #[Label y] #[Label z]
DiscreteInfo
Value(Enum="Displacement (Dirichlet)") DIRICHLET
Value(Enum="Normal Loading (Neumann)") NEUMANN
Double(Name="MixedValue" Label="Mixed Value" Version="0" NumberOfRequiredValues="3")
BriefDescription Value of each type in the corresponding direction
Categories #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
ComponentLabels #[Label x] #[Label y] #[Label z]
DefaultValue 0,0,0
AttDef(Type="TEM3PLFDetuning" Label="LF Detuning" BaseType="TEM3PMechanicalBC" Version="0")
ItemDefinitions
Group(Name="Omega3PResults" Label="Omega3P Results" NumberOfRequiredGroups="1" Version="0")
BriefDescription Results data from Omega3P simulation
ItemDefinitions
String(Name="Source" Label="Source" Version="0")
BriefDescription The source for the omega3p simulation results
Categories #[Cat TEM3P-Harmonic] #[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, where the omega3p results are stored.
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
String(Name="NERSCDirectory" Label="NERSC Directory" Version="0")
BriefDescription Full path existing directory on a NERSC file system. where the omega3p results are stored
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="Use NERSC Directory") NERSCDirectory
Items
Item NERSCDirectory
Structure
Value(Enum="Use Local Directory") LocalDirectory
Items
Item LocalDirectory
Value(Enum="Run Omega3P Simulation") Omega3P
Int(Name="WhichMode" Label="Mode Number" Version="0")
BriefDescription The mode number calculated from the omega3p results to be imported into tem3p
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
RangeInfo #[Min(Inclusive="true") 0]
Int(Name="Omega3PId" Label="Omega3P Id" Version="0")
BriefDescription Sideset id of the interface surface with Omega3P
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
RangeInfo #[Min(Inclusive="true") 0]
String(Name="NERSCDirectory" Label="NERSC Directory" Version="0")
BriefDescription Full path existing directory on a NERSC file system. where the omega3p results are stored
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
Int(Name="WhichMode" Label="Mode Number" Version="0")
BriefDescription The mode number calculated from the omega3p results to be imported into tem3p
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
RangeInfo #[Min(Inclusive="true") 0]
Int(Name="Omega3PId" Label="Omega3P Id" Version="0")
BriefDescription Sideset id of the interface surface with Omega3P
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
RangeInfo #[Min(Inclusive="true") 0]
String(Name="LFDetuningMethod" Label="Method" Version="0")
BriefDescription Method to be used for field normalization
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
Double(Name="TargetGradient" Label="Target Gradient" Units="V/m" Version="0")
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
Double(Name="GradientDirection" Label="Gradient Direction" NumberOfRequiredValues="3" Units="m" Version="0")
BriefDescription Orthonormal Vector
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0,0,1
Double(Name="TargetVoltage" Label="Target Voltage" Units="V" Version="0")
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
Double(Name="VoltageDirection" Label="Voltage Direction" Units="m"
NumberOfRequiredValues="3" Version="0")
BriefDescription Orthonormal Vector
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0,0,1
Double(Name="TargetPowerinput" Label="Target Power Input" Units="w" Version="0")
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
Int(Name="SymmetryFactor" Label="Symmetry Factor")
BriefDescription 0 - full cell, 1 - half cell, 2 - quarter cell
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex=0)
Value(Enum="0 = Full Cell") 0
Value(Enum="1 = Half Cell") 1
Value(Enum="2 = Quarter Cell") 2
Double(Name="StartPoint" Label="Start Point" NumberOfRequiredValues="3" Units="m" Version="0")
BriefDescription The coordinates of the start point of the path
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
ComponentLabels #[Label x] #[Label y] #[Label z]
DefaultValue 0,0,0
Double(Name="EndPoint" Label="End Point" NumberOfRequiredValues="3" Units="m" Version="0")
BriefDescription The coordinates of the end point of the path
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Static] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
ComponentLabels #[Label x] #[Label y] #[Label z]
DefaultValue 0,0,1
......@@ -216,35 +196,14 @@ SMTK_AttributeSystem(Version="2")
AttDef(Type="TEM3PThermalRFHeating" Label="RF Heating" BaseType="TEM3PThermalBC" Version="0")
ItemDefinitions
Group(Name="EMResults" Label="Electromagnetic Results" NumberOfRequiredGroups="1" Version="0")
BriefDescription Results data from either Omega3P or S3P simulation
ItemDefinitions
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] #[Cat TEM3P-ThermoElastic]
ChildrenDefinitions
Directory(Name="LocalDirectory" Label="Local Directory" Version="0" ShouldExist="true")
BriefDescription An existing directory on the local filesystem, where the omega3p or s3p results are stored.
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
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="3")
Value(Enum="Run Omega3P Simulation") Omega3P
Value(Enum="Run S3P Simulation") S3P
Structure
Value(Enum="Use Local Directory") LocalDirectory
Items
Item LocalDirectory
Structure
Value(Enum="Use NERSC Directory") NERSCDirectory
Items
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] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
RangeInfo #[Min(Inclusive="true") 0]
String(Name="NERSCDirectory" Label="NERSC Directory" Version="0")
BriefDescription Full path to existing directory on a NERSC file system, where omega3p or s3p results are stored
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
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] #[Cat TEM3P-ThermoElastic]
DefaultValue 0
RangeInfo #[Min(Inclusive="true") 0]
String(Name="Method" Label="Method" Version="0")
BriefDescription Method for specifying RF heating
......@@ -306,6 +265,7 @@ SMTK_AttributeSystem(Version="2")
DiscreteInfo(DefaultIndex=0)
Value(Enum="1 = Full Cell") 1
Value(Enum="0 = Half Cell") 0
Value(Enum="3 = Quarter Cell") 2
String(Name="SurfaceResistance" Label="Surface Resistance")
BriefDescription Nonlinear surface resistance
......
......@@ -3,7 +3,7 @@ SMTK_AttributeSystem(Version="2")
Categories
Cat TEM3P-Eigen
Cat TEM3P-Harmonic
Cat TEM3P-Static
Cat TEM3P-Elastic
Cat TEM3P-Linear-Thermal
Cat TEM3P-Nonlinear-Thermal
Cat TEM3P-ThermoElastic
......@@ -18,18 +18,18 @@ SMTK_AttributeSystem(Version="2")
MembershipMask volume
ItemDefinitions
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
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]
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]
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] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[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)
......
......@@ -2,7 +2,7 @@ doctype xml
SMTK_AttributeSystem(Version="2")
Categories
Cat TEM3P-Eigen
Cat TEM3P-Static
Cat TEM3P-Elastic
Cat TEM3P-ThermoElastic
Definitions
......@@ -13,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] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[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] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[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] #[Cat TEM3P-ThermoElastic]
//- Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[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] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
DiscreteInfo(DefaultIndex="0")
Structure
Value(Enum="NERSC Directory") NERSCDirectory
......@@ -40,12 +40,12 @@ SMTK_AttributeSystem(Version="2")
Double(Name="MeshDeformScale" Label="Mesh Deform Scale" Version="0")
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
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] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Eigen] #[Cat TEM3P-Elastic] #[Cat TEM3P-ThermoElastic]
= '\n'
......@@ -3,7 +3,7 @@ SMTK_AttributeSystem(Version="2")
Categories
Cat TEM3P-Eigen
Cat TEM3P-Harmonic
Cat TEM3P-Static
Cat TEM3P-Elastic
Cat TEM3P-Linear-Thermal
Cat TEM3P-Nonlinear-Thermal
......@@ -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] #[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
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] #[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")
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] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[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] #[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")
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")
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
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] #[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
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] #[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
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] #[Cat TEM3P-ThermoElastic]
Categories #[Cat TEM3P-Harmonic] #[Cat TEM3P-Elastic] #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
DefaultValue 100000
RangeInfo #[Min(Inclusive="true") 1]
......
......@@ -28,19 +28,9 @@ SMTK_AttributeSystem(Version="2")
BriefDescription The dielectric loss tangent
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
String(Name="NERSCDirectory" Label="NERSC Directory" Version="0")
BriefDescription Full path to 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]
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")
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]
......@@ -69,14 +59,18 @@ SMTK_AttributeSystem(Version="2")
Items
Item DielectricConstantE
Item LossTangentE
Item Source
Item NERSCDirectory
Item WhichMode
Item Method
= '\n'
AttDef(Type="ExternalVolumeHeating" Label="External Volume Heating" BaseType="HeatSource" Version="0")
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
Categories #[Cat TEM3P-Linear-Thermal] #[Cat TEM3P-Nonlinear-Thermal] #[Cat TEM3P-ThermoElastic]
......
......@@ -3,7 +3,7 @@
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
......@@ -20,7 +20,7 @@
<Double Name="NeumannValue" Label="Normal Loading" Version="0" Units="Pa">
<BriefDescription>Fixed normal loading into the surface</BriefDescription>
<Categories>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
......@@ -38,7 +38,7 @@
<Double Name="DirichletValue" Label="Displacement (Dirichlet)" Version="0" Units="m">
<BriefDescription>Fixed displacement</BriefDescription>
<Categories>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
......@@ -57,7 +57,7 @@
<BriefDescription>Boundary condition type in x, y, z directions</BriefDescription>
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ComponentLabels>
......@@ -73,7 +73,7 @@
<Double Name="MixedValue" Label="Mixed Value" Version="0" NumberOfRequiredValues="3">
<BriefDescription>Value of each type in the corresponding direction</BriefDescription>
<Categories>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ComponentLabels>
......@@ -87,87 +87,49 @@
</AttDef>
<AttDef Type="TEM3PLFDetuning" Label="LF Detuning" BaseType="TEM3PMechanicalBC" Version="0">
<ItemDefinitions>
<Group Name="Omega3PResults" Label="Omega3P Results" NumberOfRequiredGroups="1" Version="0">
<BriefDescription>Results data from Omega3P simulation</BriefDescription>
<ItemDefinitions>
<String Name="Source" Label="Source" Version="0">
<BriefDescription> The source for the omega3p simulation results</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ChildrenDefinitions>
<Directory Name="LocalDirectory" Label="Local Directory" Version="0" ShouldExist="true">
<BriefDescription>An existing directory on the local filesystem, where the omega3p results are stored.</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</Directory>
<String Name="NERSCDirectory" Label="NERSC Directory" Version="0">
<BriefDescription>Full path existing directory on a NERSC file system. where the omega3p results are stored</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</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>
<Structure>
<Value Enum="Use Local Directory">LocalDirectory</Value>
<Items>
<Item>LocalDirectory</Item>
</Items>
</Structure>
<Value Enum="Run Omega3P Simulation">Omega3P</Value>
</DiscreteInfo>
</String>
<Int Name="WhichMode" Label="Mode Number" Version="0">
<BriefDescription>The mode number calculated from the omega3p results to be imported into tem3p</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0</DefaultValue>
<RangeInfo>
<Min Inclusive="true">0</Min>
</RangeInfo>
</Int>
<Int Name="Omega3PId" Label="Omega3P Id" Version="0">
<BriefDescription>Sideset id of the interface surface with Omega3P</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<RangeInfo>
<Min Inclusive="true">0</Min>
</RangeInfo>
</Int>
</ItemDefinitions>
</Group>
<String Name="NERSCDirectory" Label="NERSC Directory" Version="0">
<BriefDescription>Full path existing directory on a NERSC file system. where the omega3p results are stored</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</String>
<Int Name="WhichMode" Label="Mode Number" Version="0">
<BriefDescription>The mode number calculated from the omega3p results to be imported into tem3p</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0</DefaultValue>
<RangeInfo>
<Min Inclusive="true">0</Min>
</RangeInfo>
</Int>
<Int Name="Omega3PId" Label="Omega3P Id" Version="0">
<BriefDescription>Sideset id of the interface surface with Omega3P</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<RangeInfo>
<Min Inclusive="true">0</Min>
</RangeInfo>
</Int>
<String Name="LFDetuningMethod" Label="Method" Version="0">
<BriefDescription>Method to be used for field normalization</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ChildrenDefinitions>
<Double Name="TargetGradient" Label="Target Gradient" Units="V/m" Version="0">
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0</DefaultValue>
......@@ -176,7 +138,7 @@
<BriefDescription>Orthonormal Vector</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0,0,1</DefaultValue>
......@@ -184,7 +146,7 @@
<Double Name="TargetVoltage" Label="Target Voltage" Units="V" Version="0">
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0</DefaultValue>
......@@ -193,7 +155,7 @@
<BriefDescription>Orthonormal Vector</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0,0,1</DefaultValue>
......@@ -201,7 +163,7 @@
<Double Name="TargetPowerinput" Label="Target Power Input" Units="w" Version="0">
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0</DefaultValue>
......@@ -210,7 +172,7 @@
<BriefDescription>0 - full cell, 1 - half cell, 2 - quarter cell</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DiscreteInfo DefaultIndex="0">
......@@ -223,7 +185,7 @@
<BriefDescription>The coordinates of the start point of the path</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ComponentLabels>
......@@ -237,7 +199,7 @@
<BriefDescription>The coordinates of the end point of the path</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ComponentLabels>
......@@ -385,65 +347,26 @@
</AttDef>
<AttDef Type="TEM3PThermalRFHeating" Label="RF Heating" BaseType="TEM3PThermalBC" Version="0">
<ItemDefinitions>
<Group Name="EMResults" Label="Electromagnetic Results" NumberOfRequiredGroups="1" Version="0">
<BriefDescription>Results data from either Omega3P or S3P simulation</BriefDescription>
<ItemDefinitions>
<String Name="Source" Label="Source" Version="0">
<BriefDescription> The source for the omega3p or s3p data simulation results</BriefDescription>
<Categories>
<Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ChildrenDefinitions>
<Directory Name="LocalDirectory" Label="Local Directory" Version="0" ShouldExist="true">
<BriefDescription>An existing directory on the local filesystem, 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>
</Directory>
<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="3">
<Value Enum="Run Omega3P Simulation">Omega3P</Value>
<Value Enum="Run S3P Simulation">S3P</Value>
<Structure>
<Value Enum="Use Local Directory">LocalDirectory</Value>
<Items>
<Item>LocalDirectory</Item>
</Items>
</Structure>
<Structure>
<Value Enum="Use NERSC Directory">NERSCDirectory</Value>
<Items>
<Item>NERSCDirectory</Item>
</Items>
</Structure>
</DiscreteInfo>