Commit 8bf8316a authored by wenqing's avatar wenqing Committed by Dmitry Yu. Naumov
Browse files

[CTest/M] Changed the reference temperature to Parameter type

parent 32e4bfbf
......@@ -265,11 +265,6 @@ public:
auto const& b = _process_data.specific_body_force;
double const T_ref =
_process_data.reference_temperature
? (*_process_data.reference_temperature)(t, x_position)[0]
: std::numeric_limits<double>::quiet_NaN();
for (unsigned ip = 0; ip < n_integration_points; ip++)
{
x_position.setIntegrationPoint(ip);
......@@ -319,6 +314,12 @@ public:
.emplace<
MathLib::KelvinVector::KelvinVectorType<DisplacementDim>>(
eps_prev);
double const T_ref =
_process_data.reference_temperature
? (*_process_data.reference_temperature)(t, x_position)[0]
: std::numeric_limits<double>::quiet_NaN();
variables_prev[static_cast<int>(MPL::Variable::temperature)]
.emplace<double>(T_ref);
variables[static_cast<int>(MPL::Variable::mechanical_strain)]
......
......@@ -24,7 +24,7 @@
</constitutive_relation>
<solid_density>rho_sr</solid_density>
<specific_body_force>0 0 0</specific_body_force>
<reference_temperature>293.15</reference_temperature>
<reference_temperature>T_ref</reference_temperature>
<process_variables>
<process_variable>displacement</process_variable>
</process_variables>
......@@ -82,6 +82,11 @@
<basis_vector_2>e2</basis_vector_2>
</local_coordinate_system>
<parameters>
<parameter>
<name>T_ref</name>
<type>Constant</type>
<values>293.15</values>
</parameter>
<parameter>
<name>e0</name>
<type>Constant</type>
......
......@@ -24,7 +24,7 @@
</constitutive_relation>
<solid_density>rho_sr</solid_density>
<specific_body_force>0 0 0</specific_body_force>
<reference_temperature>293.15</reference_temperature>
<reference_temperature>T_ref</reference_temperature>
<process_variables>
<process_variable>displacement</process_variable>
</process_variables>
......@@ -82,6 +82,11 @@
<basis_vector_2>e0</basis_vector_2>
</local_coordinate_system>
<parameters>
<parameter>
<name>T_ref</name>
<type>Constant</type>
<values>293.15</values>
</parameter>
<parameter>
<name>e0</name>
<type>Constant</type>
......
......@@ -24,7 +24,7 @@
</constitutive_relation>
<solid_density>rho_sr</solid_density>
<specific_body_force>0 0 0</specific_body_force>
<reference_temperature>293.15</reference_temperature>
<reference_temperature>T_ref</reference_temperature>
<process_variables>
<process_variable>displacement</process_variable>
</process_variables>
......@@ -82,6 +82,11 @@
<basis_vector_2>e1</basis_vector_2>
</local_coordinate_system>
<parameters>
<parameter>
<name>T_ref</name>
<type>Constant</type>
<values>293.15</values>
</parameter>
<parameter>
<name>e0</name>
<type>Constant</type>
......
......@@ -17,7 +17,7 @@
</constitutive_relation>
<solid_density>rho_sr</solid_density>
<specific_body_force>0 0 0</specific_body_force>
<reference_temperature>293.15</reference_temperature>
<reference_temperature>T_ref</reference_temperature>
<process_variables>
<process_variable>displacement</process_variable>
</process_variables>
......@@ -68,6 +68,11 @@
</output>
</time_loop>
<parameters>
<parameter>
<name>T_ref</name>
<type>Constant</type>
<values>293.15</values>
</parameter>
<parameter>
<name>E</name>
<type>Constant</type>
......
......@@ -22,7 +22,7 @@
</constitutive_relation>
<solid_density>rho_sr</solid_density>
<specific_body_force>0 0</specific_body_force>
<reference_temperature>293.15</reference_temperature>
<reference_temperature>T_ref</reference_temperature>
<process_variables>
<process_variable>displacement</process_variable>
</process_variables>
......@@ -79,6 +79,11 @@
<basis_vector_1>e1</basis_vector_1>
</local_coordinate_system>
<parameters>
<parameter>
<name>T_ref</name>
<type>Constant</type>
<values>293.15</values>
</parameter>
<parameter>
<name>e0</name>
<type>Constant</type>
......
......@@ -22,7 +22,7 @@
</constitutive_relation>
<solid_density>rho_sr</solid_density>
<specific_body_force>0 0</specific_body_force>
<reference_temperature>293.15</reference_temperature>
<reference_temperature>T_ref</reference_temperature>
<process_variables>
<process_variable>displacement</process_variable>
</process_variables>
......@@ -79,6 +79,11 @@
<basis_vector_1>e1</basis_vector_1>
</local_coordinate_system>
<parameters>
<parameter>
<name>T_ref</name>
<type>Constant</type>
<values>293.15</values>
</parameter>
<parameter>
<name>e0</name>
<type>Constant</type>
......
......@@ -22,7 +22,7 @@
</constitutive_relation>
<solid_density>rho_sr</solid_density>
<specific_body_force>0 0</specific_body_force>
<reference_temperature>293.15</reference_temperature>
<reference_temperature>T_ref</reference_temperature>
<process_variables>
<process_variable>displacement</process_variable>
</process_variables>
......@@ -79,6 +79,11 @@
<basis_vector_1>e0_negative</basis_vector_1>
</local_coordinate_system>
<parameters>
<parameter>
<name>T_ref</name>
<type>Constant</type>
<values>293.15</values>
</parameter>
<parameter>
<name>e0_negative</name>
<type>Constant</type>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment