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
......@@ -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
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
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]
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>
......@@ -18,7 +18,7 @@
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ChildrenDefinitions>
......@@ -26,7 +26,7 @@
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<RangleInfo>
......@@ -37,7 +37,7 @@
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<RangleInfo>
......@@ -48,7 +48,7 @@
<BriefDescription>Thermal expansion coefficient (not relevant for eigenmode solver)</BriefDescription>
<Categories>
<Cat>TEM3P-Harmonic</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>0.0</DefaultValue>
......
......@@ -2,7 +2,7 @@
<SMTK_AttributeSystem Version="2">
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<Definitions>
......@@ -14,7 +14,7 @@
<BriefDescription>Write the deformed mesh</BriefDescription>
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</Void>
......@@ -24,7 +24,7 @@
<BriefDescription> The source for the omega3p input mesh</BriefDescription>
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<ChildrenDefinitions>
......@@ -32,7 +32,7 @@
<BriefDescription>Full path to existing directory on a NERSC file system. where the omega3p results are stored</BriefDescription>
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</String>
......@@ -52,7 +52,7 @@
<BriefDescription>Deformation scale factor</BriefDescription>
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
<DefaultValue>1.0</DefaultValue>
......@@ -63,7 +63,7 @@
<BriefDescription>Write the stress/strain .mod files</BriefDescription>
<Categories>
<Cat>TEM3P-Eigen</Cat>
<Cat>TEM3P-Static</Cat>
<Cat>TEM3P-Elastic</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</Void>
......
......@@ -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>
</Categories>
......@@ -15,7 +15,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>
......@@ -30,7 +30,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>
......@@ -44,7 +44,7 @@
<BriefDescription>Type of solver</BriefDescription>
<Categories>
<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>
......@@ -59,7 +59,7 @@
<BriefDescription>Calculate the solution residual or not</BriefDescription>
<Categories>
<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>
......@@ -69,7 +69,7 @@
<BriefDescription>Save degrees of freedom for further post-processing</BriefDescription>
<Categories>
<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>
......@@ -79,7 +79,7 @@
<BriefDescription>Type of preconditioner</BriefDescription>
<Categories>
<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>
......@@ -95,7 +95,7 @@
<BriefDescription>Absolute convergence tolerance</BriefDescription>
<Categories>
<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>
......@@ -109,7 +109,7 @@
<BriefDescription>Relative convergence tolerance</BriefDescription>
<Categories>
<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>
......@@ -123,7 +123,7 @@
<BriefDescription>Maximum number of iterations when the solver process terminates even if the tolerance has not been reached</BriefDescription>
<Categories>
<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>
......
......@@ -44,32 +44,14 @@
</Categories>
<DefaultValue>0.0</DefaultValue>
</Double>
<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>
<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>
<BriefDescription>Full path to 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>
<Int Name="WhichMode" Label="Mode Number" Version="0">
<BriefDescription>The mode number calculated from the omega3p or s3p data imported into tem3p</BriefDescription>
<Categories>
......@@ -117,7 +99,7 @@
<Items>
<Item>DielectricConstantE</Item>
<Item>LossTangentE</Item>
<Item>Source</Item>
<Item>NERSCDirectory</Item>
<Item>WhichMode</Item>
<Item>Method</Item>
</Items>
......@@ -129,7 +111,15 @@
<AttDef Type="ExternalVolumeHeating" Label="External Volume Heating" BaseType="HeatSource" Version="0">
<ItemDefinitions>
<File Name="DataFile" Label="Data File" ShouldExist="true" NumberOfRequiredValues="1" Version="0">
<String Name="ConditionType" AdvanceLevel="99">
<DefaultValue>ExtVHeating</DefaultValue>
<Categories>
<Cat>TEM3P-Linear-Thermal</Cat>
<Cat>TEM3P-Nonlinear-Thermal</Cat>
<Cat>TEM3P-ThermoElastic</Cat>
</Categories>
</String>
<File Name="ExtVHeatingFile" Label="External Heating Map File" ShouldExist="true" NumberOfRequiredValues="1" Version="0">
<BriefDescription>File name of the external volume heating data</BriefDescription>
<Categories>
<Cat>TEM3P-Linear-Thermal</Cat>
......
......@@ -8,16 +8,18 @@ Set category to Omega3P
## Boundary conditions
Exterior --> New, side set 6
Conductivity ->>5.811e+07
side set 1 ------> Magnetic
side set 2 ------> Magnetic
side set 6 ------> Exterior
Conductivity --> 5.78e+07
Magnetic --> side set 1, side set 2
## Materials
Material --> New, element block 1
Relative Permittivity (Epsilon) --> 0.99
Relative Permeability (Mu) --> 0.98
Relative Permittivity (Epsilon) --> 0.99
Relative Permeability (Mu) --> 0.98
## Analysis
......
......@@ -55,7 +55,7 @@ Linear Solver Type --> CG
Preconditioner ------> DIAGONAL
Absolute Tolerance --> 1e-18
Tolerance -----------> 1e-10
Max Iterations ------> 5000
Max Iterations ------> 5001
## Step 2: Elastic (Thermostatic) Solver Specification
......
// Generated by CMB 28-Jun-2018 10:07
// Generated by CMB 29-Jun-2018 15:20
ThermoElasticProblem:
{
......@@ -17,7 +17,7 @@ ThermostaticProblem:
Preconditioner: DIAGONAL
AbsoluteTolerance: 1e-18
Tolerance: 1e-10
MaxIterations: 5000
MaxIterations: 5001
}
PicardSolver:
......@@ -76,6 +76,7 @@ ThermostaticProblem:
{
Id: 6
ConditionType: RFHeating
NERSCDirectory: placeholder
WhichMode: 0
Method: Gradient
Sigma: 5.8e+07
......@@ -131,6 +132,7 @@ ElasticProblem:
{
Id: 6
ConditionType: LFDetuning
NERSCDirectory: placeholder
WhichMode: 0
Omega3PId: 6
Method: Gradient
......@@ -168,14 +170,14 @@ ElasticProblem:
Boundary:
{
Id: 4
Id: 5
ConditionType: Neumann
NeumannValue: 0
}
Boundary:
{
Id: 5
Id: 4
ConditionType: Neumann
NeumannValue: 0
}
......
// Generated by CMB 29-May-2018 14:09
// Generated by CMB 28-Jun-2018 18:11
TotalTime: on
TotalTime: 20
FieldScales:
{
......@@ -21,7 +21,7 @@ NormalizedField:
Domain:
{
FieldDir: xyzzy
FieldDir: {NERSC folder}
ModeID1: 0
dt: 1.000000
MaxImpacts: 50
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -61,8 +61,11 @@ Side set 6 --------> Secondary
## Postprocess
Enhancement Counter ----------> on (checked)
SEY Surface 1 -----> on (checked)
Boundary Surface --> side set 6
SEY Filename ------> copper.dat
SEY Surface 1 -----> on (checked)
Boundary Surface --> side set 6
SEY Filename ------> copper.dat
(in ACE3P/internal/test/track3p/pillbox/)
Minimum Enhancement Counter --> 1
Minimum Enhancement Counter --> 1
## Save Simulation
pillbox.crf
......@@ -314,7 +314,7 @@ class Tem3PWriter(basewriter.BaseWriter):
CardFormat('MixedValue').write(self.scope, att, indent=' ')
else:
# Other types can use default handling
skip_list = ['PlaceHolder', 'NonlinearConvectiveSurface', 'Source', 'SurfaceResistance']
skip_list = ['PlaceHolder', 'NonlinearConvectiveSurface', 'SurfaceResistance']
self.write_standard_items(att, skip_list=skip_list, keyword_table=keyword_table)
# Special cases:
......@@ -326,15 +326,21 @@ class Tem3PWriter(basewriter.BaseWriter):
else:
self.scope.output.write(' %sValue: 0.\n' % condition_type)
# Check for LFDetuning case, which uses Source
if (att.type() == 'TEM3PLFDetuning'):
source_item = att.itemAtPath('Omega3PResults/Source', '/')
self.write_em_source(source_item)
# Check for LFDetuning case, which requries NERSC directory
if att.type() == 'TEM3PLFDetuning':
path_item = att.findString('NERSCDirectory')
remote_path = path_item.value(0).rstrip('/')
self.set_symlink(remote_path)
basename = os.path.basename(remote_path)
self.scope.output.write(' Directory: %s\n' % basename)
# Check for RFHeating case, which uses Source and optional nonlinear properties
elif (att.type() == 'TEM3PThermalRFHeating'):
source_item = att.itemAtPath('EMResults/Source', '/')
self.write_em_source(source_item)
path_item = att.findString('NERSCDirectory')
remote_path = path_item.value(0).rstrip('/')
self.set_symlink(remote_path)
basename = os.path.basename(remote_path)
self.scope.output.write(' Directory: %s\n' % basename)
surface_res_item = att.findString('SurfaceResistance')
if surface_res_item.isEnabled() and surface_res_item.isSet(0):
......@@ -446,43 +452,38 @@ class Tem3PWriter(basewriter.BaseWriter):
for ent_id in ent_idlist:
self.start_command('HeatSource')
self.scope.output.write(' Id: %s\n' % ent_id)
self.write_standard_items(att, skip_list=['Source'])
source_item = att.findString('Source')
self.write_em_source(source_item)
self.finish_command()
def write_harmonic_analysis(self):
print 'Writing harmonic analysis'
self.write_standard_instance_att('HarmonicAnalysis', silent_list=['Frequency'])
self.write_standard_items(att, skip_list=['NERSCDirectory', 'ExtVHeatingFile'])
def write_em_source(self, source_item, keyword='Directory', indent=' '):
'''Writes LocalDirectory or NERSCDirectory item
'''
source_value = source_item.value()
#print 'source_value: %s' % source_value
if source_value == 'LocalDirectory':
local_item = source_item.findChild('LocalDirectory', smtk.attribute.ACTIVE_CHILDREN)
local_path = local_item.value(0).rstrip('/')
# Check that folder exists
# NERSC directory for LossyDielectricHeat atts
path_item = att.findString('NERSCDirectory')
if path_item is not None:
remote_path = path_item.value(0).rstrip('/')
self.set_symlink(remote_path)
basename = os.path.basename(remote_path)
self.scope.output.write(' Directory: %s\n' % basename)
# ExtVHeatingFile for ExternalVolumeHeating atts
path_item = att.findString('ExtVHeatingFile')
if path_item is not None:
if not path_item.isSet(0):
raise Exception('File not set for Heat Source %s' % att.name())
local_path = path_item.value(0)
if not os.path.exists(local_path):
msg = 'ERROR: Local data directory not found at %s' % local_path
self.scope.logger.addError(msg)
msg = 'File \"%s\"" not found for Heat Source %s' % (local_path, att.name())
raise Exception(msg)
field_dir = os.path.basename(local_path)
# Add flag to upload folder to NERSC
basename = os.path.basename(local_path)
self.scope.output.write(' ExtVHeatingFile: %s\n' % basename)
# Include file in upload to NERSC
self.scope.folders_to_upload.add(local_path)
elif source_value == 'NERSCDirectory':
nersc_item = source_item.findChild('NERSCDirectory', smtk.attribute.ACTIVE_CHILDREN)
remote_path = nersc_item.value(0).rstrip('/')
self.set_symlink(remote_path)
field_dir = os.path.basename(remote_path)
else:
raise Exception('Unrecognized source value %s' % source_value)
self.scope.output.write('%s%s: %s\n' % (indent, keyword, field_dir))
self.finish_command()
def write_harmonic_analysis(self):
print 'Writing harmonic analysis'
self.write_standard_instance_att('HarmonicAnalysis', silent_list=['Frequency'])