Commit 7f0c2888 authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov
Browse files

Merge branch 'th2m_fix_composition_output' into 'master'

Th2m fix composition output

See merge request !3682
parents afe5fa7e 9477ea5f
Pipeline #6283 passed with stages
in 72 minutes and 50 seconds
......@@ -329,6 +329,11 @@ TH2MLocalAssembler<ShapeFunctionDisplacement, ShapeFunctionPressure,
ip_data.dxmWL_dpLR = c.dxmWL_dpLR;
ip_data.dxmWL_dT = c.dxmWL_dT;
// for variable output
ip_data.xnCG = c.xnCG;
ip_data.xmCG = c.xmCG;
ip_data.xmWL = c.xmWL;
ip_data.diffusion_coefficient_vapour = c.diffusion_coefficient_vapour;
ip_data.diffusion_coefficient_solvate = c.diffusion_coefficient_solvate;
......
......@@ -625,4 +625,78 @@
</petsc>
</linear_solver>
</linear_solvers>
<test_definition>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>displacement</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>gas_pressure_interpolated</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>capillary_pressure_interpolated</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>temperature_interpolated</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>vapour_pressure</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>xnCG</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>xmCG</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>xmWL</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>saturation</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>sigma</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>liquid_density</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_radial_ts_.*.vtu</regex>
<field>gas_density</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
</test_definition>
</OpenGeoSysProject>
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -636,4 +636,78 @@
</petsc>
</linear_solver>
</linear_solvers>
<test_definition>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>displacement</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>gas_pressure_interpolated</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>capillary_pressure_interpolated</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>temperature_interpolated</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>vapour_pressure</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>xnCG</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>xmCG</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>xmWL</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>saturation</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>sigma</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>liquid_density</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<regex>results_heatpipe_slab_ts_.*.vtu</regex>
<field>gas_density</field>
<absolute_tolerance>1e-14</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
</test_definition>
</OpenGeoSysProject>
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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