diff --git a/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h b/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h index 74fb26500dbcef9df343221dfd4e564dda904508..48386f10dc0e0eeb802fe130da0417b14236445e 100644 --- a/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h +++ b/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h @@ -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: diff --git a/ProcessLib/Deformation/MaterialForces.h b/ProcessLib/Deformation/MaterialForces.h index 7166a7a6b580267b60d7f3fb96d7302d94b44fd7..12a7693d6055bff86f6a73341195c2f4d961886b 100644 --- a/ProcessLib/Deformation/MaterialForces.h +++ b/ProcessLib/Deformation/MaterialForces.h @@ -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 diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h index 26e85168734bf1d0afc75bc74b4e9e12c075276c..28a8ebe49b2da6c6811fa8aa59fa26cc84897e18 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h +++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h @@ -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); diff --git a/Tests/MaterialLib/TestFluidProperties.cpp b/Tests/MaterialLib/TestFluidProperties.cpp index f27e4f2f0f414ca9bcf8a2da6b9969599efb863d..ce458140ee0117ee001a90085537f51aa3da269a 100644 --- a/Tests/MaterialLib/TestFluidProperties.cpp +++ b/Tests/MaterialLib/TestFluidProperties.cpp @@ -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); diff --git a/Tests/MaterialLib/TestFluidViscosity.cpp b/Tests/MaterialLib/TestFluidViscosity.cpp index 60fa3103b0f4c5c475201dee7a4668ae58789eea..a5a39f97cd4e22f819185a2afeb39539e4c6c700 100644 --- a/Tests/MaterialLib/TestFluidViscosity.cpp +++ b/Tests/MaterialLib/TestFluidViscosity.cpp @@ -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); } diff --git a/web/content/docs/tools/meshing/gocadsgridreader/index.pandoc b/web/content/docs/tools/meshing/gocadsgridreader/index.pandoc index 94e71b1cdc30a0632d597a7a2599e67499209f4a..cb1cfccbad61df131ddac3c697f1aac5af40a8b2 100644 --- a/web/content/docs/tools/meshing/gocadsgridreader/index.pandoc +++ b/web/content/docs/tools/meshing/gocadsgridreader/index.pandoc @@ -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" >}})  ### Rotenburger Rinne (Geologischer Dienst für Niedersachsen, Referat Hydrogeologie Landesamt für Bergbau, Energie und Geologie (Jörg Elbracht)) diff --git a/web/content/docs/tools/meshing/structured-mesh-generation/index.pandoc b/web/content/docs/tools/meshing/structured-mesh-generation/index.pandoc index cef3813f22dab068511b82317b1aaaf5a3d74660..4ecc369ab5d7d94b108a40a1a32e2aef40ca70b1 100644 --- a/web/content/docs/tools/meshing/structured-mesh-generation/index.pandoc +++ b/web/content/docs/tools/meshing/structured-mesh-generation/index.pandoc @@ -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.