[cig-commits] [commit] master: Added test and changed output for time_in_years (84ee91a)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu May 22 16:04:58 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/1cea9a9309fea18bec922b55d3e1aed04c0372d2...0801e5573990bb6b2572872a2c084577ffc9fa4a
>---------------------------------------------------------------
commit 84ee91ae12bff38bed19159176ebb40e73867610
Author: anne-glerum <a.c.glerum at uu.nl>
Date: Thu May 22 17:26:28 2014 +0200
Added test and changed output for time_in_years
>---------------------------------------------------------------
84ee91ae12bff38bed19159176ebb40e73867610
.../postprocess/viscous_dissipation_statistics.cc | 66 ++++++++++------------
...okes.prm => viscous_dissipation_statistics.prm} | 0
.../screen-output | 26 ++++++++-
.../solution-00000.0000.vtu | 45 +++++++++++++++
.../solution-00000.pvtu | 0
.../solution-00000.visit | 0
.../solution.pvd | 0
.../statistics | 6 +-
8 files changed, 101 insertions(+), 42 deletions(-)
diff --git a/source/postprocess/viscous_dissipation_statistics.cc b/source/postprocess/viscous_dissipation_statistics.cc
index 25e41e9..ad1627e 100644
--- a/source/postprocess/viscous_dissipation_statistics.cc
+++ b/source/postprocess/viscous_dissipation_statistics.cc
@@ -59,9 +59,9 @@ namespace aspect
std::vector<double> (n_q_points));
typename MaterialModel::Interface<dim>::MaterialModelInputs in(n_q_points,
- this->n_compositional_fields());
+ this->n_compositional_fields());
typename MaterialModel::Interface<dim>::MaterialModelOutputs out(n_q_points,
- this->n_compositional_fields());
+ this->n_compositional_fields());
typename DoFHandler<dim>::active_cell_iterator
cell = this->get_dof_handler().begin_active(),
@@ -71,66 +71,56 @@ namespace aspect
{
fe_values.reinit (cell);
- // retrieve pressure, temperature and composition in case viscosity depends on it
- if (this->get_material_model().viscosity_depends_on(MaterialModel::NonlinearDependence::any_variable))
+ // retrieve the input for the material model
+ // TODO test whether viscosity depends on temperature, pressure or composition?
+ fe_values[this->introspection().extractors.pressure].get_function_values (this->get_solution(),
+ in.pressure);
+ fe_values[this->introspection().extractors.temperature].get_function_values (this->get_solution(),
+ in.temperature);
+ for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
+ fe_values[this->introspection().extractors.compositional_fields[c]].get_function_values
+ (this->get_solution(),prelim_composition_values[c]);
+
+ for (unsigned int i=0; i<n_q_points; ++i)
{
- fe_values[this->introspection().extractors.pressure].get_function_values (this->get_solution(),
- in.pressure);
- fe_values[this->introspection().extractors.temperature].get_function_values (this->get_solution(),
- in.temperature);
for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- fe_values[this->introspection().extractors.compositional_fields[c]].get_function_values
- (this->get_solution(),prelim_composition_values[c]);
-
- for (unsigned int i=0;i<n_q_points;++i)
- {
- for (unsigned int c=0; c<this->n_compositional_fields(); ++c)
- in.composition[i][c] = prelim_composition_values[c][i];
- }
- }
- else
- {
- in.pressure.resize(0);
- in.temperature.resize(0);
- in.composition.resize(0);
- in.position.resize(0);
+ in.composition[i][c] = prelim_composition_values[c][i];
}
// retrieve the strain rate
fe_values[this->introspection().extractors.velocities].get_function_symmetric_gradients (this->get_solution(),
- in.strain_rate);
- // get the viscosity
+ in.strain_rate);
+ // get the viscosity from the material model
this->get_material_model().evaluate(in, out);
// integrate the local viscous dissipation $2\mu(\dot{\epsilon}::\dot{\epsilon})$ over the cell
for (unsigned int q = 0; q < n_q_points; ++q)
{
local_dissipation_integral += out.viscosities[q] * 2.0 * in.strain_rate[q].norm() *
- in.strain_rate[q].norm() * fe_values.JxW(q);
+ in.strain_rate[q].norm() * fe_values.JxW(q);
}
}
-// const double global_dissipation_integral
- // now compute global sum and divide by 2 to obtain the global viscous dissipation
+ // compute the viscous dissipation of the whole domain
const double viscous_dissipation
= 0.5 * ( Utilities::MPI::sum (local_dissipation_integral, this->get_mpi_communicator()));
-// const double viscous_dissipation = global_dissipation_integral * 0.5;
-
if (this->convert_output_to_years() == true)
{
// make sure that the columns filled by the this object
// all show up with sufficient accuracy and in scientific notation
const char *columns[] = { "Total viscous dissipation (J/yr/m)", //TODO does it make sense to output this?
- "Total viscous dissipation (kW/m)"
+ "Total viscous dissipation (kJ/yr/m)"
};
+
+ statistics.add_value (columns[0], viscous_dissipation * year_in_seconds);
+ statistics.add_value (columns[1], viscous_dissipation * year_in_seconds / 1000.0);
+
for (unsigned int i=0; i<sizeof(columns)/sizeof(columns[0]); ++i)
{
statistics.set_precision (columns[i], 8);
statistics.set_scientific (columns[i], true);
}
- statistics.add_value (columns[0], viscous_dissipation * year_in_seconds);
- statistics.add_value (columns[1], viscous_dissipation / 1000.0);
}
else
{
@@ -139,13 +129,15 @@ namespace aspect
const char *columns[] = { "Total viscous dissipation (W/m)",
"Total viscous dissipation (kW/m)"
};
+
+ statistics.add_value (columns[0], viscous_dissipation);
+ statistics.add_value (columns[1], viscous_dissipation/1000.0);
+
for (unsigned int i=0; i<sizeof(columns)/sizeof(columns[0]); ++i)
{
statistics.set_precision (columns[i], 8);
statistics.set_scientific (columns[i], true);
}
- statistics.add_value (columns[0], viscous_dissipation);
- statistics.add_value (columns[1], viscous_dissipation/1000.0);
}
std::ostringstream output;
@@ -153,8 +145,8 @@ namespace aspect
if (this->convert_output_to_years() == true)
output << viscous_dissipation * year_in_seconds
<< " J/yr/m"
- << viscous_dissipation / 1000.0
- << " kW/m";
+ << viscous_dissipation *year_in_seconds / 1000.0
+ << " kJ/yr/m";
else
output << viscous_dissipation
<< " W/m"
diff --git a/tests/stokes.prm b/tests/viscous_dissipation_statistics.prm
similarity index 100%
copy from tests/stokes.prm
copy to tests/viscous_dissipation_statistics.prm
diff --git a/tests/stokes/screen-output b/tests/viscous_dissipation_statistics/screen-output
similarity index 53%
copy from tests/stokes/screen-output
copy to tests/viscous_dissipation_statistics/screen-output
index a87bb10..b031349 100644
--- a/tests/stokes/screen-output
+++ b/tests/viscous_dissipation_statistics/screen-output
@@ -1,4 +1,9 @@
--- Running with 1 MPI task using Trilinos.
+-----------------------------------------------------------------------------
+-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
+-- . running in DEBUG mode
+-- . running with 1 MPI process
+-- . using Trilinos
+-----------------------------------------------------------------------------
Number of active cells: 64 (on 3 levels)
Number of degrees of freedom: 3,770 (2,187+125+729+729)
@@ -41,13 +46,30 @@ Number of degrees of freedom: 6,289 (3,654+199+1,218+1,218)
reference_cp: 1250
reference_thermal_diffusivity: 1.13939e-06
- Writing graphical output: output-stokes/solution-00000
+ Writing graphical output: output-viscous_dissipation_statistics/solution-00000
RMS, max velocity: 4.22e-11 m/s, 5.66e-10 m/s
Termination requested by criterion: end time
+---------------------------------------------+------------+------------+
+| Total wallclock time elapsed since start | 69.5s | |
+| | | |
+| Section | no. calls | wall time | % of total |
+---------------------------------+-----------+------------+------------+
+| Assemble Stokes system | 3 | 27.9s | 40% |
+| Assemble composition system | 3 | 7.65s | 11% |
+| Assemble temperature system | 3 | 7.76s | 11% |
+| Build Stokes preconditioner | 3 | 13.7s | 20% |
+| Build composition preconditioner| 3 | 0.0359s | 0.052% |
+| Build temperature preconditioner| 3 | 0.0378s | 0.054% |
+| Solve Stokes system | 3 | 0.454s | 0.65% |
+| Solve composition system | 3 | 0.0102s | 0.015% |
+| Solve temperature system | 3 | 0.0106s | 0.015% |
+| Initialization | 4 | 1.27s | 1.8% |
+| Postprocessing | 1 | 0.277s | 0.4% |
+| Refine mesh structure, part 1 | 2 | 4.51s | 6.5% |
+| Refine mesh structure, part 2 | 2 | 0.038s | 0.055% |
+| Setup dof systems | 3 | 5.04s | 7.3% |
+---------------------------------+-----------+------------+------------+
diff --git a/tests/viscous_dissipation_statistics/solution-00000.0000.vtu b/tests/viscous_dissipation_statistics/solution-00000.0000.vtu
new file mode 100644
index 0000000..38e743a
--- /dev/null
+++ b/tests/viscous_dissipation_statistics/solution-00000.0000.vtu
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<!--
+# vtk DataFile Version 3.0
+#This file was generated
+-->
+<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
+<UnstructuredGrid>
+<FieldData>
+<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">0</DataArray>
+</FieldData>
+<Piece NumberOfPoints="792" NumberOfCells="99" >
+ <Points>
+ <DataArray type="Float64" NumberOfComponents="3" format="binary">
+AQAAAEBKAABASgAA2AQAAA==eNq9WjF2YjEMhNQ5B/Wv1GwTGt9kucqSas+xHDLZpOBBLI2kkb+dhsfnI0bjsTRW/uGA/66vp/OB+Pz+Pvs99H3rvmP3/vPr70/we9dXOXO/LyQuUdd9nD/jM/ln8kO4WD4RH9cgD5ZPjV/U9QqfGOcjvpXvLH2idUN8IZ6i/GbpE6+rkHqx12O2Plk+rTyPIJ8V+mT49HH28cWtF5f3N0q/9/uzuu7jR+vzHP+ZH4yzuXlpnM3NS+Nsbl5aD43Sa8Rnz+vj/ty+xDhtHfbxrTgMnxpnC/LK8Ylw9vGjOrSXPtF66Ph+nex5xnH21SfG2dy8NF8tzGvG+tbxCLjf739ZP4bWLVt3mfpx7OLb/UWSfd7XRX7f6Drj4xS33vB8ttS+YflE9e9a3Gf5/a33ZYVPjNPeN7P1yfgxr8+g+jF7fat4cL9qJg+z1hfXXSHrsQTXOT/T74v7e6+vZvwM4u05vhcn62c0zubmxfY7rYdG+YiYzwZw5nwBxmnrsI9vxeH4bGC9GuQhwyfC2ccf9TM8ntw+7Pns74/rwL7ri+oMxmnnp+PLeeX6ZvlEOHV8WTJfyp6fPf91DM5LM+dL2fNnjFPOI+fDynypwmf2PIZ88d7ri3w3mhcgn1v1WaPri+caQvpBu76vWt8sn6jPWz5xhM/ovB37ViH9rN8fZs1nsv4v4s3rryvmM5F/inDGfXHOfKaOJ+cbZq8vqjPI76J9oXluS9c38tkRTuy3anxGPjLy5RinJH1zW6JPlk+EE/nRVfMZtt895/8CeKz9v6w6D4n73Qux3mx9qcyXWD6Z/czuz8p8qcJndj+M+jGeT0n5HFTHq+fsUX3yfuyU7LttiT5ZPlGfs+rvCn2yfOI+ofuBVyexT6vOc7h+3d8Xvc6aj1X7tf6dNpR/dT7G8on4iPKYNR9j+USf9/FH/eSoLrFPk6Ru2hJ9sn4SxcXrMVefLJ8ozyifW
fpk+UT34Vd73nn7+8udg17eN/P+/rr2s5sZ//G9n/G/Xz+++tK/Lj6KEz0ng3A+eN5cHh6//6auezj7+CjfPJ9i5oXPLTk++/i/Fc9i8s/zKeHcscInwqnrwbZEn2g9tG7Fxad5liX6RDjR+QDh1HqQJfpk+PT8sNatLNEny6eF0/cjfp3O9oeoHlvrzNS/79fPwj7Tz434us7ue6RDhBPrLs+n97wQ2vcsn6h+V+tEtj7heT/HJ8KJ9808fXrzSVQHUZ+8FOvciD4RTn9usLl1CPX/Wfpk+UR+xKvTM/XJ8olwXhNzHcZP9vv6/t7zNUy/fubt3mctnhk/6eG834/yyujAw9nHj3xcxGdfJx9xY1/m4UQ67OP311k+M8+bVfhEOPV5epuuT9ZPevta8yxL9Mn6SYRT60GW6JPlE+WndStL9MnyaeH052i5+U50Poj9+GnI/6J+6M1HGH8X+6kT7V9yviPP54ifzPKZPc/fEudzC3/VT17oOZQkfdM8fXrP1yE/i85JVZ87qk+MUyg/jvvTXH2yfCKfVfXpo/pk+UQ42edc9ppPZv23x9uH4/tnzyez/jXCifr6zPlkhc+sn+uvz5hPVvjM+qGoTu6lT1Qn0XkJ7etb4C9n6RPhROc3hBP53dn6ZPlEurT89wp9snyic4J1HvgPffLtMA==
+ </DataArray>
+ </Points>
+
+ <Cells>
+ <DataArray type="Int32" Name="connectivity" format="binary">
+AQAAAGAMAABgDAAAdQQAAA==eNol1sMSIAYARMG1bdu2mbVt27adtW3btm3btu10VQ79Ca9mAgQIECAggQlEEIISnGCEICShCUUYwhKecEQgIpGJRBSiEp1oxCAmsYlFHOISn3gkICGJSUQSkpKcZKQgJalJRRrSkp50ZCAjmclEFrKSnWzkICe5yUUe8pKffBSgIIX4h8IUoRhFKU4JSlGS0pShHGUpTwUqUZHKVKEaValODWpRk9rUoR51qU8DGtGQxjShGU1pTgta0ZLWtKEdbWlPBzrRkc50oRtd6U4PetGT3vShH33pzwAGMZDBDGEo/zKM4YxkBKMYzVjGMI7xTGQCk5jMVKYwjenMZAazmM1c5jCP+SxkAYtYzFKWsIzlrGQFq1jNWtawjvVsZAOb2MxWtrCN7exkB7vYzV72sI/9HOQAhzjMUY5wjOOc5ASnOM1ZznCO81zkApe4zFWucI3r3OQGt7jNXe5wj/s85AGPeMxTnvCM57zkBa94zVve8I73fOQDn/jMV77wje/85Ae/+M1f/gT4P/6ABCYQQQhKcIIRgpCEJhRhCEt4whGBiEQmElGISnSiEYOYxCYWcYhLfOKRgIQkJhFJSEpykpGClKQmFWlIS3rSkYGMZCYTWchKdrKRg5zkJhd5yEt+8lGAghTiHwpThGIUpTglKEVJSlOGcpSlPBWoREUqU4VqVKU6NahFTWpTh3rUpT4NaERDGtOEZjSlOS1oRUta04Z2tKU9HehERzrThW50pTs96EVPetOHfvSlPwMYxEAGM4Sh/MswhjOSEYxiNGMZwzjGM5EJTGIyU5nCNKYzkxnMYjZzmcM85rOQBSxiMUtZwjKWs5IVrGI1a1nDOtazkQ1sYjNb2cI2trOTHexiN3vZwz72c5ADHOIwRznCMY5zkhOc4jRnOcM5znORC1ziMle5wjWuc5Mb3OI2d7nDPe7zkAc84jFPecIznvOSF7ziNW95wzve85EPf
OIzX/nCN77zkx/84jd/+RPw/9EPSGACEYSgBCcYIQhJaEIRhrCEJxwRiEhkIhGFqEQnGjGISWxiEYe4xCceCUhIYhKRhKQkJxkpSElqUpGGtKQnHRnISGYykYWsZCcbOchJbnKRh7zkJx8FKEgh/qEwRShGUYpTglKUpDRlKEdZylOBSlSkMlWoRlWqU4Na1KQ2dahHXerTgEY0pDFNaEZTmtOCVrSkNW1oR1va04FOdKQzXehGV7rTg170pDd96Edf+jOAQQxkMEMYyr8MYzgjGcEoRjOWMYxjPBOZwCQmM5UpTGM6M5nBLGYzlznMYz4LWcAiFrOUJSxjOStZwSpWs5Y1rGM9G9nAJjazlS1sYzs72cEudrOXPexjPwc5wCEOc5QjHOM4JznBKU5zljOc4zwXucAlLnOVK1zjOje5wS1uc5c73OM+D3nAIx7zlCc84zkvecErXvOWN7zjPR/5wCc+85UvfOM7P/nBL37zlz+B/j/+AQlMIIIQlOAEIwQhCU0owhCW8IQjAhGJTCSiEJXoROM/UuuC7A==
+ </DataArray>
+ <DataArray type="Int32" Name="offsets" format="binary">
+AQAAAIwBAACMAQAAlwAAAA==eNoNzRGAhEAAAMD9fzkMwzAMwzA8DMMwDMMwDMMwDMPwMAzDw/AHhucVQoiISUjJyCkoeVNR09DS0TMwMjGzsLKxc/Dh5OLmy0P4CeFFRExCSkZOQcmbipqGlo6egZGJmYWVjZ2DDycXN18ewq+fiJiElIycgpI3FTUNLR09AyMTMwsrGzsHH04ubr48hD8/ETH/WZYvHQ==
+ </DataArray>
+ <DataArray type="UInt8" Name="types" format="binary">
+AQAAAGMAAABjAAAADAAAAA==eNrj4aE5AADoawSl
+ </DataArray>
+ </Cells>
+ <PointData Scalars="scalars">
+ <DataArray type="Float64" Name="velocity" NumberOfComponents="3" format="binary">
+AQAAAEBKAABASgAADwwAAA==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 </DataArray>
+ <DataArray type="Float64" Name="p" format="binary">
+AQAAAMAYAADAGAAA6QQAAA==eNqNl02IHUUUhRudCdGFiGEmGNCUSiQwCiMaSRSl3kx+Jm9ixqAOCC4qJtkoJqDgJoK9EXUh6CbgQmxEJSIquBAUFzXgLpuICyELaRUTRxMxgTDB4M9M9znF69PveXt1qXrvq1PnVt2q6izL8rnlbTPZauzXsUAM+9D+6+h09Tsi2+U1x6YHuShc+SjGxf+zv5ucX1dH1csQ84WmftK7Wrf99XW7pQcu245+0UvcgWPTXfz5+eUt1e8Syz7ahj/+3/km5w/W0fKnen5vHeMC+g1/qkfOPYw28u/6zTxyHeiLPqmTQZecmxOu31x/zzyBC/Stelg3t1hH1Uu+OJ7okQt70K96iBH9pj+sW76vmcewt7n+o/yR4zqQC+i35qf/Dw9hHo+Bl3oJrGP2y35yaAfuN6kXcoH5l/1ELnIc0YvYB57roXris6XH8wTrp3qlUS+qp/VSoJ5Y1+b85P96Hljz4/+z+5tcsYh+2e+aB93v1CnG4Vf2O7lsHvUs+4lceQW+R+TdgVc9+iKveuRKjKN6ibs6fL+35qf7HXF1nlu6zI95J8e8k7fm19JDDI8M3w96XpczyxNV/ywi2tltaBv3Q+I2N7mwq8mPuh9UL+6oY3FDHa35xctPruut9T//9Hm/Nv6Pc2fXojs+/kfsMj9w+eTKjb0Brtj04NalDvNTPffx5Q+q8dyrG5eG6JHLvjxXxZYeOHf8xR29Luc7fe1q6rg74M863/H/OCvcToxnnO/6/wJ+/b2S91HzQ97Lx8cu+YE8ZC899UPsMD9y+Zk3r+sNcGFr/6Ifose8c56qx7zn00duWergT/XI+c0brvgO5/uo/V46+Jb3kJ7Xup/IuUmMa9wPqhfQjojW/aB65Nz2/6/nxGm9PHvPz1XeXvvmUuzgT+uFnL9r/ualDv5aemPPjFfrf/qdX3wHf6qXuBeu/d4PrBvrRs973Y9p3W7FfI37Rfcju
Ww3onG/qB595agb635RPXJuZni9tfSk3phH99OmM7GDP603cnHPwfpcNvypHtct7j5V7QvLn+qRi6+8tb438F53Y3iHTaE9gXv9i0NTVf+ndSy+q2N5sY7k0nsfXPgH7xJyHwpXYFzR43vN3Yn3jOiFP8GdODw1TI9cekeqHrj8bYxr+ON95p/AflpoRssfOd5T5MIs2oY/1Uvfnag7y5/qkUt1i3d/vBt5xH4Ik3h/fw4f30LnkzrmN9U6iTvQ5HKsAzn6Ild+VEfV4/eA+xfrKXrZSYz3LqLokeO7tqUHrjgBX5Y/5C/DuZLjXInIp+WPXFo3cNkD6Df8tfR4v/HdZfhTPXI8d7XemMewAVH2I3XyEvmSeiPnM+wr2Y/kwvtoi176HgGvevRVvodxRI8cv0tUj5z7bHi9tfxJvaV166Hf8Kf1Rs7PoX4Nf6qX3jk7EQ1/qkeO9ybf3W6xeW/m++HvwlFX/W+ljsV5tF+vI7n0vbW/eV6RW70fGlxcX8eWntSb6uW/g/sabdHTemvpgfNvoN/wx+8jh/s9bsQ9e+rXiS7+yKXvOXDu5Tpa/lSP7814CPqGP9Ujx3ePdb/RV1wRXyehY9xv5PILwv2GfBv3W0sPvvxXTX7U/aZ65Ny55rqN8sd18/ctN/N4GtHwlzh8p5ELt6Nt+FM9rlt4Dutq+FM9ctW79T9SVROy </DataArray>
+ <DataArray type="Float64" Name="T" format="binary">
+AQAAAMAYAADAGAAAHQAAAA==eNrtwTEBAAAAwqD1T20ND6AAAAAAAAC+DBjAAAE= </DataArray>
+ <DataArray type="Float64" Name="C_1" format="binary">
+AQAAAMAYAADAGAAALwAAAA==eNrt1gEJAAAIA8E1s38bI6yG4F0En4EJf+24AQDgH0I3wF7RTTd0Q7eLCiQiCXk= </DataArray>
+ <DataArray type="Float64" Name="density" format="binary">
+AQAAAMAYAADAGAAAOgAAAA==eNrt1sEJACAMBMErLe0q+LUsa0gbAec1/1sCSZLzVoX/ebcdSJKkf8gOupF0r9RNN+pG3UbaeLTHEg== </DataArray>
+ <DataArray type="Float64" Name="viscosity" format="binary">
+AQAAAMAYAADAGAAAKQAAAA==eNrtxTEBACAMwLCKmzAcYgUJs8GRPKm670y2bdu2bdu2bdufvKBaxbI= </DataArray>
+ </PointData>
+ </Piece>
+ </UnstructuredGrid>
+</VTKFile>
diff --git a/tests/stokes/solution-00000.pvtu b/tests/viscous_dissipation_statistics/solution-00000.pvtu
similarity index 100%
copy from tests/stokes/solution-00000.pvtu
copy to tests/viscous_dissipation_statistics/solution-00000.pvtu
diff --git a/tests/stokes/solution-00000.visit b/tests/viscous_dissipation_statistics/solution-00000.visit
similarity index 100%
copy from tests/stokes/solution-00000.visit
copy to tests/viscous_dissipation_statistics/solution-00000.visit
diff --git a/tests/graphical_output/solution.pvd b/tests/viscous_dissipation_statistics/solution.pvd
similarity index 100%
copy from tests/graphical_output/solution.pvd
copy to tests/viscous_dissipation_statistics/solution.pvd
diff --git a/tests/stokes/statistics b/tests/viscous_dissipation_statistics/statistics
similarity index 67%
copy from tests/stokes/statistics
copy to tests/viscous_dissipation_statistics/statistics
index 52bf96e..b28885d 100644
--- a/tests/stokes/statistics
+++ b/tests/viscous_dissipation_statistics/statistics
@@ -11,6 +11,6 @@
# 11: Visualization file name
# 12: RMS velocity (m/s)
# 13: Max. velocity (m/s)
-0 0.0000e+00 64 2312 729 729 0 0 18 4.0291e+14 "" 0.00000000e+00 0.00000000e+00
-0 0.0000e+00 85 3271 1033 1033 0 0 18 2.1717e+14 "" 0.00000000e+00 0.00000000e+00
-0 0.0000e+00 99 3853 1218 1218 0 0 18 2.3267e+14 output-stokes/solution-00000 4.21812533e-11 5.65834424e-10
+0 0.0000e+00 64 2312 729 729 0 0 18 4.0291e+14 "" 0.00000000e+00 0.00000000e+00
+0 0.0000e+00 85 3271 1033 1033 0 0 18 2.1717e+14 "" 0.00000000e+00 0.00000000e+00
+0 0.0000e+00 99 3853 1218 1218 0 0 18 2.3268e+14 output-viscous_dissipation_statistics/solution-00000 4.21811950e-11 5.65834060e-10
More information about the CIG-COMMITS
mailing list