Commit 6d1bee0f authored by Boris Pek's avatar Boris Pek

Imported Upstream version 7.0.svn.5862+dfsg

parent a0800406
......@@ -115,6 +115,10 @@ contains(DEFINES, EG_PYTHONQT) {
#------------------------------------------------------------------------------
win32: LIBS += -lpsapi
#------------------------------------------------------------------------------
# OpenGL GLU
#------------------------------------------------------------------------------
unix: LIBS += -lGLU
#------------------------------------------------------------------------------
# Input files:
#------------------------------------------------------------------------------
......
......@@ -94,7 +94,7 @@
<Parameter Widget="Edit" Enabled="True" Visible="True">
<Name>Capacitance Body</Name>
<Whatis> This keyword should be provided for capacitance matrix computation only. The numbers should provide continous numbering from 1 to the total number of bodies. Ground may be defined with value 0 or by explicitely setting potential to zero somewhere.</Whatis>
<Whatis> This keyword should be provided for capacitance matrix computation only. The numbers should provide continuous numbering from 1 to the total number of bodies. Ground may be defined with value 0 or by explicitely setting potential to zero somewhere.</Whatis>
</Parameter>
<Parameter Widget="Label" > <Name> Neumann conditions </Name> </Parameter>
......@@ -102,7 +102,14 @@
<Name> Electric Flux </Name>
<Whatis> Give electric flux equivalent to the surface charge density. </Whatis>
</Parameter>
</BoundaryCondition>
<Parameter Widget="CheckBox" >
<Name> Electric Infinity BC </Name>
<Type> Logical </Type>
<Whatis> Use a far field condition for the electric flux. </Whatis>
</Parameter>
</BoundaryCondition>
</PDE>
</edf>
......
......@@ -57,6 +57,7 @@
<Name>Porosity Model</Name>
<Type>String </Type>
<Whatis> The porosity models for the medium. </Whatis>
<Item> <Name> None </Name>
<Item> <Name> van Genuchten </Name>
<Activate> /Richards Equation/Material/Saturated Hydraulic Conductivity</Activate>
<Activate> /Richards Equation/Material/Saturated Water Content</Activate>
......@@ -64,12 +65,10 @@
<Activate> /Richards Equation/Material/van Genuchten Alpha</Activate>
<Activate> /Richards Equation/Material/van Genuchten N</Activate>
<Activate> /Richards Equation/Material/van Genuchten M</Activate>
<Deactivate> /Richards Equation/Material/Hydraulic Conductivity</Deactivate>
<Deactivate> /Richards Equation/Material/Water Content</Deactivate>
</Item>
<Item> <Name> Default </Name>
<Activate> /Richards Equation/Material/Hydraulic Conductivity</Activate>
<Activate> /Richards Equation/Material/Water Content</Activate>
</Item>
<DefaultValue> Default </DefaultValue>
<DefaultValue> None </DefaultValue>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
......@@ -91,10 +90,10 @@
<Name> van Genuchten M </Name>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Parameter Widget="Edit" Enabled="True" Visible="True">
<Name> Hydraulic Conductivity </Name>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Parameter Widget="Edit" Enabled="True" Visible="True">
<Name> Water Content </Name>
</Parameter>
</Material>
......
......@@ -25,7 +25,7 @@
<Parameter Widget="CheckBox" >
<Name> Filename Numbering </Name>
<Type> Logical </Type>
<Whatis> Number the files with continous numbering so that existing filenames are not used. False is the default. </Whatis>
<Whatis> Number the files with continuous numbering so that existing filenames are not used. False is the default. </Whatis>
</Parameter>
<Parameter Widget="CheckBox" >
......
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE edf>
<edf version="1.0" >
<PDE Name="SST-K-Omega" >
<Name>SST K-Omega</Name>
<Equation>
<Parameter Widget="Label">
<Name> Free text input </Name>
</Parameter>
<Parameter Widget="TextEdit" Enabled="True">
<Name> Free text </Name>
<Type> String </Type>
<Whatis> Free text is copied into the Equation-block of the SIF as such. </Whatis>
<StatusTip> Free text is copied into the Equation-block of the SIF as such. </StatusTip>
</Parameter>
</Equation>
<Solver>
<Parameter Widget="Edit" >
<Name > Procedure </Name>
<DefaultValue> "SSTKOmega" "SSTKOmega" </DefaultValue>
</Parameter>
<Parameter Widget="Label"> <Name>Additional Variables</Name> </Parameter>
<Parameter Widget="Edit">
<Name> Exported Variable 1 </Name>
<Activate> /SST-K-Omega/Solver/Exported Variable 2</Activate>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Name> Exported Variable 2 </Name>
<Activate> /SST-K-Omega/Solver/Exported Variable 3</Activate>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Name> Exported Variable 3 </Name>
<Activate> /SST-K-Omega/Solver/Exported Variable 4</Activate>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Name> Exported Variable 4 </Name>
<Activate> /SST-K-Omega/Solver/Exported Variable 5</Activate>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Name> Exported Variable 5 </Name>
</Parameter>
<Parameter Widget="Label">
<Name> Free text input </Name>
</Parameter>
<Parameter Widget="TextEdit" Enabled="True">
<Name> Free text </Name>
<Type> String </Type>
<Whatis> Free text is copied into the Solver-block of the SIF as such. </Whatis>
<StatusTip> Free text is copied into the Solver-block of the SIF as such. </StatusTip>
</Parameter>
</Solver>
<BodyForce>
<Parameter Widget="Label">
<Name> Free text input </Name>
</Parameter>
<Parameter Widget="TextEdit" Enabled="True">
<Name> Free text </Name>
<Type> String </Type>
<Whatis> Free text is copied into the Body Force-block of the SIF as such. </Whatis>
<StatusTip> Free text is copied into the Body Force-block of the SIF as such. </StatusTip>
</Parameter>
</BodyForce>
<Material>
<Parameter Widget="Label" > <Name> Properties </Name> </Parameter>
<Parameter Widget="Edit" >
<Name> Turbulent Prandtl Number </Name>
</Parameter>
<Parameter Widget="Edit" >
<Name> Dissipation Buoancy Coefficient </Name>
</Parameter>
<Parameter Widget="Edit" >
<Name> KE Cmu </Name>
</Parameter>
<Parameter Widget="Label">
<Name> Free text input </Name>
</Parameter>
<Parameter Widget="TextEdit" Enabled="True">
<Name> Free text </Name>
<Type> String </Type>
<Whatis> Free text is copied into the Material-block of the SIF as such. </Whatis>
<StatusTip> Free text is copied into the Material-block of the SIF as such. </StatusTip>
</Parameter>
</Material>
<InitialCondition>
<Parameter Widget="Label" > <Name> Variables </Name> </Parameter>
<Parameter Widget="Edit">
<Name> Kinetic Energy </Name>
</Parameter>
<Parameter Widget="Edit">
<Name> Kinetic Dissipation </Name>
</Parameter>
<Parameter Widget="Edit">
<Name> Wall Distance </Name>
</Parameter>
<Parameter Widget="Label">
<Name> Free text input </Name>
</Parameter>
<Parameter Widget="TextEdit" Enabled="True">
<Name> Free text </Name>
<Type> String </Type>
<Whatis> Free text is copied into the Initial Condition-block of the SIF as such. </Whatis>
<StatusTip> Free text is copied into the Initial Condition-block of the SIF as such. </StatusTip>
</Parameter>
</InitialCondition>
<BoundaryCondition>
<Parameter Widget="Label" > <Name> Dirichlet Conditions </Name> </Parameter>
<Parameter Widget="Edit">
<Name> Kinetic Energy </Name>
<Activate> /SST-K-Omega/BoundaryCondition/Kinetic Energy Condition </Activate>
</Parameter>
<Parameter Widget="Edit">
<Name> Kinetic Dissipation </Name>
<SifName> Kinetic Dissipation </SifName>
<Activate> /SST-K-Omega/BoundaryCondition/Kinetic Dissipation Condition </Activate>
</Parameter>
<Parameter Widget="Edit" Enabled="False">
<Name> Kinetic Energy Condition </Name>
<Whatis> If the given value is less than zero, apply flux condition insted of the Dirichlet Condition. To be generally useful space and/or time varying values may be given. </Whatis>
<StatusTip> Give kinetic energy condition value for this boundary. </StatusTip>
</Parameter>
<Parameter Widget="Edit" Enabled="False">
<Name> Kinetic Dissipation Condition </Name>
<Whatis> If the given value is less than zero, apply flux condition insted of the Dirichlet Condition. To be generally useful space and/or time varying values may be given. </Whatis>
<StatusTip> Give kinetic energy dissipation condition value for this boundary. </StatusTip>
</Parameter>
<Parameter Widget="Label" > <Name> Wall law </Name> </Parameter>
<Parameter Widget="CheckBox">
<Name> Komega Wall Law </Name>
<SifName> Wall Law </SifName>
<Activate> /SST-K-Omega/BoundaryCondition/Boundary Layer Thickness </Activate>
<Activate> /SST-K-Omega/BoundaryCondition/Su </Activate>
</Parameter>
<Parameter Widget="Edit" Enabled="False">
<Name> Boundary Layer Thickness </Name>
</Parameter>
<Parameter Widget="Edit" Enabled="False">
<Name> Boundary Layer Thickness </Name>
</Parameter>
<Parameter Widget="Label">
<Name> Free text input </Name>
</Parameter>
<Parameter Widget="TextEdit" Enabled="True">
<Name> Free text </Name>
<Type> String </Type>
<Whatis> Free text is copied into the Boundary Condition-block of the SIF as such. </Whatis>
<StatusTip> Free text is copied into the Boundary Condition-block of the SIF as such. </StatusTip>
</Parameter>
</BoundaryCondition>
</PDE>
</edf>
......@@ -138,6 +138,20 @@
<parameter name="Sound speed" >3810.0</parameter>
</material>
<material name="Lead (generic)" >
<parameter name="Density" >11340.0</parameter>
<parameter name="Youngs modulus" >16.0e9</parameter>
<parameter name="Poisson ratio" >0.44</parameter>
<parameter name="Shear modulus" >5.6e9</parameter>
<parameter name="Bulk modulus" >46.0e9</parameter>
<parameter name="Heat expansion coeff." >28.9e-6</parameter>
<parameter name="Heat conductivity" >35.3</parameter>
<parameter name="Heat capacity" >128.0</parameter>
<parameter name="Electric resistivity" >208.0e-9</parameter>
<parameter name="Electric conductivity" >4.808e6</parameter>
<parameter name="Sound speed" >1190.0</parameter>
</material>
<material name="Glass (borosilicate)" >
<parameter name="Density" >2235.0</parameter>
<parameter name="Heat expansion coeff." >3.5e-6</parameter>
......@@ -220,7 +234,7 @@
<parameter name="Sound speed" >5000.0</parameter>
</material>
<material name="Water (frozen)" >
<material name="Water (frozen in Celcius)" >
<parameter name="Density" >910.0</parameter>
<parameter name="Heat conductivity" >Variable Temperature; Real MATC "9.828*exp(-5.7E-03*(tx+273.15))"</parameter>
<parameter name="Heat capacity" >Variable Temperature; Real MATC "146.3+(7.253*(tx+273.15))"</parameter>
......@@ -230,19 +244,29 @@
<parameter name="Viscosity" >Variable Temperature; Real MATC "(2.0*3.0*1.916E03 * exp( -139.0E03/(8.314 *(tx+273.15))))^(-1.0/3.0)</parameter>
</material>
<material name="Silicon (isotropic, 25 C)" >
<material name="Silicon (solid)" >
<parameter name="Density" >2330.0</parameter>
<parameter name="Youngs modulus" >185.0e9</parameter>
<parameter name="Poisson ratio" >0.28</parameter>
<parameter name="Heat expansion coeff." >4.68e-6</parameter>
<parameter name="Heat conductivity" >148.</parameter>
<parameter name="Heat conductivity" >Variable Temperature; Real; 0 156; 300 156; 550 72; 800 43; 1050 29; 1300 25; 1550 23; 1800 21; 3000 21; End</parameter>
<parameter name="Heat capacity" >555.8</parameter>
<parameter name="Emissivity" >0.7</parameter>
<parameter name="Electric resistivity" >1.0e3</parameter>
<parameter name="Electric conductivity" >1.0e-3</parameter>
<parameter name="Sound speed" >8433.0</parameter>
<parameter name="Melting Point" >1683.0</parameter>
<parameter name="Latent heat" >1.8e6</parameter>
</material>
<material name="Silicon (liquid)" >
<parameter name="Liquid" >Logical True</parameter>
<parameter name="Viscosity" >8.0e-4</parameter>
<parameter name="Density" >2570</parameter>
<parameter name="Heat conductivity" >50.0</parameter>
<parameter name="Emissivity" >0.3</parameter>
<parameter name="Heat expansion coeff." >1.08e-4</parameter>
</material>
<material name="Fused Silica (25 C)" >
<parameter name="Density" >2200.0</parameter>
......@@ -255,5 +279,5 @@
<parameter name="Relative Permittivity" >3.75</parameter>
<parameter name="Melting Point" >1956.0</parameter>
</material>
</materiallibrary>
......@@ -234,6 +234,31 @@
<StatusTip> Give temperature condition value for bodies using this "Body Force" definition. </StatusTip>
</Parameter>
<Parameter Widget="Label"> <Name> Perfusion </Name> </Parameter>
<Parameter Widget="Edit">
<Name> Perfusion Rate </Name>
<Activate> /Heat Equation/BodyForce/Perfusion Reference Temperature </Activate>
<Activate> /Heat Equation/BodyForce/Perfusion Density </Activate>
<Activate> /Heat Equation/BodyForce/Perfusion Heat Capacity </Activate>
<Whatis> This "Body Force" models uniform perfusion (e.g. microperfusion with blood in biological tissue). The Perfusion rate is the volume of perfusion medium flowing through a unit volume per second.</Whatis>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Name> Perfusion Reference Temperature </Name>
<Whatis> The temperature of the perfusion medium. </Whatis>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Name> Perfusion Density </Name>
<Whatis> The density of the perfusion medium. </Whatis>
</Parameter>
<Parameter Widget="Edit" Enabled="False" Visible="False">
<Name> Perfusion Heat Capacity </Name>
<Whatis> The specific heat capacity of the perfusion medium. </Whatis>
</Parameter>
<Parameter Widget="Label">
<Name> Free text input </Name>
</Parameter>
......
......@@ -41,7 +41,7 @@
<Parameter Widget="CheckBox">
<Name> Binary Output </Name>
<DefaultValue> False </DefaultValue>
<DefaultValue> True </DefaultValue>
<Whatis> Use binary format when available (vtu). </Whatis>
</Parameter>
......@@ -51,6 +51,23 @@
<Whatis> Use single precision when available (vtu). </Whatis>
</Parameter>
<Parameter Widget="CheckBox">
<Name> Save Geometry Ids </Name>
<DefaultValue> False </DefaultValue>
<Whatis> Save number of geometric entities when available (vtu). </Whatis>
</Parameter>
<Parameter Widget="CheckBox">
<Name> Save Boundaries Only </Name>
<DefaultValue> False </DefaultValue>
<Whatis> Save only boundaries when available (vtu). </Whatis>
</Parameter>
<Parameter Widget="CheckBox">
<Name> Eigen Analysis </Name>
<DefaultValue> False </DefaultValue>
<Whatis> Numbers files by eigenmodes when available (vtu). </Whatis>
</Parameter>
<Parameter Widget="Edit" >
<Name> Output File Name </Name>
......
......@@ -146,7 +146,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>3</number>
<number>4</number>
</property>
<item>
<property name="text">
......@@ -173,6 +173,31 @@
<string>5</string>
</property>
</item>
<item>
<property name="text">
<string>6</string>
</property>
</item>
<item>
<property name="text">
<string>7</string>
</property>
</item>
<item>
<property name="text">
<string>8</string>
</property>
</item>
<item>
<property name="text">
<string>9</string>
</property>
</item>
<item>
<property name="text">
<string>10</string>
</property>
</item>
</widget>
</item>
<item row="0" column="2">
......
......@@ -244,7 +244,7 @@
<item row="0" column="1" colspan="2" >
<widget class="QLineEdit" name="nonlinSystemConvergenceToleranceEdit" >
<property name="text" >
<string>1.0e-8</string>
<string>1.0e-7</string>
</property>
</widget>
</item>
......@@ -557,7 +557,7 @@
<item row="1" column="1" colspan="3" >
<widget class="QLineEdit" name="linearSystemConvergenceToleranceEdit" >
<property name="text" >
<string>1.0e-8</string>
<string>1.0e-10</string>
</property>
</widget>