Skip to content
Snippets Groups Projects
Unverified Commit 5dafe2c7 authored by Tom Fischer's avatar Tom Fischer Committed by GitHub
Browse files

Merge pull request #2331 from TomFischer/Cleanup

Small fixes.
parents 6e140897 633c5716
No related branches found
No related tags found
No related merge requests found
......@@ -70,7 +70,7 @@ public:
}
/**
* Get the partial differential of the viscosity with respect to
* Get the partial differential of the viscosity with respect to
* temperature.
* \param var_vals Variable values in an array. The order of its elements
* is given in enum class PropertyVariableType.
......@@ -81,7 +81,8 @@ public:
{
(void)var;
const double T = var_vals[static_cast<int>(PropertyVariableType::T)];
return -_mu0 * std::exp(-(T - _temperature_c) / _temperature_v);
return -_mu0 / _temperature_v *
std::exp(-(T - _temperature_c) / _temperature_v);
}
private:
......
......@@ -19,7 +19,6 @@
#include "MathLib/LinAlg/MatrixVectorTraits.h"
#include "NumLib/DOF/DOFTableUtil.h"
#include "ProcessLib/Deformation/GMatrix.h"
#include "ProcessLib/Parameter/SpatialPosition.h"
#include "ProcessLib/Utils/InitShapeMatrices.h"
namespace ProcessLib
......
......@@ -288,9 +288,6 @@ HydroMechanicsLocalAssembler<ShapeFunctionDisplacement, ShapeFunctionPressure,
double, DisplacementDim, Eigen::Dynamic, Eigen::RowMajor>>(
cache, DisplacementDim, num_intpts);
SpatialPosition pos;
pos.setElementID(_element.getID());
auto p = Eigen::Map<typename ShapeMatricesTypePressure::template VectorType<
pressure_size> const>(local_x.data() + pressure_index, pressure_size);
......
......@@ -63,8 +63,10 @@ TEST(MaterialFluidProperties, checkPrimaryVariableDependentFluidProperties)
ASSERT_NEAR(mu_expected,
fluid_model->getValue(FluidPropertyType::Viscosity, vars),
1.e-10);
const double dmu_dT_expected =
-1.e-3/368 * std::exp(-(vars[0] - 293) / 368);
ASSERT_NEAR(
-mu_expected,
dmu_dT_expected,
fluid_model->getdValue(FluidPropertyType::Viscosity, vars,
MaterialLib::Fluid::PropertyVariableType::T),
1.e-10);
......
......@@ -64,8 +64,10 @@ TEST(Material, checkTemperatureDependentViscosity)
vars[0] = 350.0;
const double mu_expected = 1.e-3 * std::exp(-(vars[0] - 293) / 368);
ASSERT_NEAR(mu_expected, mu->getValue(vars), 1.e-10);
const double dmu_dT_expected =
-1.e-3/368 * std::exp(-(vars[0] - 293) / 368);
ASSERT_NEAR(
-mu_expected,
dmu_dT_expected,
mu->getdValue(vars, MaterialLib::Fluid::PropertyVariableType::T),
1.e-10);
}
......
......@@ -50,10 +50,12 @@ GocadSGridReader -s flow_simulation_grid_klein_Rinne.sg -o flow_simulation_grid_
### Thuringia Syncline (INFLUINS project)
The tool was used to convert Gocad stratigraphic grids (upper left part of the
figure below) of the Thuringia syncline to a vtk unstructured grid (lower left
part of the figure) within the INFLUINS project.
{{< bib id="Fischer:2015" >}}
The tool was used to convert Gocad stratigraphic grids ('GoCad Model' in
figure below) of the Thuringia syncline to a vtk unstructured grid ('VTU'
in the figure) within the INFLUINS project. Further conversion steps were taken
to prepare the mesh for the simulation (not part of this tool, see Fischer et
al. 2015).
{{< bib id="Fischer:2015" >}})
![](WorkflowGO2OGS.png)
### Rotenburger Rinne (Geologischer Dienst für Niedersachsen, Referat Hydrogeologie Landesamt für Bergbau, Energie und Geologie (Jörg Elbracht))
......
......@@ -39,7 +39,7 @@ info: Mesh created: 210 nodes, 120 elements.
## Basic options
### Output mesh format `-o filneme.ext`
### Output mesh format `-o filename.ext`
Depending on the file ending `.msh` or `.vtu` either a legacy OGS5 mesh file or VTK unstructured grid file is generated. Unsupported file endings will result in an error.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment