diff --git a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp index 26e16da4924c511711a7cafd780c1c41df74a470..a800841330e496a0ebb97665db285e2c4ff444fc 100644 --- a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp +++ b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp @@ -28,7 +28,7 @@ void checkMPLProperties( { std::array const required_medium_properties = { MaterialPropertyLib::PropertyType::thermal_conductivity, - MaterialPropertyLib::PropertyType::heat_capacity, + MaterialPropertyLib::PropertyType::specific_heat_capacity, MaterialPropertyLib::PropertyType::density}; std::array<MaterialPropertyLib::PropertyType, 0> const empty{}; diff --git a/ProcessLib/HeatConduction/HeatConductionFEM.h b/ProcessLib/HeatConduction/HeatConductionFEM.h index c28ffdd1c4081224a5ce524f8a336631baae0316..2086bd4ea51509cc0b6d392662263ff8bcf3f9f0 100644 --- a/ProcessLib/HeatConduction/HeatConductionFEM.h +++ b/ProcessLib/HeatConduction/HeatConductionFEM.h @@ -138,10 +138,10 @@ public: .property( MaterialPropertyLib::PropertyType::thermal_conductivity) .value(vars, pos, t, dt)); - auto const heat_capacity = + auto const specific_heat_capacity = medium - .property( - MaterialPropertyLib::PropertyType::heat_capacity) + .property(MaterialPropertyLib::PropertyType:: + specific_heat_capacity) .template value<double>(vars, pos, t, dt); auto const density = medium @@ -151,9 +151,9 @@ public: local_K.noalias() += sm.dNdx.transpose() * k * sm.dNdx * sm.detJ * wp.getWeight() * sm.integralMeasure; - local_M.noalias() += sm.N.transpose() * density * heat_capacity * - sm.N * sm.detJ * wp.getWeight() * - sm.integralMeasure; + local_M.noalias() += sm.N.transpose() * density * + specific_heat_capacity * sm.N * sm.detJ * + wp.getWeight() * sm.integralMeasure; } if (_process_data.mass_lumping) { @@ -221,10 +221,10 @@ public: .property( MaterialPropertyLib::PropertyType::thermal_conductivity) .value(vars, pos, t, dt)); - auto const heat_capacity = + auto const specific_heat_capacity = medium - .property( - MaterialPropertyLib::PropertyType::heat_capacity) + .property(MaterialPropertyLib::PropertyType:: + specific_heat_capacity) .template value<double>(vars, pos, t, dt); auto const density = medium @@ -234,7 +234,7 @@ public: laplace.noalias() += sm.dNdx.transpose() * k * sm.dNdx * w; storage.noalias() += - sm.N.transpose() * density * heat_capacity * sm.N * w; + sm.N.transpose() * density * specific_heat_capacity * sm.N * w; } if (_process_data.mass_lumping) { diff --git a/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj b/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj index d476f404ead546dcdf0d75e410155dd480b5b34a..cac054be7fa3d74ec941ecf6856b5be8e9fc1bf5 100644 --- a/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj +++ b/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj @@ -30,7 +30,7 @@ <value>2500</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1000</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/2/line_1_line_1e2_source_term.prj b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/2/line_1_line_1e2_source_term.prj index e3250a5034eeecb179c9d185eb405d5f850f3e2e..3c4a31558443d001b0686bb02b9a02381b0e9ece 100644 --- a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/2/line_1_line_1e2_source_term.prj +++ b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/2/line_1_line_1e2_source_term.prj @@ -70,7 +70,7 @@ <value>5</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1000</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj index d6f87525133a87eac08509c554ae59ab95e19b93..44920c0dbb24cff10c6ad36c5d79401529d9873e 100644 --- a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj +++ b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj @@ -70,7 +70,7 @@ <value>5</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1000</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj b/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj index 5395f1a07f58b10eb2d4ab0422eee1d16a2de3b6..0f8ffbc567d97aaf92e3c4e63591801d751b9ffc 100644 --- a/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj +++ b/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj @@ -75,7 +75,7 @@ <value>1</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>0</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj b/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj index 79c8689dcbb9518c1796ccca086c85713c3b4abe..c01ab8fbf1dbaa926a66705474b29c0c52d66b5a 100644 --- a/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj +++ b/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj @@ -70,7 +70,7 @@ <value>1</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_neumann/newton.prj b/Tests/Data/Parabolic/T/1D_neumann/newton.prj index 92c37ce48f798843bcb27ead4c2226367254c7cb..53790e4d778ef3678eab984b62561b3e917ce5df 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/newton.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/newton.prj @@ -30,7 +30,7 @@ <value>3.2</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1000</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj b/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj index dfee1c160677e8ca7bc181770e7d5494846e1f47..f1087f8e3762541ce38576d1dda3fbc80008bd1f 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj @@ -26,7 +26,7 @@ <value>3.2</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1000</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj b/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj index e293a0bccd9957ed9edb153db8f2c57eed994d99..15ffe1d94c5f9513ca5910592a6327ebd83dc399 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj @@ -25,7 +25,7 @@ <value>2500</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1000</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_neumann/picard.prj b/Tests/Data/Parabolic/T/1D_neumann/picard.prj index 1ae3deb4fbb947467f9edcc1d5e31d5bfc1d9979..57c35a52cb9fb222dc3494c1d9f3ead693821d4c 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/picard.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/picard.prj @@ -30,7 +30,7 @@ <value>2500</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1000</value> </property> diff --git a/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj b/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj index 8088d357bf5f99e9e21efd4d96d031fb59fb3f89..86ab511d3b14e27c8ea3ea36d04fa03ba2161b55 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj @@ -26,7 +26,7 @@ <value>3.2</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1000</value> </property> diff --git a/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj b/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj index 206d762b9d4500871e9df213e004d371e8b0a5dc..39a22ccb1fb5d97fb4854b9c7f732c0e5c531104 100644 --- a/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj +++ b/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj @@ -20,7 +20,7 @@ <phases/> <properties> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1500</value> </property> diff --git a/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj b/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj index 9d0a620d8c91e2917fffe512991afe325d42cfdb..1688f3ea14a7149c29b3e86b789f5ea3f82614bd 100644 --- a/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj +++ b/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj @@ -25,7 +25,7 @@ <value>1</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1</value> </property> diff --git a/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj b/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj index e0b3658a7c86a798d9c7644b8df34d80cda7faf9..66b02124739f9c68d4fbbe197b3112a0d3977fb3 100644 --- a/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj +++ b/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj @@ -30,7 +30,7 @@ <value>1</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1</value> </property> diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj index 6c7e41143125ae660880c45785cf4a1c79f07a3b..6cf286905e5cf3438d4ab053bef81bd0f69ede02 100644 --- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj +++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj @@ -69,7 +69,7 @@ <value>1</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1</value> </property> diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj index 9c41fcc2caa5273f6eb114f493c4f5f544e378cd..faa26a4302bbe901eb05e16ff30e083aaa83fd1f 100644 --- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj +++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj @@ -70,7 +70,7 @@ <value>0</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>0</value> </property> diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj index e0e0f4e606755f932ca4f394604b7859b0af002b..aadf50ae1a05d5cc629128c1382e5ed76e5c0990 100644 --- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj +++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj @@ -64,7 +64,7 @@ <phases/> <properties> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1</value> </property> diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj index c1d8f19b0a657558d868c6f9848c56270b4f2003..463fdfcb61b474bf65519c3c273d47504c135ace 100644 --- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj +++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj @@ -64,7 +64,7 @@ <phases/> <properties> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1</value> </property> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj index 1addd14fee3176b07a118887cfe8073424b1fd37..56f80461dcbce639f2915f34a9174d6722f2df81 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj @@ -64,7 +64,7 @@ <phases/> <properties> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>0</value> </property> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj index 251287857018fa1a9f45c8684f9f8baa07b1fd15..17136c4d85f8f8c5e54e4af9da8c91e7fff1ed77 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj @@ -64,7 +64,7 @@ <phases/> <properties> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>0</value> </property> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj index 297b3dc9f5754e69d9ab32b98d72f14c4c0a4273..e4c7d022cbafd9d7971248ad772e00a5d0dad70d 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj @@ -64,7 +64,7 @@ <phases/> <properties> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>0</value> </property> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj index f295af739fe0f998edc3ef5736d9e25b4e149e54..926613655dca3470302f03911e446cb6df6b1322 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj @@ -74,7 +74,7 @@ <value>1</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1</value> </property> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj index 896189aa733f6150f09b486f79391a0f132debcd..90874daa38962a9fb54562344738f2474fc4eafa 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj @@ -74,7 +74,7 @@ <value>1</value> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Constant</type> <value>1</value> </property> diff --git a/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj b/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj index ce6dc22752b9bc1b3dd61ae6bbdecb04c8046c55..ff4445d2c9664e136549ed2067fd3a2ae24f324c 100644 --- a/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj +++ b/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj @@ -24,7 +24,7 @@ <parameter_name>rho</parameter_name> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Parameter</type> <parameter_name>c</parameter_name> </property> @@ -44,7 +44,7 @@ <parameter_name>rho</parameter_name> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Parameter</type> <parameter_name>c</parameter_name> </property> diff --git a/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj b/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj index 2c8107aa0ae1b2fc2472529b79abbd50446fb6a6..55f8d53dad8aeef6d877b72e2eacd408cc198aec 100644 --- a/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj +++ b/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj @@ -29,7 +29,7 @@ <parameter_name>rho</parameter_name> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Parameter</type> <parameter_name>c</parameter_name> </property> diff --git a/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj b/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj index 6b86b67db9b6c39b8644a478bf74e5dead1aa052..d5abd2485cb8da9b9cf0785440a0ac0e9abe0f34 100644 --- a/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj +++ b/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj @@ -25,7 +25,7 @@ <parameter_name>rho</parameter_name> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Parameter</type> <parameter_name>c</parameter_name> </property> diff --git a/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj b/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj index bc99b22b4fa141035b58a15d05c787b8d88bd24a..d62afd282e185336ffbe35b356a1facb7502e90f 100644 --- a/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj +++ b/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj @@ -30,7 +30,7 @@ <parameter_name>lambda</parameter_name> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Parameter</type> <parameter_name>c</parameter_name> </property> @@ -50,7 +50,7 @@ <parameter_name>lambda</parameter_name> </property> <property> - <name>heat_capacity</name> + <name>specific_heat_capacity</name> <type>Parameter</type> <parameter_name>c</parameter_name> </property>