diff --git a/CHANGELOG.md b/CHANGELOG.md
index d35e6e3bbe0fad2c6edc4f5f3aef8aa6daf3ee83..f5bf340f000767a5b7db8f11b6e1ecc48ceaf567 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,9 +26,11 @@ Differences Between DuMuX 2.9 and DuMuX 2.10
- Numbering of the VTK files starts with `0` now.
- Using the geostatistical tool gstat for generating random fields has been
- facilitated. See `test_cc1pwithgstat` in
- `test/porousmediumflow/1p/implicit`.
-
+ facilitated. See `test_cc1pwithgstat` in `test/porousmediumflow/1p/implicit`.
+ This tool can be installed using the `bin/installexternal.sh` script.
+ If cmake does not find gstat, one has to specify the GSTAT_ROOT variable,
+ see the standard optim.opts or debug.opts.
+
- The multidomain models should now run with all compilers without
segfaults, both with optimization and debug options.
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index b5a2fa472988a77b8f13c0833b1c00c4fd9a4489..5927abb75b6ef27ea23ce8e33e01176af6f63fed 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -1,9 +1,10 @@
set(modules
+ AddGstatFileLinks.cmake
AddInputFileLinks.cmake
- CheckConstexpr.cmake
- CopyOfDuneSymlinkOrCopy.cmake
DumuxDoxygen.cmake
DumuxMacros.cmake
- DumuxTestMacros.cmake)
+ DumuxTestMacros.cmake
+ FindGstat.cmake
+ FindValgrind.cmake)
include(GNUInstallDirs)
install(FILES ${modules} DESTINATION ${DUNE_INSTALL_MODULEDIR})
diff --git a/dumux/freeflow/zeroeq/model.hh b/dumux/freeflow/zeroeq/model.hh
index 10948aaba3619e70e5dcdc35f1490451f5ebae96..25532d2fd519dc2a5225b9eec3398a11e0be23b3 100644
--- a/dumux/freeflow/zeroeq/model.hh
+++ b/dumux/freeflow/zeroeq/model.hh
@@ -467,7 +467,7 @@ public:
*
* \param globalPos Global Position.
*/
- const int getPosIdx(const GlobalPosition &globalPos) const
+ int getPosIdx(const GlobalPosition &globalPos) const
{
int posIdx = int (intervals * (globalPos[flowNormal_] - this->problem_().bBoxMin()[flowNormal_]))
/ (this->problem_().bBoxMax()[flowNormal_] - this->problem_().bBoxMin()[flowNormal_]);
@@ -482,7 +482,7 @@ public:
* \param posIdx Position Index of current Global Position.
* \param globalPos Global Position.
*/
- const int getWallIdx(const GlobalPosition &globalPos, const int posIdx) const
+ int getWallIdx(const GlobalPosition &globalPos, const int posIdx) const
{
if (walls == 0)
DUNE_THROW(Dune::NotImplemented, "Eddy viscosity models are not implemented for use without walls.");
@@ -574,7 +574,7 @@ public:
* \param globalPos Global Position.
* \param posIdx Position Index of current Global Position.
*/
- const bool useViscosityInner(const GlobalPosition &globalPos, const int posIdx) const
+ bool useViscosityInner(const GlobalPosition &globalPos, const int posIdx) const
{
for (int wallIdx = 0; wallIdx < walls; ++wallIdx)
if ((wall[wallIdx].isBBoxMinWall && globalPos[wallNormal_] < wall[wallIdx].wallPos[posIdx] + wall[wallIdx].crossLength[posIdx])
@@ -813,7 +813,7 @@ public:
*
* \param wallIdx Wall Index of current Global Position.
*/
- const void interpolateWallProperties(const int wallIdx)
+ void interpolateWallProperties(const int wallIdx)
{
const int startInterpolation = 0;
const int endInterpolation = intervals;
@@ -894,7 +894,7 @@ public:
* \param prevIdx Position Index with value.
* \param nextIdx Position Index with value.
*/
- const void doInterpolationFluxValues(const int wallIdx, const int posIdx, const int prevIdx, const int nextIdx)
+ void doInterpolationFluxValues(const int wallIdx, const int posIdx, const int prevIdx, const int nextIdx)
{
wall[wallIdx].boundaryLayerThickness[posIdx] = interpolation(posIdx, prevIdx, wall[wallIdx].boundaryLayerThickness[prevIdx], nextIdx, wall[wallIdx].boundaryLayerThickness[nextIdx]);
wall[wallIdx].boundaryLayerThicknessCalculated[posIdx] = interpolation(posIdx, prevIdx, wall[wallIdx].boundaryLayerThicknessCalculated[prevIdx], nextIdx, wall[wallIdx].boundaryLayerThicknessCalculated[nextIdx]);
@@ -920,7 +920,7 @@ public:
* \param prevIdx Position Index with value.
* \param nextIdx Position Index with value.
*/
- const void doInterpolationWallValues(const int wallIdx, const int posIdx, const int prevIdx, const int nextIdx)
+ void doInterpolationWallValues(const int wallIdx, const int posIdx, const int prevIdx, const int nextIdx)
{
wall[wallIdx].wallDensity[posIdx] = interpolation(posIdx, prevIdx, wall[wallIdx].wallDensity[prevIdx], nextIdx, wall[wallIdx].wallDensity[nextIdx]);
wall[wallIdx].wallKinematicViscosity[posIdx] = interpolation(posIdx, prevIdx, wall[wallIdx].wallKinematicViscosity[prevIdx], nextIdx, wall[wallIdx].wallKinematicViscosity[nextIdx]);
@@ -952,7 +952,7 @@ public:
*
* Surface roughness is not included in the Baldwin Lomax model
*/
- const bool surfaceRoughnessNotImplemented() const
+ bool surfaceRoughnessNotImplemented() const
{
switch (GET_PARAM_FROM_GROUP(TypeTag, int, ZeroEq, EddyViscosityModel))
{
diff --git a/dumux/implicit/adaptive/gridadapt.hh b/dumux/implicit/adaptive/gridadapt.hh
index cee91b80d2702e55b824825ccd4a664cb7b592af..c12b7f104c2b080bd290bd5895bc17efc82ec315 100644
--- a/dumux/implicit/adaptive/gridadapt.hh
+++ b/dumux/implicit/adaptive/gridadapt.hh
@@ -446,7 +446,7 @@ public:
{}
void setTolerance(int, int)
{}
- const void setIndicator(const SolutionVector&,
+ void setIndicator(const SolutionVector&,
const Scalar&, const Scalar&)
{}
ImplicitGridAdapt (Problem& problem)
@@ -454,4 +454,4 @@ public:
};
}
-#endif /* DUMUX_IMPLICIT_GRIDADAPT_HH */
+#endif /* DUMUX_IMPLICIT_GRIDADAPT_HH */
\ No newline at end of file
diff --git a/dumux/io/container.hh b/dumux/io/container.hh
index 5f81750cd6caa4996423c5d74348dc1bb0875298..5e5f495abd0e7e7b1cda1f7450b65c20f917c328 100644
--- a/dumux/io/container.hh
+++ b/dumux/io/container.hh
@@ -36,7 +36,7 @@ namespace Dumux {
* \param v The container, requires being() and end() method
* \param filename The filename to write to
*
- * \usage std::vector<double>(5, 0.0) v; writeContainerToFile(v, "myvector.txt");
+ * usage: std::vector<double>(5, 0.0) v; writeContainerToFile(v, "myvector.txt");
*/
template<typename Container>
void writeContainerToFile(const Container& v,
@@ -52,7 +52,7 @@ void writeContainerToFile(const Container& v,
* \param filename The filename to write to
* \tparam Container The container type, requires being(), end(), push_back() method
*
- * \usage auto v = readFileToContainer<std::vector<double>>("myvector.txt");
+ * usage: auto v = readFileToContainer<std::vector<double>>("myvector.txt");
*/
template<typename Container>
Container readFileToContainer(const std::string& filename)
diff --git a/dumux/io/gridcreator.hh b/dumux/io/gridcreator.hh
index d27b9bf0fa1bac1ae1b1b18009c087d10b854b99..a972c38d58215a8af7a9fc216952a7f9e66da68e 100644
--- a/dumux/io/gridcreator.hh
+++ b/dumux/io/gridcreator.hh
@@ -131,7 +131,7 @@ public:
Only available when using Gmsh with GridParameterGroup.DomainMarkers = 1.
* \param boundarySegmentIndex The boundary segment index of the intersection (intersection.boundarySegmentIndex()
*/
- static const int getBoundaryDomainMarker(int boundarySegmentIndex)
+ static int getBoundaryDomainMarker(int boundarySegmentIndex)
{
if(enableGmshDomainMarkers_)
return boundaryMarkers_[boundarySegmentIndex];
@@ -147,7 +147,7 @@ public:
Only available when using Gmsh with GridParameterGroup.DomainMarkers = 1.
* \param elementIdx The element index
*/
- static const int getElementDomainMarker(int elementIdx)
+ static int getElementDomainMarker(int elementIdx)
{
if(enableGmshDomainMarkers_)
{
diff --git a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
index 1ffc3138475f9039d468e77cc37e17e11093226c..29086bd30e72a96c571b2ef367350f9ccd1be666 100644
--- a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
+++ b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
@@ -52,10 +52,10 @@ public:
* \brief effective permeability tensor \f$\mathrm{[m^{2})]}\f$ after Rutqvist and Tsang (2002) \cite rutqvist2002 <BR>
*
* \param volVars volume variables
- * \param fluxVars flux variables
* \param spatialParams spatial parameters
* \param element element (to be passed to spatialParams)
* \param fvGeometry fvGeometry (to be passed to spatialParams)
+ * \param scvIdx control volumne
*
* \return effective permeability tensor \f$\mathrm{[m^{2})]}\f$ after Rutqvist and Tsang (2002) \cite rutqvist2002 <BR>
*
diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh
index 9d4db7ce3d541d4e45760075a3c43fc07ab7a0e8..9fa41e1a75c856d959854df78dc16dd09c4dc34f 100644
--- a/dumux/material/fluidsystems/2pliquidvapor.hh
+++ b/dumux/material/fluidsystems/2pliquidvapor.hh
@@ -22,7 +22,7 @@
* \brief @copybrief Dumux::FluidSystems::TwoPLiquidVaporFluidsystem
*/
#ifndef DUMUX_2P_LIQUID_VAPOR_FLUID_SYSTEM_HH
-#define DUMUX_2P_LIQUID_VAPOR_FLUID_SYSTEM_HHH
+#define DUMUX_2P_LIQUID_VAPOR_FLUID_SYSTEM_HH
#include <limits>
#include <cassert>
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index 2fdbdb659d243fdd3eef4ffcf88e694a73877ff8..b51739d0729686d4faaa8cbca90e36fad7f68770 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -347,10 +347,8 @@ public:
* the partial pressures of all components, return its
* density \f$\mathrm{[kg/m^3]}\f$.
*
- * \param phaseIdx index of the phase
- * \param temperature phase temperature in \f$\mathrm{[K]}\f$
- * \param pressure phase pressure in \f$\mathrm{[Pa]}\f$
* \param fluidState the fluid state
+ * \param phaseIdx index of the phase
*
* Equation given in:
* - Batzle & Wang (1992) \cite batzle1992
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 975978ca790bed921fdc3796f14665c015078745..b0c5a39a9d055bd8e0973b7215f2494b025bba05 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -565,7 +565,7 @@ public:
using Base::heatCapacity;
/*!
- * \copydoc BaseFluidSystem::heatCapacity
+ * \copybrief BaseFluidSystem::heatCapacity
*
* \note We employ the heat capacity of the pure phases.
*
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh
index 4b5a02877b224350463215e5481eca07abed8794..e7334a95019d095fbea1a1bd824a2c5a38626933 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/gasphase.hh
@@ -238,7 +238,11 @@ public:
using Base::fugacityCoefficient;
/*!
- * \copydoc Base::fugacityCoefficient
+ * \copybrief Base::fugacityCoefficient
+ *
+ * \param fluidState An arbitrary fluid state
+ * \param phaseIdx The index of the fluid phase to consider
+ * \param compIdx The index of the component to consider
*/
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
@@ -259,7 +263,11 @@ public:
using Base::diffusionCoefficient;
/*!
- * \copydoc Base::diffusionCoefficient
+ * \copybrief Base::diffusionCoefficient
+ *
+ * \param fluidState An arbitrary fluid state
+ * \param phaseIdx The index of the fluid phase to consider
+ * \param compIdx The index of the component to consider
*/
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
@@ -271,7 +279,12 @@ public:
using Base::binaryDiffusionCoefficient;
/*!
- * \copydoc Base::binaryDiffusionCoefficient
+ * \copybrief Base::binaryDiffusionCoefficient
+ *
+ * \param fluidState An arbitrary fluid state
+ * \param phaseIdx The index of the fluid phase to consider
+ * \param compIIdx The index of the component to consider
+ * \param compJIdx The index of the component to consider
*/
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 519c82341e61aea808a5844e815e3f5dfbe00a25..5325a680ba9e88b9f582ffee8d9ea16f4738d180 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -385,8 +385,6 @@ public:
* for the liquid density.
*
* \param phaseIdx index of the phase
- * \param temperature phase temperature in \f$\mathrm{[K]}\f$
- * \param pressure phase pressure in \f$\mathrm{[Pa]}\f$
* \param fluidState the fluid state
*
*/
@@ -445,7 +443,7 @@ public:
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
* Compositional effects in the gas phase are accounted by the Wilke method.
- * See \cite reid1987R Reid, et al.: The Properties of Gases and Liquids,
+ * See Reid et al. (1987) \cite reid1987 <BR>
* 4th edition, McGraw-Hill, 1987, 407-410
* 5th edition, McGraw-Hill, 20001, p. 9.21/22
* \note Compositional effects for a liquid mixture have to be implemented.
@@ -744,7 +742,7 @@ public:
* \todo Check whether the gas phase enthalpy is a linear mixture of the component
* enthalpies and the mole fractions is a good assumption.
*
- * \param params mutable parameters
+ * \param fluidState An arbitrary fluid state
* \param phaseIdx for which phase to give back the heat capacity
*/
template <class FluidState>
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index ab29179313506708a30878ae8b043a11c4f2cfbc..5295698abd88bb41b20879cb1e8187d5cbddb253 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -401,7 +401,7 @@ public:
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
* Compositional effects in the gas phase are accounted by the Wilke method.
- * See \cite reid1987R Reid, et al.: The Properties of Gases and Liquids,
+ * See Reid et al. (1987) \cite reid1987 <BR>
* 4th edition, McGraw-Hill, 1987, 407-410
* 5th edition, McGraw-Hill, 20001, p. 9.21/22
* \note Compositional effects for a liquid mixture have to be implemented.
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index 28eab1ecd302485bba4490bcfb583d6c9ff1a678..31f0be8763b388585e24b98b796a46fc49731c2e 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -472,7 +472,7 @@ public:
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
* Compositional effects in the gas phase are accounted by the Wilke method.
- * See \cite reid1987R Reid, et al.: The Properties of Gases and Liquids,
+ * See Reid et al. (1987) \cite reid1987 <BR>
* 4th edition, McGraw-Hill, 1987, 407-410
* 5th edition, McGraw-Hill, 20001, p. 9.21/22
* \note Compositional effects for a liquid mixture have to be implemented.
diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh
index b26f42ea4f9b88c68d5b62f27f83e274cf999f33..56e5cfdc99e1887488d9ebb745736eca810369e2 100644
--- a/dumux/material/fluidsystems/liquidphase.hh
+++ b/dumux/material/fluidsystems/liquidphase.hh
@@ -226,7 +226,11 @@ public:
using Base::fugacityCoefficient;
/*!
- * \copydoc Base::fugacityCoefficient
+ * \copybrief Base::fugacityCoefficient
+ *
+ * \param fluidState An arbitrary fluid state
+ * \param phaseIdx The index of the fluid phase to consider
+ * \param compIdx The index of the component to consider
*/
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
@@ -247,7 +251,11 @@ public:
using Base::diffusionCoefficient;
/*!
- * \copydoc Base::diffusionCoefficient
+ * \copybrief Base::diffusionCoefficient
+ *
+ * \param fluidState An arbitrary fluid state
+ * \param phaseIdx The index of the fluid phase to consider
+ * \param compIdx The index of the component to consider
*/
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
@@ -259,14 +267,18 @@ public:
using Base::binaryDiffusionCoefficient;
/*!
- * \copydoc Base::binaryDiffusionCoefficient
+ * \copybrief Base::binaryDiffusionCoefficient
+ *
+ * \param fluidState An arbitrary fluid state
+ * \param phaseIdx The index of the fluid phase to consider
+ * \param compIIdx The index of the component to consider
+ * \param compJIdx The index of the component to consider
*/
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
int compIIdx,
int compJIdx)
-
{
DUNE_THROW(Dune::InvalidStateException, "Not applicable: Binary diffusion coefficients");
}
diff --git a/dumux/material/spatialparams/gstatrandomfield.hh b/dumux/material/spatialparams/gstatrandomfield.hh
index 929a5eb06ccf96a98c2a6256a8ba865cada35ef9..d21ba0c5bda5da8e311920b6176b50592955fa2d 100644
--- a/dumux/material/spatialparams/gstatrandomfield.hh
+++ b/dumux/material/spatialparams/gstatrandomfield.hh
@@ -61,28 +61,31 @@ public:
enum FieldType { scalar, log10 };
/*!
- * \brief Constructor.
- *
- * Creates a new field with random variables, if desired.
- * Otherwise creates a data field from already available data.
- *
- * For the random field generation three files are necessary.
- * A \a gstatControlFile in which all commands and in/output files for gstat are specified.
- * A \a gstatInputFile contains all coordinates (cell centers) of the grid, so that
- * gstat can perform its random realization. The filename must be same as in the gstatControlFile.
- * A \a gstatOutputFile in which gstat writes the random values to this file.
- * The filename must be the same as in the gstatControlFile.
+ * \brief Constructor
*
* \param gridView the used gridView
- * \param gstatControlFile name of control file for gstat
- * \param gstatInputFile name of input file for gstat
- * \param gstatOutputFile name of the gstat output file
- * \param createNew set true to create a new field
*/
GstatRandomField(const GridView& gridView)
: gridView_(gridView), elementMapper_(gridView),
data_(gridView.size(0)) {}
+ /*!
+ * \brief Creates a new field with random variables, if desired.
+ * Otherwise creates a data field from already available data.
+ * For the random field generation three files are necessary.
+ *
+ * A \a gstatControlFile in which all commands and in/output files for gstat are specified.
+ * A \a gstatInputFile contains all coordinates (cell centers) of the grid, so that
+ * gstat can perform its random realization. The filename must be same as in the gstatControlFile.
+ * A \a gstatOutputFile in which gstat writes the random values to this file.
+ * The filename must be the same as in the gstatControlFile.
+ * \param fieldType
+ * \param gstatControlFile name of control file for gstat
+ * \param gstatInputFile name of input file for gstat
+ * \param gstatOutputFile name of the gstat output file
+ * \param createNew set true to create a new field
+ */
+
void create(const std::string& gstatControlFile,
const std::string& gstatInputFile = "gstatInput.txt",
const std::string& gstatOutputFile = "permeab.dat",
diff --git a/dumux/porousmediumflow/2p1c/implicit/localresidual.hh b/dumux/porousmediumflow/2p1c/implicit/localresidual.hh
index bb1fb8cb1c48a57f835f0a6cbcbde4ab6e6f9654..51a772df81669f7b9b2821a65cf12b2256e535fe 100644
--- a/dumux/porousmediumflow/2p1c/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/2p1c/implicit/localresidual.hh
@@ -190,7 +190,7 @@ public:
* \brief Returns true if a spurious flow has been detected
*
*/
- const bool spuriousFlowDetected() const
+ bool spuriousFlowDetected() const
{
return spuriousFlowDetected_;
}
diff --git a/dumux/porousmediumflow/2p1c/implicit/model.hh b/dumux/porousmediumflow/2p1c/implicit/model.hh
index 2502b0c2ecc0dd35df427f3f225153d9bdd46cdb..0ec78078c25bc6ad6d20375d57715ea7fcff2146 100644
--- a/dumux/porousmediumflow/2p1c/implicit/model.hh
+++ b/dumux/porousmediumflow/2p1c/implicit/model.hh
@@ -272,10 +272,10 @@ public:
unsigned numElements = this->gridView_().size(0);
ScalarField *rank = writer.allocateManagedBuffer (numElements);
- for (const auto& element : elements(this->gridView_()))
+ for (const auto& element : elements(this->gridView_(), Dune::Partitions::interior))
{
- int idx = this->dofMapper().index(element);
- (*rank)[idx] = this->gridView_().comm().rank();
+ int eIdx = this->elementMapper().index(element);
+ (*rank)[eIdx] = this->gridView_().comm().rank();
FVElementGeometry fvGeometry;
fvGeometry.update(this->gridView_(), element);
@@ -283,9 +283,9 @@ public:
ElementVolumeVariables elemVolVars;
elemVolVars.update(this->problem_(),
- element,
- fvGeometry,
- false /* oldSol? */);
+ element,
+ fvGeometry,
+ false /* oldSol? */);
for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
@@ -304,8 +304,8 @@ public:
(*phasePresence)[globalIdx] = staticDat_[globalIdx].phasePresence;
FieldMatrix K = this->problem_().spatialParams().intrinsicPermeability(element,
- fvGeometry,
- scvIdx);
+ fvGeometry,
+ scvIdx);
(*permXX)[globalIdx] = K[0][0];
if(dimWorld > 1)
(*permYY)[globalIdx] = K[1][1];
@@ -348,6 +348,51 @@ public:
writer.attachCellData(*rank, "process rank");
}
+ /*!
+ * \brief Write the current solution to a restart file.
+ *
+ * \param outStream The output stream of one vertex for the restart file
+ * \param entity The entity, either a vertex or an element
+ */
+ template<class Entity>
+ void serializeEntity(std::ostream &outStream, const Entity &entity)
+ {
+ // write primary variables
+ ParentType::serializeEntity(outStream, entity);
+
+ int dofIdxGlobal = this->dofMapper().index(entity);
+
+ if (!outStream.good())
+ DUNE_THROW(Dune::IOError, "Could not serialize entity " << dofIdxGlobal);
+
+ outStream << staticDat_[dofIdxGlobal].phasePresence << " ";
+ }
+
+ /*!
+ * \brief Reads the current solution from a restart file.
+ *
+ * \param inStream The input stream of one vertex from the restart file
+ * \param entity The entity, either a vertex or an element
+ */
+ template<class Entity>
+ void deserializeEntity(std::istream &inStream, const Entity &entity)
+ {
+ // read primary variables
+ ParentType::deserializeEntity(inStream, entity);
+
+ // read phase presence
+ int dofIdxGlobal = this->dofMapper().index(entity);
+
+ if (!inStream.good())
+ DUNE_THROW(Dune::IOError,
+ "Could not deserialize entity " << dofIdxGlobal);
+
+ inStream >> staticDat_[dofIdxGlobal].phasePresence;
+ staticDat_[dofIdxGlobal].oldPhasePresence
+ = staticDat_[dofIdxGlobal].phasePresence;
+
+ }
+
/*!
* \brief Update the static data of all vertices in the grid.
*
diff --git a/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh b/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh
index d57af6f742dd0a0ba56fe8ea36ff5c67a404fd26..ed3f2df9e458c394e2dfa0b170706ff2896a064a 100644
--- a/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh
@@ -459,7 +459,7 @@ public:
/*!
* \brief Returns the phase presence within the control volume.
*/
- const int phasePresence() const
+ int phasePresence() const
{ return phasePresence_; }
/*!
diff --git a/dumux/porousmediumflow/2p2c/sequential/celldata.hh b/dumux/porousmediumflow/2p2c/sequential/celldata.hh
index 4d16cdfcac14711d2d1de99d02ef2645d9b63daa..1676e4f333606de640cdba5935b63c9ceedd977b 100644
--- a/dumux/porousmediumflow/2p2c/sequential/celldata.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/celldata.hh
@@ -361,7 +361,7 @@ public:
int& globalIdx()
{ return globalIdx_;}
//! Indicates if volume derivatives are computed and available
- const bool hasVolumeDerivatives() const
+ bool hasVolumeDerivatives() const
{ return volumeDerivativesAvailable_;}
//! Specifies that volume derivatives are computed and available
void confirmVolumeDerivatives()
diff --git a/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh b/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
index ae112de9bbcd1c6a6ac5585173a804e952a43bb7..294564494ea62d86371efe2927eae2f42ac4f84c 100644
--- a/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
@@ -311,7 +311,7 @@ public:
}
//! Returns the type of the fluidState
- const bool fluidStateType() const
+ bool fluidStateType() const
{ return fluidStateType_;}
};
diff --git a/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh b/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
index 10f4c5a0e612069d17ab853a93b2bcefe29ed8ab..bee4f79773a523e54d460ab055c6d5f1de41f034 100644
--- a/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
@@ -144,7 +144,7 @@ public:
*
* \param phaseIdx index of the phase
*/
- const unsigned int downstreamIdx(const unsigned phaseIdx) const
+ unsigned int downstreamIdx(const unsigned phaseIdx) const
{ return downstreamIdx_[phaseIdx]; }
/*!
@@ -153,7 +153,7 @@ public:
*
* \param phaseIdx index of the phase
*/
- const unsigned int upstreamIdx(const unsigned phaseIdx) const
+ unsigned int upstreamIdx(const unsigned phaseIdx) const
{ return upstreamIdx_[phaseIdx]; }
/*!
diff --git a/dumux/porousmediumflow/2pminc/implicit/indices.hh b/dumux/porousmediumflow/2pminc/implicit/indices.hh
index 83cf0dc100475d35c2ef06c8e1667af2aaae31c8..402f2bffaceee1671c011d4d87a14a0ea8eb3187 100644
--- a/dumux/porousmediumflow/2pminc/implicit/indices.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/indices.hh
@@ -87,11 +87,11 @@ struct TwoPMincIndices
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
- static const int pIdxc(int numC) {return pwIdx + 2 *numC;} //!< index of the wetting phase pressure for continuum numC
- static const int sIdxc(int numC) {return snIdx + 2 *numC;} //!< index of the non-wetting phase saturation for continuum numC
+ static int pIdxc(int numC) {return pwIdx + 2 *numC;} //!< index of the wetting phase pressure for continuum numC
+ static int sIdxc(int numC) {return snIdx + 2 *numC;} //!< index of the non-wetting phase saturation for continuum numC
- static const int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
- static const int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
+ static int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
+ static int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
};
/*!
@@ -118,11 +118,11 @@ struct TwoPMincIndices<TypeTag, TwoPMincFormulation::pnsw, PVOffset>
static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase
- static const int pIdxc(int numC) {return pnIdx + 2 *numC;} //!< index of the nonwetting phase pressure for continuum numC
- static const int sIdxc(int numC) {return swIdx + 2 *numC;} //!< index of the wetting phase saturation for continuum numC
+ static int pIdxc(int numC) {return pnIdx + 2 *numC;} //!< index of the nonwetting phase pressure for continuum numC
+ static int sIdxc(int numC) {return swIdx + 2 *numC;} //!< index of the wetting phase saturation for continuum numC
- static const int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
- static const int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
+ static int contiWEqIdxc(int numC) {return contiWEqIdx + 2 *numC;} //!< Index of the continuity equation of the wetting phase for continuum numC
+ static int contiNEqIdxc(int numC) {return contiNEqIdx + 2 *numC;} //!< Index of the continuity equation of the non-wetting phase for continuum numC
};
// \}
diff --git a/dumux/porousmediumflow/2pminc/implicit/localresidual.hh b/dumux/porousmediumflow/2pminc/implicit/localresidual.hh
index 5718dbe0f23b6b1f7b28d25c33d6ff3779479496..70b94916dc280610973bce92e8afdae508ce56b9 100644
--- a/dumux/porousmediumflow/2pminc/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/localresidual.hh
@@ -30,7 +30,7 @@
namespace Dumux
{
/*!
- * \ingroup TwoPBoxModel
+ * \ingroup TwoPMincModel
* \ingroup ImplicitLocalResidual
* \brief Element-wise calculation of the Jacobian matrix for problems
* using the two-phase fully implicit model.
diff --git a/dumux/porousmediumflow/2pminc/implicit/model.hh b/dumux/porousmediumflow/2pminc/implicit/model.hh
index 3d6512f77420bb986a49304571bde33a2131be47..0df183ad7acfd1c61c1b9493b27201c9fee03d35 100644
--- a/dumux/porousmediumflow/2pminc/implicit/model.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/model.hh
@@ -38,7 +38,7 @@ namespace Dumux
{
/*!
- * \ingroup TwoPBoxModel
+ * \ingroup TwoPMincModel
*/
template<class TypeTag >
class TwoPMincModel : public TwoPModel<TypeTag>
diff --git a/dumux/porousmediumflow/2pminc/implicit/properties.hh b/dumux/porousmediumflow/2pminc/implicit/properties.hh
index 3b4aebad9ee2a4dccb08ce4f3d384f3ea70a6008..eb8dc87b4cad73728da9ca2ad2039310f427bd33 100644
--- a/dumux/porousmediumflow/2pminc/implicit/properties.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/properties.hh
@@ -16,10 +16,9 @@
*****************************************************************************/
/*!
* \file
- * \ingroup TwoPTwoCModel
+ * \ingroup TwoPMincModel
*
- * \brief Defines the properties required for the isothermal two-phase,
- * two-component BOX model.
+ * \brief Defines the properties required for the isothermal two-phase minc model.
*/
#ifndef DUMUX_2PMINC_PROPERTIES_HH
#define DUMUX_2PMINC_PROPERTIES_HH
diff --git a/dumux/porousmediumflow/2pminc/implicit/propertydefaults.hh b/dumux/porousmediumflow/2pminc/implicit/propertydefaults.hh
index 84cbd456fda525400f33bb30a3f4e035c6459a3b..b2567b5b6836c5458815057c4e81d1aff8ef5469 100644
--- a/dumux/porousmediumflow/2pminc/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/propertydefaults.hh
@@ -15,13 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
- * \ingroup TwoPTwoCModel
+ * \ingroup TwoPMincModel
*/
/*!
* \file
*
* \brief Defines additional default values for the properties
- * required for the coupling of the 2p2cni box model
+ * required for the coupling of the 2pminc box model
*/
#ifndef DUMUX_2PMIN_PROPERTY_DEFAULTS_HH
#define DUMUX_2PMIN_PROPERTY_DEFAULTS_HH
diff --git a/dumux/porousmediumflow/2pminc/implicit/volumevariables.hh b/dumux/porousmediumflow/2pminc/implicit/volumevariables.hh
index a1ce2d202c33d481f4789c08614a0ac2ba46cb4c..48895476688df255982800bac850a18302e6ad58 100644
--- a/dumux/porousmediumflow/2pminc/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/volumevariables.hh
@@ -35,7 +35,7 @@
namespace Dumux
{
/*!
- * \ingroup TwoPBoxModel
+ * \ingroup TwoPMincModel
* \ingroup ImplicitVolumeVariables
* \brief Contains the quantities which are are constant within a
* finite volume in the two-phase model.
diff --git a/dumux/porousmediumflow/3pwateroil/localresidual.hh b/dumux/porousmediumflow/3pwateroil/localresidual.hh
index 060b90ce42b72ffaa11e4a1b6b815e768e63cdf4..6b30a986aebb38f220475e8e863b96cf635840f7 100644
--- a/dumux/porousmediumflow/3pwateroil/localresidual.hh
+++ b/dumux/porousmediumflow/3pwateroil/localresidual.hh
@@ -172,7 +172,7 @@ public:
* over a face of a sub-control volume.
*
* \param flux The flux over the SCV (sub-control-volume) face for each component
- * \param faceIdx The index of the SCV face
+ * \param fIdx The index of the SCV face
* \param onBoundary A boolean variable to specify whether the flux variables
* are calculated for interior SCV faces or boundary faces, default=false
*/
diff --git a/dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh b/dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh
index e8526f1208e249e91e76b4610057d5e65198719b..69cc5aeb696b228a8ba6f7735b1cfe50d3181d9b 100644
--- a/dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh
+++ b/dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh
@@ -133,7 +133,7 @@ public:
*
* \param phaseIdx index of the phase
*/
- const unsigned int downstreamIdx(const unsigned phaseIdx) const
+ unsigned int downstreamIdx(const unsigned phaseIdx) const
{ return downstreamIdx_[phaseIdx]; }
/*!
@@ -142,7 +142,7 @@ public:
*
* \param phaseIdx index of the phase
*/
- const unsigned int upstreamIdx(const unsigned phaseIdx) const
+ unsigned int upstreamIdx(const unsigned phaseIdx) const
{ return upstreamIdx_[phaseIdx]; }
/*!
diff --git a/dumux/porousmediumflow/implicit/darcyfluxvariables.hh b/dumux/porousmediumflow/implicit/darcyfluxvariables.hh
index 77a083d1a7e9d2d4a7555a70d8c076810fcc2fbe..812f5c49ab017f22cc4878395e0cc23cf098ff7b 100644
--- a/dumux/porousmediumflow/implicit/darcyfluxvariables.hh
+++ b/dumux/porousmediumflow/implicit/darcyfluxvariables.hh
@@ -143,7 +143,7 @@ public:
*
* \param phaseIdx index of the phase
*/
- const unsigned int downstreamIdx(const unsigned phaseIdx) const
+ unsigned int downstreamIdx(const unsigned phaseIdx) const
{ return downstreamIdx_[phaseIdx]; }
/*!
@@ -152,7 +152,7 @@ public:
*
* \param phaseIdx index of the phase
*/
- const unsigned int upstreamIdx(const unsigned phaseIdx) const
+ unsigned int upstreamIdx(const unsigned phaseIdx) const
{ return upstreamIdx_[phaseIdx]; }
/*!
@@ -325,7 +325,7 @@ protected:
}
// set const reference to the fvGeometry
- const void setFVGeometryPtr_(const FVElementGeometry& fvGeometry)
+ void setFVGeometryPtr_(const FVElementGeometry& fvGeometry)
{ fvGeometryPtr_ = &fvGeometry; }
// return const reference to the fvGeometry
diff --git a/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh b/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
index 98d4289260de43ebf77f3c3faeb96295c79915eb..6ee50adac9abe279c5958fc977b5a43959ce9da3 100644
--- a/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
+++ b/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
@@ -390,7 +390,7 @@ protected:
* \return True if all off-diagonals are zero.
*
*/
- const bool isDiagonal_(const DimWorldMatrix & K) const
+ bool isDiagonal_(const DimWorldMatrix & K) const
{
for (int i = 0; i < dim; i++) {
for (int k = 0; k < dim; k++) {
diff --git a/dumux/porousmediumflow/sequential/gridadapt.hh b/dumux/porousmediumflow/sequential/gridadapt.hh
index b6733fffdb76d64850061c73685166192ffca759..f22c012334c7461f50e4e322bf625c63c37a6691 100644
--- a/dumux/porousmediumflow/sequential/gridadapt.hh
+++ b/dumux/porousmediumflow/sequential/gridadapt.hh
@@ -317,7 +317,7 @@ public:
* not the actual maximum level of the grid.
* @return levelMax_ maximum level for refinement
*/
- const int getMaxLevel() const
+ int getMaxLevel() const
{
return levelMax_;
}
@@ -328,7 +328,7 @@ public:
* not the actual minimum level of the grid.
* @return levelMin_ minimum level for coarsening
*/
- const int getMinLevel() const
+ int getMinLevel() const
{
return levelMin_;
}
@@ -474,7 +474,7 @@ public:
{}
void setTolerance(int, int)
{}
- const void setIndicator(const ScalarSolutionType&,
+ void setIndicator(const ScalarSolutionType&,
const Scalar&, const Scalar&)
{}
GridAdapt (Problem& problem)
diff --git a/dumux/porousmediumflow/sequential/impetproblem.hh b/dumux/porousmediumflow/sequential/impetproblem.hh
index 571de05e9e0a57b56d57024c445465722c1a15cc..bfc96b6d40222ec0629c8a23f47b05e62d3ecb2a 100644
--- a/dumux/porousmediumflow/sequential/impetproblem.hh
+++ b/dumux/porousmediumflow/sequential/impetproblem.hh
@@ -789,7 +789,7 @@ public:
*
* Level is set by property or input file.
*/
- const int vtkOutputLevel() const
+ int vtkOutputLevel() const
{
return vtkOutputLevel_;
}
diff --git a/test/freeflow/stokes/CMakeLists.txt b/test/freeflow/stokes/CMakeLists.txt
index a3f10e29ae4fc43e12dc6e58feffd99cc65cbcbd..5fa3b91990ba39ab0ba06837b8fc49329699f0ae 100644
--- a/test/freeflow/stokes/CMakeLists.txt
+++ b/test/freeflow/stokes/CMakeLists.txt
@@ -5,7 +5,8 @@ add_dumux_test(test_stokes test_stokes test_stokes.cc
--script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes"
--files ${CMAKE_SOURCE_DIR}/test/references/stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/stokes-00013.vtu)
+ ${CMAKE_CURRENT_BINARY_DIR}/stokes-00013.vtu
+ --zeroThreshold {"v_1":1e5,"delP":1e5})
#install sources
install(FILES
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index 614fea99c26a71c2f9e91a836d1d54d42dae0a6f..65cf9bb72b8e4547c41c53aa40e19d3621587c80 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -207,7 +207,6 @@ public:
*
* \param timeManager The time manager
* \param gridView The grid view
- * \param tInitEnd End of initialization period
*/
El2P_TestProblem(TimeManager &timeManager,
const GridView &gridView)
@@ -294,7 +293,7 @@ public:
// returns the coupled_ variable which defines if geomechanical feedback on flow is taken
// into account
- const bool coupled() const
+ bool coupled() const
{
return coupled_;
}
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
index 1aed848bb245bb881952a32302ab103425f90f72..0c984f4189e29997f81e015b76f1786e4ccf5e16 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
@@ -191,7 +191,13 @@ public:
}
- //! \copydoc InjectionProblem::initialPhasePresence()
+ /*!
+ * \brief Returns the initial phase state for a control volume.
+ *
+ * \param vertex The vertex
+ * \param vIdxGlobal The global index of the vertex
+ * \param globalPos The position of the center of the element
+ */
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
index 2e75c79ed79a8beb3acd0ae016296fdd3d48f56a..4bf0fb8f90ce22c775c85666e66aac93c226afa6 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
@@ -191,7 +191,13 @@ public:
}
- //! \copydoc InjectionProblem::initialPhasePresence()
+ /*!
+ * \brief Returns the initial phase state for a control volume.
+ *
+ * \param vertex The vertex
+ * \param vIdxGlobal The global index of the vertex
+ * \param globalPos The position of the center of the element
+ */
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityconstantproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivityconstantproblem.hh
index d08b43e34a6814400637383bf961b8a9d1813def..eb4b563fbd44902ec202226edbd78493cdca5d3b 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivityconstantproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityconstantproblem.hh
@@ -191,7 +191,13 @@ public:
}
- //! \copydoc InjectionProblem::initialPhasePresence()
+ /*!
+ * \brief Returns the initial phase state for a control volume.
+ *
+ * \param vertex The vertex
+ * \param vIdxGlobal The global index of the vertex
+ * \param globalPos The position of the center of the element
+ */
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
index b0fccd9a908a3d157922d80ccc5303acfce581ad..5b1a9b00b008bae277a6eded85a2335052565271 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
@@ -191,7 +191,13 @@ public:
}
- //! \copydoc InjectionProblem::initialPhasePresence()
+ /*!
+ * \brief Returns the initial phase state for a control volume.
+ *
+ * \param vertex The vertex
+ * \param vIdxGlobal The global index of the vertex
+ * \param globalPos The position of the center of the element
+ */
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
index 089f0481c5f0256e62a97b2209c547bc73c226a9..421e3dfa344ed7c437c10377e5836386c4895789 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
@@ -191,7 +191,13 @@ public:
}
- //! \copydoc InjectionProblem::initialPhasePresence()
+ /*!
+ * \brief Returns the initial phase state for a control volume.
+ *
+ * \param vertex The vertex
+ * \param vIdxGlobal The global index of the vertex
+ * \param globalPos The position of the center of the element
+ */
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
index 0edda1fcfa4f41860fb7f19388456dd8261f3923..bd2a5c84800930a42f82f147ff1f45f4c9334384 100644
--- a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
+++ b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
@@ -8,7 +8,7 @@ add_dumux_test(test_2cnistokes2p2cni test_2cnistokes2p2cni test_2cnistokes2p2cni
${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00007.vtu
${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-pm-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00007.vtu
- --zeroThreshold {"v":1e-7,"velocityN_0":5e-11,"velocityW_0":5e-10,"velocityW_1":5e-9})
+ --zeroThreshold {"v_1":1e-6,"velocityN_0":5e-11,"velocityW_0":5e-10,"velocityW_1":5e-9})
add_dumux_test(test_2cnistokes2p2cni_boundarylayer test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -18,7 +18,7 @@ add_dumux_test(test_2cnistokes2p2cni_boundarylayer test_2cnistokes2p2cni test_2c
${CMAKE_CURRENT_BINARY_DIR}/stokes2cni_boundarylayer-00008.vtu
${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p2cni_boundarylayer-00008.vtu
- --zeroThreshold {"v":1e-7,"velocityN_0":5e-11,"velocityW_0":1e-9,"velocityW_1":5e-9})
+ --zeroThreshold {"v_1":1e-6,"velocityN_0":1e-8,"velocityN_1":1e-8,"velocityW_0":1e-8,"velocityW_1":1e-8,"pc":1e2,"mobN":1e-2})
#install sources
install(FILES
diff --git a/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh b/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh
index ca86d4ff0a37581f223b7c994837d33b663e27a4..0b3f9be23e59efe396d677a0c18f82c533b91568 100644
--- a/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh
+++ b/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh
@@ -87,7 +87,7 @@ SET_BOOL_PROP(TwoPTwoCNISubProblem, ProblemEnableGravity, true);
* subdomain. At the bottom of the porous-medium subdomain a constant temperature is
* set.
*
- * This subproblem uses the \ref TwoPTwoCNIModel. It is part of a multidomain model and
+ * This subproblem uses the \ref TwoPTwoCModel. It is part of a multidomain model and
* combined with the zeroeq2cnisubproblem for the free flow domain.
*/
template <class TypeTag = TTAG(TwoPTwoCNISubProblem) >
diff --git a/test/multidomain/2cstokes2p2c/CMakeLists.txt b/test/multidomain/2cstokes2p2c/CMakeLists.txt
index b29371649519d1b094663dcacb2b3f62b45066e3..db793194a125c8c099a9cdc104154d614d704fe1 100644
--- a/test/multidomain/2cstokes2p2c/CMakeLists.txt
+++ b/test/multidomain/2cstokes2p2c/CMakeLists.txt
@@ -7,8 +7,8 @@ add_dumux_test(test_2cstokes2p2c test_2cstokes2p2c test_2cstokes2p2c.cc
--files ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-ff-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-pm-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00007.vtu)
-
+ ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00007.vtu
+ --zeroThreshold {"velocityN_0":1e-8,"velocityN_1":1e-8,"velocityW_0":1e-8,"velocityW_1":1e-8,"pc":1e2})
#install sources
install(FILES
2cstokes2p2cproblem.hh
diff --git a/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh b/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
index 59ad310cfd684e8f5edc5d504620a9c1030f8adf..27f692e876663a57444883c988e370a7d5cc6a4d 100644
--- a/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
+++ b/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
@@ -173,7 +173,7 @@ public:
* \brief Specifies which kind of boundary condition should be
* used for which equation on a given boundary segment.
*
- * \param values The boundary types for the conservation equations
+ * \param bcTypes The boundary types for the conservation equations
* \param globalPos The position for which the bc type should be evaluated
*/
void boundaryTypesAtPos(BoundaryTypes &bcTypes,
@@ -203,12 +203,8 @@ public:
* \brief Evaluate the boundary conditions for a neumann
* boundary segment.
*
- * \param values The neumann values for the conservation equations
- * \param element The finite element
- * \param fvGeomtry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
- * \param scvIdx The local vertex index
- * \param boundaryFaceIdx The index of the boundary face
+ * \param values The dirichlet values for the primary variables
+ * \param globalPos The position for which the bc type should be evaluated
*
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index 7d2ac6e5936851c82531dbaa6f391aa2e1b75f38..e3293ca7de29e12463cb02ffa2583f8df1ba4e75 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -184,7 +184,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
/*!
* \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
*/
-const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
+void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
{
bcFormulation = Indices::concentration;
}
@@ -235,7 +235,7 @@ void source(PrimaryVariables &values, const Element &element)
/*!
* \copydoc TestDecTwoPTwoCProblem::initialFormulation()
*/
-const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
+void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
{
initialFormulation = Indices::concentration;
}
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index c121da8a5e2bba8ee13c98c1f77b7e501ea6fc0f..d29abda775ea441ddac5da0f293d0e8cf924f57e 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -196,7 +196,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
/*!
* \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
*/
-const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
+void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
{
bcFormulation = Indices::BoundaryFormulation::concentration;
}
@@ -239,7 +239,7 @@ void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos
/*!
* \copydoc TestDecTwoPTwoCProblem::initialFormulation()
*/
-const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
+void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
{
initialFormulation = Indices::BoundaryFormulation::concentration;
}
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
index 96e2e706049e5b02d2a5c14d5edef3a56987e2a9..012d38f6b85f72742e26b8fcdc6439613ff1ef0c 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
@@ -183,7 +183,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
* \param bcFormulation The boundary formulation for the conservation equations.
* \param intersection The intersection on the boundary.
*/
-const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
+void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
{
bcFormulation = Indices::concentration;
}
@@ -247,7 +247,7 @@ void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos
* a component per total mass inside the control volume) or by means
* of a saturation.
*/
-const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
+void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
{
initialFormulation = Indices::concentration;
}
diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
index 9e3799c56fd4033047b78bf57d82cd65df609a0a..a68e9097e6afa95daafc30ec1ee248132f8c0e95 100644
--- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
@@ -179,7 +179,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
/*!
* \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
*/
-const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
+void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
{
bcFormulation = Indices::concentration;
}
@@ -220,7 +220,7 @@ void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos
/*!
* \copydoc TestDecTwoPTwoCProblem::initialFormulation()
*/
-const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
+void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
{
initialFormulation = Indices::concentration;
}
diff --git a/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh b/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh
index 76e028a07050b7d0e5b453a3d8a5c7a4759aeedd..e56c665755abd21cc6ee9fe02bbd86925ffc3f27 100644
--- a/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh
+++ b/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh
@@ -86,7 +86,7 @@ SET_TYPE_PROP(TwoPMincTestProblem, VolumeVariables, TwoPMincVolumeVariables<Type
}
/*!
- * \ingroup TwoPBoxModel
+ * \ingroup TwoPMincModel
* \ingroup ImplicitTestProblems
* \brief Soil contamination problem where DNAPL infiltrates a fully
* water saturated medium.
@@ -113,7 +113,7 @@ SET_TYPE_PROP(TwoPMincTestProblem, VolumeVariables, TwoPMincVolumeVariables<Type
* just the hydrostatic pressure. The DNAPL saturation on both sides
* is zero.
*
- * This problem uses the \ref TwoPBoxModel.
+ * This problem uses the \ref TwoPMincModel.
*
* This problem should typically be simulated until \f$t_{\text{end}}
* \approx 20\,000\;s\f$ is reached. A good choice for the initial time step
diff --git a/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh b/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh
index ed1d97a03ac94853a9fea3c272a438a9e80eda65..81c9dc19dc136fb7717e6288a23fa65357fb213d 100644
--- a/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh
+++ b/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh
@@ -130,6 +130,7 @@ public:
* \param element The current element
* \param fvGeometry The current finite volume geometry of the element
* \param scvIdx The index of the sub-control volume.
+ * \param nC Index of the continuum
* \return Intrinsic permeability
*/
Scalar intrinsicPermeability(const Element &element,
@@ -148,6 +149,7 @@ public:
* \param element The current element
* \param fvGeometry The current finite volume geometry of the element
* \param scvIdx The index of the sub-control volume.
+ * \param nC Index of the continuum
* \return Porosity
*/
Scalar porosity(const Element &element,
diff --git a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
index 4d9b35d7d42e5e1d6cc06e31ebc68ab0cf479a84..00d4e278e7b2884c70e57da23b9cea540bd49598 100644
--- a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
@@ -267,7 +267,7 @@ public:
* \brief Specifies which kind of boundary condition should be
* used for which equation on a given boundary segment.
*
- * \param values The boundary types for the conservation equations
+ * \param bcTypes The boundary types for the conservation equations
* \param globalPos The position for which the bc type should be evaluated
*/
void boundaryTypesAtPos(BoundaryTypes &bcTypes,
@@ -310,10 +310,11 @@ public:
*
* \param values The neumann values for the conservation equations
* \param element The finite element
- * \param fvGeomtry The finite-volume geometry in the box scheme
+ * \param fvGeometry The finite-volume geometry in the box scheme
* \param is The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
+ * \param elemVolVars Element volume variables
*
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
diff --git a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
index 2bc5ae2a47431f619288bcf260a41cad582d8b10..30f1bf98bc5648a92cb926a057c0886d5ff73e0f 100644
--- a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
@@ -44,7 +44,7 @@ add_dumux_test(test_boxmpncthermalnonequil test_boxmpncthermalnonequil test_boxm
python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/combustion-reference.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/combustion-00077.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/combustion-00079.vtp
--command "${CMAKE_CURRENT_BINARY_DIR}/test_boxmpncthermalnonequil")
#install sources
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index d3ca24a70badddb8036fefa7bc013ddd65152a4b..e76893389538885c5e18134bb76e52e25e706270 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -546,7 +546,7 @@ public:
* That does not work.
* -> be careful with neumannAtPos
*/
- const bool inPM_(const GlobalPosition & globalPos) const
+ bool inPM_(const GlobalPosition & globalPos) const
{ return ( (globalPos[dimWorld-1] > 0. - 1e-6) and (globalPos[dimWorld-1] < (heightPM_ + 1e-6 ) ) ); }
/*!
@@ -560,7 +560,7 @@ public:
* That does not work.
* -> be careful with neumannAtPos
*/
- const bool inFF_(const GlobalPosition & globalPos) const
+ bool inFF_(const GlobalPosition & globalPos) const
{ return ( (globalPos[dimWorld-1] < heightDomain_ + 1e-6) and (globalPos[dimWorld-1] > (heightPM_ + 1e-6) ) ); }
/*!
@@ -574,7 +574,7 @@ public:
* That does not work.
* -> be careful with neumannAtPos
*/
- const bool inInjection_(const GlobalPosition & globalPos) const
+ bool inInjection_(const GlobalPosition & globalPos) const
{ return ( (globalPos[dimWorld-1] < heightDomain_ - 0.25*heightDomain_ + 1e-6) and (globalPos[dimWorld-1] > (heightPM_ + 1e-6) ) ); }
/*! \brief access function for the depth / height of the porous medium */
diff --git a/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh b/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
index cd3ab7cd21f302f376607ee3aa8b033996e195c6..6606bf0163bd34cd85dd65fa9d59d7a05162a11c 100644
--- a/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
+++ b/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh
@@ -209,7 +209,7 @@ public:
/*!
* \brief Check whether the current point is on a line between two points
*/
- const bool isBetween(const GlobalPosition & globalPosCurrent,
+ bool isBetween(const GlobalPosition & globalPosCurrent,
const GlobalPosition & pointOne,
const GlobalPosition & pointTwo) const
{
diff --git a/test/references/combustion-reference.vtp b/test/references/combustion-reference.vtp
index f72552c3fd9ac1875c59687509f733fead9c787c..3ec92bb78a700c892ed18bec032b0d6e4d69f25f 100644
--- a/test/references/combustion-reference.vtp
+++ b/test/references/combustion-reference.vtp
@@ -11,16 +11,16 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 0.892001 0.782712 0.707405 0.645213 0.588605 0.53415 0.480437 0.427439 0.375605 0.324586 0.27241
- 0.214602 0.140417 0.0154366 0 0 0 0 0 0 0 0 0
+ 1 0.892001 0.782712 0.707404 0.645213 0.588605 0.53415 0.480437 0.427439 0.375604 0.324586 0.27241
+ 0.214602 0.140417 0.0154365 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0.00175038 0.00175116 0.00175043 0.00174967 0.00174887 0.00174802 0.00174714 0.00174622 0.00174525
- 0.00174424 0.00174318 0.00174207 0.0017409 0.00173967 0.00173837 0.00173698 0.00173545 0.00173368 0.00173144 0.00172822 0.00172292
- 0.00171331 0.00169523 0.00166161 0.00160183 0.00150206 0.00134824 0.00114112 0.001
+ 0 0 0 0.00125753 0.0017509 0.00175044 0.00174967 0.00174887 0.00174803 0.00174715 0.00174623 0.00174526
+ 0.00174425 0.00174318 0.00174207 0.0017409 0.00173967 0.00173837 0.00173697 0.00173544 0.00173366 0.0017314 0.00172816 0.00172281
+ 0.00171316 0.00169506 0.00166147 0.00160181 0.00150222 0.00134853 0.0011413 0.001
</DataArray>
<DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
@@ -30,53 +30,53 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0.107999 0.217288 0.292595 0.354787 0.411395 0.46585 0.519563 0.572561 0.624395 0.675414 0.72759
- 0.785398 0.859583 0.984563 1 1 1 1 1 1 1 1 1
+ 0 0.107999 0.217288 0.292596 0.354787 0.411395 0.46585 0.519563 0.572561 0.624396 0.675414 0.72759
+ 0.785398 0.859583 0.984564 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 0.99825 0.998249 0.99825 0.99825 0.998251 0.998252 0.998253 0.998254 0.998255
+ 1 1 1 0.998742 0.998249 0.99825 0.99825 0.998251 0.998252 0.998253 0.998254 0.998255
0.998256 0.998257 0.998258 0.998259 0.99826 0.998262 0.998263 0.998265 0.998266 0.998269 0.998272 0.998277
- 0.998287 0.998305 0.998338 0.998398 0.998498 0.998652 0.998859 0.999
+ 0.998287 0.998305 0.998339 0.998398 0.998498 0.998651 0.998859 0.999
</DataArray>
<DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
100295 100284 100273 100262 100251 100240 100229 100218 100207 100196 100185 100174
- 100163 100152 100141 100130 100119 100108 100097 100086 100074 100063 100052 100041
- 100030 100019 100008 99997.2 99986.2 99975.1 99964.1 99953.1 99942 99931 99920 99908.9
- 99897.9 99886.8 99875.8 99864.8 99853.7 99842.7 99831.6 99820.6 99809.6 99798.5 99787.5 99776.5
- 99765.4 99754.4 99743.3 99732.3 99721.3 99710.2 99699.2 99688.2 99677.1 99666.1 99655 99644
- 99633 99621.9 99610.9 99599.9 99588.8 99577.8 99566.7 99555.7 99544.7 99533.6 99522.6 99511.5
- 99500.5 99489.5 99478.4 99467.4 99456.4 99445.3 99434.3 99423.2 99412.2 99401.2 99390.1 99379.1
- 99368 99357 99345.5 99333.4 99320.6 99307 99292.4 99276.2 99257.9 99236.1 99208.9 99172.5
- 99118.6 99022.5 98771.3 98710.7 98700.1 98700 98699.9 98699.8 98699.7 98699.6 98699.5 98699.3
- 98699.2 98699.1 98698.9 98698.8 98698.6 98698.4 98698.3 98698.1 98697.9 98697.7 98697.5 98697.3
- 98697 98696.8 98696.5 98696.3 98696 98695.7 98695.4 98695.1 98694.7 98694.4 98694 98693.6
- 98693.2 98692.8 98692.3 98691.9 98691.4 98690.9 98690.3 98689.8 98689.2 98688.6 98687.9 98687.2
- 98686.5 98685.8 98685 98684.2 98683.3 98682.4 98681.5 98680.5 98679.5 98678.4 98677.3 98676.1
- 98674.8 98673.5 98672.2 98670.8 98669.2 98667.7 98666 98664.3 98662.5 98660.6 98658.6 98656.6
- 98654.4 98652.1 98649.7 98651.7 98649.1 98646.4 98643.5 98640.5 98637.3 98634 98630.5 98626.9
- 98623.1 98619.1 98614.9 98610.5 98606 98601.1 98596.1 98590.8 98585.3 98579.5 98573.4 98567.1
+ 100163 100152 100141 100130 100119 100108 100097 100086 100075 100063 100052 100041
+ 100030 100019 100008 99997.2 99986.2 99975.2 99964.1 99953.1 99942 99931 99920 99908.9
+ 99897.9 99886.9 99875.8 99864.8 99853.7 99842.7 99831.7 99820.6 99809.6 99798.6 99787.5 99776.5
+ 99765.4 99754.4 99743.4 99732.3 99721.3 99710.2 99699.2 99688.2 99677.1 99666.1 99655.1 99644
+ 99633 99621.9 99610.9 99599.9 99588.8 99577.8 99566.8 99555.7 99544.7 99533.6 99522.6 99511.6
+ 99500.5 99489.5 99478.5 99467.4 99456.4 99445.3 99434.3 99423.3 99412.2 99401.2 99390.1 99379.1
+ 99368.1 99357 99345.5 99333.4 99320.6 99307 99292.4 99276.2 99257.9 99236.1 99208.9 99172.6
+ 99118.6 99022.5 98771.3 98710.7 98700.1 98700 98699.9 98699.8 98699.7 98699.6 98699.5 98699.4
+ 98699.2 98699.1 98699 98698.8 98698.6 98698.5 98698.3 98698.1 98697.9 98697.7 98697.5 98697.3
+ 98697.1 98696.8 98696.6 98696.3 98696 98695.7 98695.4 98695.1 98694.8 98694.4 98694 98693.6
+ 98693.2 98692.8 98692.4 98691.9 98691.4 98690.9 98690.4 98689.8 98689.2 98688.6 98687.9 98687.3
+ 98686.6 98685.8 98685 98684.2 98683.4 98682.5 98681.5 98680.5 98679.5 98678.4 98677.3 98676.1
+ 98674.9 98673.6 98672.2 98670.8 98669.3 98667.7 98666.1 98664.3 98662.5 98660.6 98658.7 98656.6
+ 98654.4 98652.1 98649.8 98650.5 98649.1 98646.4 98643.5 98640.5 98637.3 98634 98630.6 98626.9
+ 98623.1 98619.1 98614.9 98610.6 98606 98601.2 98596.1 98590.8 98585.3 98579.5 98573.4 98567.1
98560.4 98553.4 98546 98538.1 98529.9 98521.1 98511.7 98502.1
</DataArray>
<DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
100295 100284 100273 100262 100251 100240 100229 100218 100207 100196 100185 100174
- 100163 100152 100141 100130 100119 100108 100097 100086 100074 100063 100052 100041
- 100030 100019 100008 99997.2 99986.2 99975.1 99964.1 99953.1 99942 99931 99920 99908.9
- 99897.9 99886.8 99875.8 99864.8 99853.7 99842.7 99831.6 99820.6 99809.6 99798.5 99787.5 99776.5
- 99765.4 99754.4 99743.3 99732.3 99721.3 99710.2 99699.2 99688.2 99677.1 99666.1 99655 99644
- 99633 99621.9 99610.9 99599.9 99588.8 99577.8 99566.7 99555.7 99544.7 99533.6 99522.6 99511.5
- 99500.5 99489.5 99478.4 99467.4 99456.4 99445.3 99434.3 99423.2 99412.2 99401.2 99390.1 99379.1
- 99368 99705 99937 100043 100104 100143 100170 100190 100205 100216 100225 100231
- 100236 100238 100233 100211 100201 100200 100200 100200 100200 100200 100200 100200
+ 100163 100152 100141 100130 100119 100108 100097 100086 100075 100063 100052 100041
+ 100030 100019 100008 99997.2 99986.2 99975.2 99964.1 99953.1 99942 99931 99920 99908.9
+ 99897.9 99886.9 99875.8 99864.8 99853.7 99842.7 99831.7 99820.6 99809.6 99798.6 99787.5 99776.5
+ 99765.4 99754.4 99743.4 99732.3 99721.3 99710.2 99699.2 99688.2 99677.1 99666.1 99655.1 99644
+ 99633 99621.9 99610.9 99599.9 99588.8 99577.8 99566.8 99555.7 99544.7 99533.6 99522.6 99511.6
+ 99500.5 99489.5 99478.5 99467.4 99456.4 99445.3 99434.3 99423.3 99412.2 99401.2 99390.1 99379.1
+ 99368.1 99705.1 99937 100043 100104 100143 100170 100190 100205 100216 100225 100231
+ 100236 100238 100233 100211 100201 100201 100200 100200 100200 100200 100200 100200
100200 100200 100199 100199 100199 100199 100199 100199 100198 100198 100198 100198
- 100197 100197 100197 100197 100196 100196 100196 100196 100195 100195 100194 100194
+ 100198 100197 100197 100197 100196 100196 100196 100196 100195 100195 100194 100194
100194 100193 100193 100192 100192 100191 100191 100190 100190 100189 100188 100188
100187 100186 100185 100185 100184 100183 100182 100181 100180 100179 100178 100177
- 100175 100174 100173 100171 100170 100168 100166 100165 100163 100161 100159 100157
- 100155 100153 100150 100148 100145 100142 100139 100136 100133 100130 100126 100123
- 100119 100115 100111 100107 100102 100097 100092 100087 100081 100075 100069 100063
+ 100175 100174 100173 100171 100170 100168 100167 100165 100163 100161 100159 100157
+ 100155 100153 100150 100148 100145 100142 100139 100136 100133 100130 100127 100123
+ 100119 100115 100111 100107 100102 100097 100092 100087 100081 100076 100069 100063
100056 100049 100042 100034 100026 100018 100009 100000
</DataArray>
<DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
@@ -125,16 +125,16 @@
3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
- 3555.51 2523.47 1704.94 1258.65 955.017 725.06 541.865 394.285 277.667 188.406 121.588 71.8736
- 35.14 9.84381 0.0130784 0 0 0 0 0 0 0 0 0
+ 3555.51 2523.47 1704.94 1258.65 955.016 725.06 541.865 394.285 277.667 188.406 121.588 71.8736
+ 35.14 9.84379 0.0130781 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 1.90676e-05 1.90933e-05 1.90694e-05 1.90444e-05 1.90183e-05 1.89909e-05 1.89622e-05 1.89321e-05 1.89007e-05
- 1.88678e-05 1.88334e-05 1.87973e-05 1.87595e-05 1.87198e-05 1.86779e-05 1.8633e-05 1.85838e-05 1.85271e-05 1.84556e-05 1.83528e-05 1.81844e-05
- 1.78818e-05 1.73215e-05 1.63113e-05 1.46133e-05 1.20493e-05 8.71372e-06 5.2832e-06 3.55551e-06
+ 0 0 0 7.07053e-06 1.90847e-05 1.90696e-05 1.90446e-05 1.90184e-05 1.8991e-05 1.89623e-05 1.89323e-05 1.89009e-05
+ 1.8868e-05 1.88335e-05 1.87975e-05 1.87596e-05 1.87199e-05 1.86779e-05 1.86329e-05 1.85836e-05 1.85265e-05 1.84543e-05 1.83506e-05 1.8181e-05
+ 1.78771e-05 1.73163e-05 1.63073e-05 1.46129e-05 1.20532e-05 8.71939e-06 5.28569e-06 3.55551e-06
</DataArray>
<DataArray type="Float32" Name="lambda_n" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
@@ -144,16 +144,16 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 104.783 853.378 2083.72 3714.84 5791.79 8409.59 11666.8 15613.6 20249.6 25629.9 32040.3
+ 0 104.784 853.38 2083.72 3714.84 5791.79 8409.59 11666.8 15613.6 20249.6 25629.9 32040.3
40300.1 52832.3 81231.1 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3
83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3
83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3
83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3
83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3
83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3 83183.3
- 83183.3 83183.3 83183.3 83154 83154 83154 83154.1 83154.1 83154.1 83154.1 83154.2 83154.2
- 83154.2 83154.3 83154.3 83154.4 83154.4 83154.4 83154.5 83154.5 83154.6 83154.7 83154.8 83154.9
- 83155.3 83155.8 83156.9 83158.8 83161.7 83165.9 83170.8 83173.7
+ 83183.3 83183.3 83183.3 83168.1 83154 83154 83154.1 83154.1 83154.1 83154.1 83154.2 83154.2
+ 83154.2 83154.3 83154.3 83154.4 83154.4 83154.4 83154.5 83154.5 83154.6 83154.7 83154.8 83155
+ 83155.3 83155.9 83156.9 83158.8 83161.7 83165.9 83170.8 83173.7
</DataArray>
<DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35
@@ -202,13 +202,13 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 0.127405 0.00960322 0.00960059 0.00960058 0.00960056 0.00960055 0.00960053 0.00960051 0.00960049
- 0.00960047 0.00960044 0.00960041 0.00960037 0.00960033 0.00960028 0.00960021 0.00960014 0.00960005 0.00959993 0.00959978 0.00959958
- 0.00959931 0.00959894 0.00959841 0.00959765 0.00959654 0.00959488 0.00959236 0.00958853 0.0095827 0.00957381 0.00956038 0.00954032
- 0.00951081 0.00946818 0.00940798 0.00932505 0.00921404 0.00907 0.0088895 0.00867173 0.00841972 0.00814121 0.00784898 0.00756044
- 0.00729686 0.0070823 0.00694312 0.00690835 0.0070116 0.00729492 0.00781524 0.00865486 0.00993784 0.011856 0.0147095 0.0189699
- 0.0253755 0.0350635 0.0497294 0.0717803 0.104344 0.150927 0.214668 0.297253 0.396929 0.507976 0.624433 0.736896
- 0.834142 0.915099 0.999951 1 1 1 1 1 1 1 1 1
+ 1 1 1 0.127405 0.00960322 0.00960059 0.00960057 0.00960056 0.00960054 0.00960052 0.0096005 0.00960047
+ 0.00960045 0.00960042 0.00960038 0.00960034 0.00960029 0.00960023 0.00960016 0.00960007 0.00959996 0.00959982 0.00959964 0.0095994
+ 0.00959907 0.00959861 0.00959797 0.00959703 0.00959566 0.00959362 0.00959054 0.00958589 0.00957885 0.00956825 0.00955243 0.0095291
+ 0.00949524 0.00944708 0.00938008 0.00928926 0.0091696 0.00901688 0.00882859 0.00860514 0.0083508 0.00807439 0.0077894 0.00751346
+ 0.00726757 0.00707518 0.00696192 0.00695624 0.00709154 0.00741008 0.00796956 0.0088535 0.0101874 0.0121642 0.0150833 0.019412
+ 0.0258747 0.0355763 0.0501562 0.0719143 0.103804 0.149217 0.211225 0.291191 0.387681 0.49745 0.611724 0.720261
+ 0.818136 0.910521 0.976245 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 0.406912
</DataArray>
@@ -232,12 +232,12 @@
0 0 0 0 0 0 0 0
</DataArray>
<DataArray type="Float32" Name="x_n^H2O" NumberOfComponents="1" format="ascii">
- 0.0352867 0.0352959 0.0353031 0.0353106 0.0353184 0.0353267 0.0353354 0.0353446 0.0353544 0.0353649 0.035376 0.0353879
- 0.0354007 0.0354144 0.0354292 0.0354451 0.0354623 0.0354809 0.0355011 0.0355231 0.0355469 0.035573 0.0356013 0.0356323
- 0.0356662 0.0357034 0.035744 0.0357887 0.0358377 0.0358915 0.0359508 0.036016 0.0360879 0.0361671 0.0362544 0.0363509
- 0.0364574 0.0365751 0.0367053 0.0368494 0.0370089 0.0371856 0.0373815 0.0375988 0.0378401 0.0381081 0.0384061 0.0387376
+ 0.0352867 0.0352959 0.0353031 0.0353106 0.0353184 0.0353266 0.0353354 0.0353446 0.0353544 0.0353649 0.035376 0.0353879
+ 0.0354007 0.0354144 0.0354292 0.0354451 0.0354623 0.0354809 0.0355011 0.0355231 0.0355469 0.0355729 0.0356013 0.0356323
+ 0.0356662 0.0357033 0.035744 0.0357887 0.0358377 0.0358915 0.0359508 0.036016 0.0360879 0.0361671 0.0362544 0.0363509
+ 0.0364574 0.0365751 0.0367053 0.0368494 0.0370089 0.0371856 0.0373815 0.0375988 0.0378401 0.0381081 0.038406 0.0387376
0.0391067 0.0395182 0.0399774 0.0404902 0.0410637 0.0417059 0.042426 0.0432346 0.0441442 0.0451692 0.0463266 0.0476364
- 0.0491221 0.0508118 0.0527388 0.0549435 0.0574745 0.0603906 0.0637643 0.0676845 0.0722614 0.0776329 0.0839721 0.091499
+ 0.0491221 0.0508118 0.0527388 0.0549435 0.0574745 0.0603907 0.0637644 0.0676845 0.0722614 0.0776329 0.0839721 0.0914991
0.100495 0.111321 0.124448 0.140494 0.160276 0.184883 0.215785 0.254983 0.305221 0.370306 0.455564 0.568601
0.737149 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
@@ -258,7 +258,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0
+ 1.65226e-38 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
@@ -277,16 +277,16 @@
0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
- 0.00048373 0.000510654 0.000535825 0.000539727 0.00054085 0.000541197 0.000541287 0.000541245 0.000540999 0.000540308 0.000538612 0.000534296
- 0.000520827 0.000455797 0.000200615 5.5683e-08 0 0 0 0 0 0 0 0
+ 0.00048373 0.000510654 0.000535825 0.000539727 0.00054085 0.000541197 0.000541287 0.000541245 0.000540999 0.000540308 0.000538611 0.000534296
+ 0.000520827 0.000455797 0.000200614 5.56814e-08 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 -9.77959e-08 -1.95378e-07 -1.95042e-07 -1.94792e-07 -1.9453e-07 -1.94256e-07 -1.9397e-07 -1.9367e-07 -1.93356e-07 -1.93027e-07
- -1.92683e-07 -1.92323e-07 -1.91945e-07 -1.91549e-07 -1.91131e-07 -1.90688e-07 -1.90207e-07 -1.89666e-07 -1.8901e-07 -1.88119e-07 -1.86733e-07 -1.84326e-07
- -1.79915e-07 -1.71887e-07 -1.58044e-07 -1.3626e-07 -1.06107e-07 -7.1528e-08 -4.51681e-08 -3.63401e-08
+ 0 0 -3.62281e-08 -1.33859e-07 -1.95091e-07 -1.94794e-07 -1.94532e-07 -1.94258e-07 -1.93971e-07 -1.93671e-07 -1.93357e-07 -1.93028e-07
+ -1.92684e-07 -1.92324e-07 -1.91946e-07 -1.9155e-07 -1.91132e-07 -1.90687e-07 -1.90205e-07 -1.89661e-07 -1.89001e-07 -1.88102e-07 -1.86704e-07 -1.84284e-07
+ -1.79864e-07 -1.7184e-07 -1.58022e-07 -1.36278e-07 -1.06156e-07 -7.15696e-08 -4.51809e-08 -3.63401e-08
</DataArray>
<DataArray type="Float32" Name="velocity_n" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
@@ -296,16 +296,16 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- -0.00298628 -0.0197277 -0.0353787 -0.0378055 -0.0385034 -0.0387194 -0.0387752 -0.0387489 -0.0385963 -0.0381666 -0.0371117 -0.0344282
- -0.0260535 0.0143822 0.173054 0.297762 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796
+ -0.0029863 -0.0197277 -0.0353787 -0.0378055 -0.0385034 -0.0387194 -0.0387752 -0.0387489 -0.0385963 -0.0381666 -0.0371117 -0.0344282
+ -0.0260534 0.0143823 0.173055 0.297762 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796
0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796
0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796
0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796
0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796
0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796 0.297796
- 0.297796 0.297796 0.29813 0.298464 0.298465 0.298465 0.298465 0.298465 0.298465 0.298466 0.298466 0.298466
- 0.298467 0.298467 0.298467 0.298467 0.298468 0.298468 0.298469 0.298469 0.298469 0.29847 0.29847 0.298471
- 0.298471 0.298472 0.298472 0.298473 0.298473 0.298474 0.298475 0.298476
+ 0.297796 0.297964 0.298331 0.29862 0.29871 0.298711 0.298711 0.298711 0.298711 0.298712 0.298712 0.298712
+ 0.298712 0.298713 0.298713 0.298713 0.298714 0.298714 0.298714 0.298715 0.298715 0.298716 0.298716 0.298716
+ 0.298717 0.298717 0.298718 0.298718 0.298719 0.29872 0.298721 0.298722
</DataArray>
<DataArray type="Float32" Name="T_fluid" NumberOfComponents="1" format="ascii">
300.012 300.015 300.016 300.018 300.02 300.022 300.024 300.027 300.03 300.033 300.036 300.04
@@ -316,13 +316,13 @@
305.645 306.245 306.908 307.642 308.454 309.351 310.345 311.443 312.659 314.003 315.491 317.136
318.956 320.969 323.197 325.66 328.386 331.401 334.736 338.425 342.507 347.021 352.016 357.544
364.28 372.673 372.738 372.768 372.785 372.796 372.804 372.809 372.813 372.816 372.819 372.821
- 372.822 372.822 372.821 442.862 587.288 587.308 587.308 587.308 587.308 587.308 587.308 587.308
- 587.309 587.309 587.309 587.309 587.309 587.31 587.31 587.31 587.311 587.312 587.313 587.314
- 587.316 587.319 587.323 587.328 587.337 587.349 587.368 587.398 587.443 587.511 587.615 587.771
- 588.001 588.335 588.81 589.471 590.366 591.548 593.062 594.939 597.185 599.763 602.587 605.502
- 608.284 610.64 612.214 612.613 611.433 608.302 602.916 595.08 584.741 572.002 557.128 540.53
- 522.729 504.314 485.896 468.048 451.269 435.966 422.4 410.683 400.872 392.913 386.524 381.567
- 377.95 375.298 372.799 372.797 372.796 372.796 372.795 372.794 372.793 372.792 372.791 372.79
+ 372.822 372.822 372.821 442.862 587.288 587.308 587.308 587.308 587.308 587.308 587.309 587.309
+ 587.309 587.309 587.309 587.309 587.31 587.31 587.31 587.311 587.312 587.312 587.314 587.315
+ 587.318 587.321 587.326 587.333 587.343 587.359 587.383 587.418 587.473 587.555 587.677 587.859
+ 588.123 588.501 589.032 589.758 590.728 591.99 593.581 595.525 597.813 600.398 603.178 605.989
+ 608.601 610.72 611.999 612.063 610.535 607.071 601.401 593.361 582.919 570.192 555.446 539.075
+ 521.579 503.519 485.464 467.961 451.493 436.421 423.002 411.403 401.651 393.574 387.15 382.242
+ 378.51 375.441 373.471 372.797 372.796 372.796 372.795 372.794 372.793 372.792 372.791 372.79
372.789 372.788 372.787 372.786 372.784 372.783 372.782 372.78 372.779 372.777 372.775 372.774
372.772 372.77 372.768 372.766 372.763 372.761 372.758 400
</DataArray>
@@ -335,13 +335,13 @@
305.678 306.281 306.948 307.686 308.503 309.406 310.405 311.51 312.733 314.085 315.581 317.236
319.067 321.092 323.332 325.81 328.551 331.584 334.939 338.649 342.755 347.296 352.319 357.876
364.016 369.69 371.037 371.655 372.07 372.422 372.757 373.09 373.436 373.83 374.344 375.148
- 376.706 380.767 398.046 463.759 602.401 587.309 587.308 587.308 587.308 587.308 587.308 587.309
- 587.309 587.309 587.309 587.309 587.309 587.31 587.31 587.31 587.311 587.312 587.313 587.314
- 587.316 587.319 587.323 587.328 587.337 587.349 587.369 587.398 587.444 587.513 587.617 587.774
- 588.005 588.34 588.816 589.479 590.377 591.561 593.078 594.959 597.207 599.788 602.612 605.527
- 608.307 610.659 612.226 612.616 611.425 608.282 602.882 595.033 584.682 571.933 557.051 540.448
- 522.645 504.231 485.817 467.975 451.204 435.909 422.352 410.643 400.84 392.888 386.505 381.553
- 377.941 375.292 372.799 372.797 372.796 372.796 372.795 372.794 372.793 372.792 372.791 372.79
+ 376.706 380.767 398.046 463.759 602.401 587.31 587.308 587.308 587.308 587.308 587.309 587.309
+ 587.309 587.309 587.309 587.309 587.31 587.31 587.31 587.311 587.312 587.312 587.314 587.315
+ 587.318 587.321 587.326 587.333 587.344 587.359 587.383 587.419 587.474 587.556 587.679 587.861
+ 588.127 588.507 589.039 589.767 590.74 592.004 593.599 595.545 597.836 600.422 603.203 606.013
+ 608.623 610.736 612.009 612.064 610.524 607.049 601.366 593.313 582.86 570.123 555.369 538.995
+ 521.497 503.438 485.387 467.889 451.428 436.365 422.954 411.363 401.62 393.549 387.131 382.228
+ 378.5 375.436 373.47 372.797 372.796 372.796 372.795 372.794 372.793 372.792 372.791 372.79
372.789 372.788 372.787 372.786 372.784 372.783 372.782 372.78 372.779 372.777 372.775 372.774
372.772 372.77 372.768 372.766 372.763 372.761 372.758 400
</DataArray>
@@ -349,39 +349,39 @@
-1.19464e+12 -1.19443e+12 -1.1942e+12 -1.19397e+12 -1.19373e+12 -1.19348e+12 -1.19322e+12 -1.19294e+12 -1.19266e+12 -1.19236e+12 -1.19204e+12 -1.19171e+12
-1.19135e+12 -1.19098e+12 -1.19058e+12 -1.19016e+12 -1.18971e+12 -1.18922e+12 -1.1887e+12 -1.18814e+12 -1.18754e+12 -1.18689e+12 -1.18619e+12 -1.18543e+12
-1.1846e+12 -1.18371e+12 -1.18273e+12 -1.18167e+12 -1.18051e+12 -1.17925e+12 -1.17786e+12 -1.17635e+12 -1.1747e+12 -1.17289e+12 -1.1709e+12 -1.16872e+12
- -1.16633e+12 -1.1637e+12 -1.16081e+12 -1.15764e+12 -1.15416e+12 -1.15033e+12 -1.14611e+12 -1.14148e+12 -1.13638e+12 -1.13078e+12 -1.12461e+12 -1.11783e+12
- -1.11038e+12 -1.10218e+12 -1.09318e+12 -1.08329e+12 -1.07243e+12 -1.06052e+12 -1.04745e+12 -1.03313e+12 -1.01745e+12 -1.0003e+12 -9.81557e+11 -9.61099e+11
- -9.38801e+11 -9.14538e+11 -8.88182e+11 -8.59611e+11 -8.28711e+11 -7.95381e+11 -7.59537e+11 -7.21123e+11 -6.80118e+11 -6.36548e+11 -5.90497e+11 -5.42124e+11
- -4.91681e+11 -4.39531e+11 -3.86167e+11 -3.32234e+11 -2.78547e+11 -2.26106e+11 -1.76091e+11 -1.29855e+11 -8.88627e+10 -5.45938e+10 -2.83521e+10 -1.09481e+10
- -2.18943e+09 -8.39586e+07 -1.36628e+07 -3.4564e+06 -835195 -108680 -189.902 37763.9 366778 1.38601e+06 4.08346e+06 1.2178e+07
- 4.45886e+07 2.49584e+08 8.78364e+08 0 0 0 0 0 0 0 0 0
+ -1.16633e+12 -1.1637e+12 -1.16082e+12 -1.15764e+12 -1.15416e+12 -1.15033e+12 -1.14611e+12 -1.14148e+12 -1.13638e+12 -1.13078e+12 -1.12461e+12 -1.11783e+12
+ -1.11038e+12 -1.10218e+12 -1.09318e+12 -1.08329e+12 -1.07244e+12 -1.06052e+12 -1.04745e+12 -1.03313e+12 -1.01745e+12 -1.0003e+12 -9.81557e+11 -9.61099e+11
+ -9.38802e+11 -9.14538e+11 -8.88182e+11 -8.59611e+11 -8.28711e+11 -7.95381e+11 -7.59537e+11 -7.21123e+11 -6.80118e+11 -6.36548e+11 -5.90497e+11 -5.42124e+11
+ -4.91681e+11 -4.39531e+11 -3.86167e+11 -3.32234e+11 -2.78547e+11 -2.26105e+11 -1.76091e+11 -1.29855e+11 -8.88626e+10 -5.45938e+10 -2.8352e+10 -1.09481e+10
+ -2.18943e+09 -8.39585e+07 -1.36628e+07 -3.4564e+06 -835194 -108680 -189.899 37764.1 366779 1.38601e+06 4.08346e+06 1.21781e+07
+ 4.45887e+07 2.49585e+08 8.78363e+08 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 2.40634e-19 2.2486e-19 2.12265e-19 1.99587e-19 1.86855e-19 1.74116e-19 1.6141e-19 1.4878e-19 1.36275e-19
- 1.23949e-19 1.11863e-19 1.00073e-19 8.86484e-20 7.76504e-20 6.71485e-20 5.72128e-20 4.79095e-20 3.93087e-20 3.14684e-20 2.44449e-20 1.82842e-20
- 1.30195e-20 8.67632e-21 5.26602e-21 2.78162e-21 1.17724e-21 3.34703e-22 6.69624e-17 7.56171e+07
+ 0 0 0 3.6541e-18 1.20047e-20 1.13351e-20 1.06595e-20 9.98094e-21 9.30158e-21 8.62411e-21 7.95027e-21 7.28331e-21
+ 6.62613e-21 5.98118e-21 5.35234e-21 4.7423e-21 4.15505e-21 3.59459e-21 3.06408e-21 2.56728e-21 2.10738e-21 1.6882e-21 1.31263e-21 9.82658e-22
+ 7.00438e-22 4.6734e-22 2.83934e-22 1.50104e-22 6.35031e-23 1.80187e-23 6.58686e-17 7.56171e+07
</DataArray>
<DataArray type="Float32" Name="qsf" NumberOfComponents="1" format="ascii">
- 49449.8 5590.11 3388.52 3589.32 3961.49 4381.73 4847.1 5361.91 5931.41 6561.4 7258.3 8029.21
- 8882.01 9825.39 10869 12023.4 13300.4 14713.1 16275.8 18004.5 19916.7 22032.1 24372.2 26960.8
- 29824.4 32992.1 36496.3 40372.7 44660.7 49404.2 54651.6 60456.2 66877.4 73980.6 81838.3 90530.5
- 100146 110783 122549 135565 149964 165892 183512 203003 224565 248416 274801 303988
- 336276 371992 411503 455209 503558 557043 616207 681656 754057 834147 922744 1.02075e+06
+ 49450.1 5590.14 3388.54 3589.33 3961.51 4381.75 4847.11 5361.93 5931.43 6561.42 7258.32 8029.24
+ 8882.04 9825.42 10869 12023.4 13300.4 14713.1 16275.8 18004.5 19916.8 22032.2 24372.3 26960.9
+ 29824.5 32992.2 36496.4 40372.7 44660.8 49404.3 54651.6 60456.3 66877.5 73980.7 81838.4 90530.6
+ 100146 110783 122549 135566 149964 165892 183512 203003 224565 248416 274801 303989
+ 336276 371993 411503 455210 503559 557043 616208 681656 754057 834147 922744 1.02075e+06
1.12917e+06 1.2491e+06 1.38177e+06 1.52853e+06 1.69088e+06 1.87047e+06 2.06914e+06 2.28891e+06 2.53202e+06 2.80095e+06 3.09845e+06 3.42754e+06
3.79159e+06 4.1943e+06 4.63979e+06 5.13259e+06 5.67774e+06 6.28078e+06 6.94788e+06 7.68583e+06 8.50217e+06 9.4052e+06 1.04033e+07 1.137e+07
- -9.08674e+06 -8.43732e+07 -1.42181e+07 -3.95512e+06 -1.2257e+06 -345663 -33589.1 262961 916651 2.3579e+06 5.65264e+06 1.47017e+07
- 4.87982e+07 2.57766e+08 9.44461e+08 7.07975e+07 5.12036e+07 4212.47 6.5603 7.00482 7.90122 8.96534 10.2361 11.763
- 13.6101 15.8598 18.6213 22.0389 26.3063 31.6884 38.5519 47.4124 59.0081 74.4104 95.2011 123.745
- 163.61 220.217 301.825 420.979 596.589 856.775 1242.6 1812.63 2647.85 3856.34 5576.27 7975.04
- 11242.3 15573.3 21141.3 28056.9 36316.4 45742.6 55928.5 66194 75571.5 82832.5 86565.9 85309
- 77724.4 62801.9 40056.7 9688.37 -27330.2 -69262.8 -113728 -157917 -198885 -233881 -260635 -277608
- -284178 -280580 -267836 -247745 -222286 -193508 -163721 -134975 -107869 -83518.2 -63986.9 -47387.1
- -32998.4 -23094.5 -11.8061 0.114599 0.112021 0.109905 0.107687 0.105364 0.10293 0.100379 0.0977064 0.0949064
- 0.0919724 0.0888983 0.0856771 0.0823024 0.0787662 0.0750609 0.0711788 0.0671109 0.0628485 0.058382 0.0537019 0.0487974
- 0.0436572 0.0382688 0.032619 0.0266933 0.0204777 0.0139612 0.86342 7.56171e+07
+ -9.08687e+06 -8.43731e+07 -1.4218e+07 -3.95512e+06 -1.22569e+06 -345662 -33588.9 262962 916652 2.3579e+06 5.65264e+06 1.47017e+07
+ 4.87983e+07 2.57767e+08 9.4446e+08 7.07975e+07 5.12036e+07 4213.77 8.00523 8.62759 9.73314 11.0446 12.6097 14.4891
+ 16.7611 19.5273 22.9216 27.1222 32.3682 38.9886 47.4393 58.3643 72.6868 91.7498 117.535 153
+ 202.588 273.009 374.397 521.965 738.337 1056.6 1524.18 2207.31 3195.49 4605.02 6580.32 9290.35
+ 12918.4 17642 23601.9 30860.5 39351 48823 58795.6 68526.8 77013.9 83034.7 85236 82268.6
+ 72956.7 56483.4 32562.1 1565.05 -35419.6 -76621.7 -119717 -162038 -200857 -233659 -258409 -273801
+ -279299 -275181 -262566 -242950 -218172 -190580 -161951 -133615 -107211 -84759.6 -64345.8 -46918.2
+ -34045.1 -15762.3 -4017.79 0.317088 0.0421989 0.0414031 0.0405691 0.0396955 0.03878 0.0378209 0.0368158 0.0357629
+ 0.0346596 0.0335036 0.0322924 0.0310232 0.0296934 0.0283 0.0268401 0.0253103 0.0237074 0.0220276 0.0202674 0.0184223
+ 0.0164878 0.0144585 0.0123284 0.0100908 0.00773976 0.00527273 0.858975 7.56171e+07
</DataArray>
<DataArray type="Float32" Name="h_w" NumberOfComponents="1" format="ascii">
-308423 -308412 -308405 -308398 -308390 -308381 -308371 -308360 -308348 -308335 -308321 -308304
@@ -390,17 +390,17 @@
-306362 -306138 -305890 -305615 -305312 -304976 -304605 -304194 -303739 -303236 -302680 -302065
-301384 -300631 -299798 -298876 -297857 -296729 -295482 -294102 -292576 -290887 -289019 -286953
-284667 -282139 -279342 -276248 -272825 -269038 -264850 -260217 -255091 -249421 -243149 -236211
- -228536 -220045 -210653 -200263 -188770 -176056 -161992 -146434 -129223 -110184 -89123.3 -65808.8
- -37404.3 -2009.97 -1736.12 -1611.45 -1539.58 -1493.11 -1461.04 -1437.92 -1420.69 -1407.49 -1397.23 -1389.35
- -1383.77 -1381.2 -1387.59 293976 903020 903105 903105 903105 903106 903106 903106 903106
- 903107 903107 903108 903109 903109 903111 903112 903114 903116 903119 903124 903130
- 903138 903149 903165 903189 903225 903278 903359 903483 903673 903962 904401 905058
- 906028 907436 909439 912224 916000 920984 927368 935285 944754 955628 967534 979827
- 991562 1.0015e+06 1.00813e+06 1.00981e+06 1.00484e+06 991636 968922 935879 892277 838557 775836 705842
- 630773 553118 475452 400184 329428 264894 207688 158276 116902 83339.1 56398.4 35494.6
- 20243.5 9060.1 -1479.12 -1487.85 -1490.94 -1494.17 -1497.56 -1501.11 -1504.83 -1508.73 -1512.81 -1517.09
- -1521.57 -1526.27 -1531.19 -1536.34 -1541.74 -1547.4 -1553.33 -1559.55 -1566.06 -1572.88 -1580.02 -1587.51
- -1595.36 -1603.58 -1612.19 -1621.22 -1630.67 -1640.58 -1650.96 113226
+ -228536 -220045 -210653 -200263 -188770 -176056 -161992 -146434 -129223 -110184 -89123.2 -65808.7
+ -37404.2 -2009.95 -1736.09 -1611.42 -1539.55 -1493.08 -1461.01 -1437.9 -1420.66 -1407.46 -1397.2 -1389.33
+ -1383.74 -1381.18 -1387.57 293976 903020 903105 903106 903106 903106 903106 903107 903107
+ 903107 903108 903109 903110 903111 903112 903114 903116 903119 903123 903128 903136
+ 903146 903160 903180 903210 903253 903319 903419 903570 903798 904144 904661 905427
+ 906542 908137 910373 913436 917528 922847 929559 937754 947404 958305 970028 981883
+ 992897 1.00183e+06 1.00723e+06 1.0075e+06 1.00105e+06 986445 962536 928630 884596 830927 768741 699707
+ 625927 549766 473628 399817 330371 266814 210226 161312 120190 86128.8 59037 38340.1
+ 22605 9660.93 1355.8 -1487.83 -1490.91 -1494.15 -1497.54 -1501.09 -1504.81 -1508.7 -1512.79 -1517.07
+ -1521.55 -1526.25 -1531.17 -1536.32 -1541.73 -1547.39 -1553.32 -1559.53 -1566.04 -1572.86 -1580.01 -1587.5
+ -1595.35 -1603.57 -1612.18 -1621.21 -1630.67 -1640.58 -1650.96 113226
</DataArray>
<DataArray type="Float32" Name="h_n" NumberOfComponents="1" format="ascii">
2.1086e+06 2.10861e+06 2.10861e+06 2.10862e+06 2.10862e+06 2.10862e+06 2.10863e+06 2.10863e+06 2.10864e+06 2.10865e+06 2.10865e+06 2.10866e+06
@@ -409,15 +409,15 @@
2.10959e+06 2.1097e+06 2.10982e+06 2.10995e+06 2.1101e+06 2.11026e+06 2.11044e+06 2.11064e+06 2.11086e+06 2.1111e+06 2.11137e+06 2.11166e+06
2.11199e+06 2.11235e+06 2.11275e+06 2.1132e+06 2.11369e+06 2.11423e+06 2.11483e+06 2.11549e+06 2.11623e+06 2.11704e+06 2.11794e+06 2.11893e+06
2.12003e+06 2.12125e+06 2.1226e+06 2.12408e+06 2.12573e+06 2.12755e+06 2.12957e+06 2.1318e+06 2.13426e+06 2.13699e+06 2.14001e+06 2.14335e+06
- 2.14704e+06 2.15113e+06 2.15564e+06 2.16064e+06 2.16617e+06 2.17229e+06 2.17906e+06 2.18654e+06 2.19482e+06 2.20398e+06 2.21412e+06 2.22534e+06
+ 2.14704e+06 2.15113e+06 2.15564e+06 2.16064e+06 2.16617e+06 2.17229e+06 2.17906e+06 2.18654e+06 2.19482e+06 2.20399e+06 2.21412e+06 2.22534e+06
2.239e+06 2.25603e+06 2.25616e+06 2.25622e+06 2.25626e+06 2.25628e+06 2.2563e+06 2.25631e+06 2.25632e+06 2.25632e+06 2.25633e+06 2.25633e+06
2.25633e+06 2.25634e+06 2.25633e+06 2.39845e+06 2.69149e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06
- 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69154e+06 2.69154e+06
- 2.69154e+06 2.69155e+06 2.69156e+06 2.69157e+06 2.69158e+06 2.69161e+06 2.69165e+06 2.69171e+06 2.6918e+06 2.69194e+06 2.69215e+06 2.69247e+06
- 2.69293e+06 2.69361e+06 2.69457e+06 2.69591e+06 2.69773e+06 2.70013e+06 2.7032e+06 2.70701e+06 2.71157e+06 2.7168e+06 2.72253e+06 2.72844e+06
- 2.73409e+06 2.73887e+06 2.74206e+06 2.74287e+06 2.74048e+06 2.73412e+06 2.72319e+06 2.7073e+06 2.68632e+06 2.66047e+06 2.63029e+06 2.59661e+06
- 2.56049e+06 2.52313e+06 2.48576e+06 2.44955e+06 2.4155e+06 2.38445e+06 2.35693e+06 2.33315e+06 2.31325e+06 2.2971e+06 2.28414e+06 2.27408e+06
- 2.26674e+06 2.26136e+06 2.25629e+06 2.25628e+06 2.25628e+06 2.25628e+06 2.25628e+06 2.25628e+06 2.25628e+06 2.25627e+06 2.25627e+06 2.25627e+06
+ 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69153e+06 2.69154e+06 2.69154e+06 2.69154e+06
+ 2.69155e+06 2.69155e+06 2.69156e+06 2.69158e+06 2.6916e+06 2.69163e+06 2.69168e+06 2.69175e+06 2.69186e+06 2.69203e+06 2.69228e+06 2.69264e+06
+ 2.69318e+06 2.69395e+06 2.69502e+06 2.6965e+06 2.69847e+06 2.70103e+06 2.70426e+06 2.7082e+06 2.71284e+06 2.71809e+06 2.72373e+06 2.72943e+06
+ 2.73473e+06 2.73903e+06 2.74162e+06 2.74176e+06 2.73865e+06 2.73163e+06 2.72012e+06 2.70381e+06 2.68262e+06 2.6568e+06 2.62688e+06 2.59366e+06
+ 2.55816e+06 2.52152e+06 2.48489e+06 2.44937e+06 2.41596e+06 2.38538e+06 2.35815e+06 2.33461e+06 2.31483e+06 2.29844e+06 2.28541e+06 2.27545e+06
+ 2.26788e+06 2.26165e+06 2.25765e+06 2.25628e+06 2.25628e+06 2.25628e+06 2.25628e+06 2.25628e+06 2.25628e+06 2.25627e+06 2.25627e+06 2.25627e+06
2.25627e+06 2.25627e+06 2.25626e+06 2.25626e+06 2.25626e+06 2.25626e+06 2.25625e+06 2.25625e+06 2.25625e+06 2.25624e+06 2.25624e+06 2.25624e+06
2.25623e+06 2.25623e+06 2.25622e+06 2.25622e+06 2.25622e+06 2.25621e+06 2.25621e+06 2.31148e+06
</DataArray>
@@ -429,16 +429,16 @@
0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
- 0.897791 0.947762 0.994478 1.00172 1.0038 1.00445 1.00462 1.00454 1.00408 1.0028 0.99965 0.991641
- 0.966643 0.845949 0.372336 0.000103346 0 0 0 0 0 0 0 0
+ 0.897791 0.947762 0.994478 1.00172 1.0038 1.00445 1.00462 1.00454 1.00408 1.0028 0.99965 0.99164
+ 0.966643 0.845948 0.372336 0.000103343 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0.000181507 0.000362617 0.000361993 0.000361529 0.000361043 0.000360535 0.000360003 0.000359446 0.000358863 0.000358253
- 0.000357615 0.000356946 0.000356245 0.00035551 0.000354735 0.000353912 0.00035302 0.000352016 0.000350799 0.000349145 0.000346573 0.000342104
- 0.000333918 0.000319018 0.000293326 0.000252895 0.000196933 0.000132754 8.3831e-05 6.74464e-05
+ 0 0 6.72384e-05 0.000248439 0.000362085 0.000361532 0.000361046 0.000360538 0.000360006 0.000359449 0.000358866 0.000358256
+ 0.000357617 0.000356948 0.000356247 0.000355512 0.000354736 0.000353911 0.000353016 0.000352007 0.000350781 0.000349112 0.000346519 0.000342026
+ 0.000333823 0.000318931 0.000293285 0.000252929 0.000197024 0.000132832 8.38546e-05 6.74464e-05
</DataArray>
<DataArray type="Float32" Name="reynoldsNumber_n" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
@@ -448,16 +448,16 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0.208539 1.37763 2.47058 2.64005 2.68879 2.70387 2.70776 2.70593 2.69527 2.66526 2.5916 2.4042
- 1.81938 1.00434 12.0848 20.7934 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958
+ 0.20854 1.37763 2.47058 2.64005 2.68879 2.70387 2.70776 2.70593 2.69527 2.66526 2.5916 2.4042
+ 1.81937 1.00435 12.0848 20.7934 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958
20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958
20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958
20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958
20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958
20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958 20.7958
- 20.7958 20.7958 20.8191 20.8425 20.8425 20.8425 20.8425 20.8425 20.8426 20.8426 20.8426 20.8426
- 20.8426 20.8427 20.8427 20.8427 20.8427 20.8427 20.8428 20.8428 20.8428 20.8429 20.8429 20.8429
- 20.843 20.843 20.843 20.8431 20.8431 20.8431 20.8432 20.8433
+ 20.7958 20.8076 20.8332 20.8533 20.8597 20.8597 20.8597 20.8597 20.8597 20.8597 20.8598 20.8598
+ 20.8598 20.8598 20.8598 20.8599 20.8599 20.8599 20.8599 20.86 20.86 20.86 20.8601 20.8601
+ 20.8601 20.8602 20.8602 20.8602 20.8603 20.8603 20.8604 20.8605
</DataArray>
<DataArray type="Float32" Name="prandtlNumber_w" NumberOfComponents="1" format="ascii">
1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
@@ -506,15 +506,15 @@
3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375
3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375
3.24116 3.28216 3.31972 3.32548 3.32713 3.32764 3.32777 3.32771 3.32735 3.32633 3.32383 3.31746
- 3.29743 3.19765 2.73196 2.00538 2 2 2 2 2 2 2 2
+ 3.29743 3.19765 2.73195 2.00538 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
- 2 2 2.00754 2.01142 2.01141 2.0114 2.01139 2.01138 2.01137 2.01136 2.01135 2.01134
- 2.01132 2.01131 2.0113 2.01128 2.01127 2.01125 2.01124 2.01122 2.01119 2.01116 2.01111 2.01103
- 2.01087 2.01057 2.01005 2.0092 2.00792 2.00625 2.00474 2.00416
+ 2 2 2.00415 2.0091 2.01141 2.0114 2.01139 2.01138 2.01137 2.01136 2.01135 2.01134
+ 2.01132 2.01131 2.0113 2.01128 2.01127 2.01125 2.01124 2.01122 2.01119 2.01116 2.01111 2.01102
+ 2.01086 2.01057 2.01005 2.0092 2.00792 2.00625 2.00474 2.00416
</DataArray>
<DataArray type="Float32" Name="nusseltNumber_n" NumberOfComponents="1" format="ascii">
2 2 2 2 2 2 2 2 2 2 2 2
@@ -524,16 +524,16 @@
2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
- 2.42707 3.32578 3.88222 3.95865 3.98027 3.98693 3.98864 3.98784 3.98313 3.96986 3.93701 3.85171
- 3.56655 3.09678 6.87904 8.75688 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735
+ 2.42708 3.32578 3.88222 3.95865 3.98027 3.98693 3.98864 3.98784 3.98313 3.96986 3.93701 3.85171
+ 3.56655 3.09679 6.87904 8.75688 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735
8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735
8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735
8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735
8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735
8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735 8.75735
- 8.75735 8.75735 8.76189 8.76644 8.76645 8.76645 8.76645 8.76645 8.76646 8.76646 8.76646 8.76647
- 8.76647 8.76648 8.76648 8.76648 8.76649 8.76649 8.7665 8.7665 8.76651 8.76652 8.76652 8.76653
- 8.76653 8.76654 8.76655 8.76656 8.76656 8.76657 8.76659 8.7666
+ 8.75735 8.75964 8.76463 8.76856 8.76979 8.76979 8.76979 8.7698 8.7698 8.7698 8.76981 8.76981
+ 8.76981 8.76982 8.76982 8.76983 8.76983 8.76984 8.76984 8.76985 8.76985 8.76986 8.76986 8.76987
+ 8.76988 8.76988 8.76989 8.7699 8.76991 8.76991 8.76993 8.76995
</DataArray>
</PointData>
<Points>