Skip to content
Snippets Groups Projects
Commit 00c9b6d0 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Merge branch 'fix_LIE' into 'master'

Fixed a bug in LIE

Closes #3173

See merge request !3834
parents 88fbc908 c98be45a
No related branches found
No related tags found
No related merge requests found
...@@ -196,8 +196,8 @@ void HydroMechanicsLocalAssemblerFracture<ShapeFunctionDisplacement, ...@@ -196,8 +196,8 @@ void HydroMechanicsLocalAssemblerFracture<ShapeFunctionDisplacement,
Eigen::MatrixXd const global2local_rotation = Eigen::MatrixXd const global2local_rotation =
R.template topLeftCorner<ShapeFunctionPressure::DIM, GlobalDim>(); R.template topLeftCorner<ShapeFunctionPressure::DIM, GlobalDim>();
auto const& gravity_vec = DimVectorType const gravity_vec =
(global2local_rotation * _process_data.specific_body_force).eval(); global2local_rotation * _process_data.specific_body_force;
ParameterLib::SpatialPosition x_position; ParameterLib::SpatialPosition x_position;
x_position.setElementID(_element.getID()); x_position.setElementID(_element.getID());
...@@ -294,7 +294,7 @@ void HydroMechanicsLocalAssemblerFracture<ShapeFunctionDisplacement, ...@@ -294,7 +294,7 @@ void HydroMechanicsLocalAssemblerFracture<ShapeFunctionDisplacement,
Eigen::Matrix<double, 1, displacement_size> const mT_R_Hg = Eigen::Matrix<double, 1, displacement_size> const mT_R_Hg =
identity2.transpose() * R * H_g; identity2.transpose() * R * H_g;
// velocity in global coordinates // velocity in global coordinates
ip_data.darcy_velocity.head(GlobalDim).noalias() = ip_data.darcy_velocity =
-global2local_rotation.transpose() * k * grad_head_over_mu; -global2local_rotation.transpose() * k * grad_head_over_mu;
J_pg.noalias() += N_p.transpose() * S * N_p * p_dot * mT_R_Hg * ip_w; J_pg.noalias() += N_p.transpose() * S * N_p * p_dot * mT_R_Hg * ip_w;
J_pg.noalias() += J_pg.noalias() +=
......
...@@ -80,14 +80,16 @@ private: ...@@ -80,14 +80,16 @@ private:
// Types for displacement. // Types for displacement.
using ShapeMatricesTypeDisplacement = using ShapeMatricesTypeDisplacement =
ShapeMatrixPolicyType<ShapeFunctionDisplacement, GlobalDim>; ShapeMatrixPolicyType<ShapeFunctionDisplacement,
ShapeFunctionDisplacement::DIM>;
using HMatricesType = using HMatricesType =
HMatrixPolicyType<ShapeFunctionDisplacement, GlobalDim>; HMatrixPolicyType<ShapeFunctionDisplacement, GlobalDim>;
using HMatrixType = typename HMatricesType::HMatrixType; using HMatrixType = typename HMatricesType::HMatrixType;
// Types for pressure. // Types for pressure.
using ShapeMatricesTypePressure = using ShapeMatricesTypePressure =
ShapeMatrixPolicyType<ShapeFunctionPressure, GlobalDim>; ShapeMatrixPolicyType<ShapeFunctionPressure,
ShapeFunctionPressure::DIM>;
// Types for the integration point data // Types for the integration point data
using IntegrationPointDataType = using IntegrationPointDataType =
...@@ -97,6 +99,7 @@ private: ...@@ -97,6 +99,7 @@ private:
GlobalDim>; GlobalDim>;
using GlobalDimVector = Eigen::Matrix<double, GlobalDim, 1>; using GlobalDimVector = Eigen::Matrix<double, GlobalDim, 1>;
using DimVectorType = typename ShapeMatricesTypePressure::DimVectorType;
HydroMechanicsProcessData<GlobalDim>& _process_data; HydroMechanicsProcessData<GlobalDim>& _process_data;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
if (NOT (OGS_USE_LIS OR OGS_USE_MPI)) if (NOT (OGS_USE_LIS OR OGS_USE_MPI))
# Temporary disable test until resolution of the issue # Temporary disable test until resolution of the issue
# https://gitlab.opengeosys.org/ogs/ogs/-/issues/3173 # https://gitlab.opengeosys.org/ogs/ogs/-/issues/3173
# OgsTest(PROJECTFILE LIE/HydroMechanics/single_fracture_constK.prj RUNTIME 17) OgsTest(PROJECTFILE LIE/HydroMechanics/single_fracture_constK.prj RUNTIME 17)
OgsTest(PROJECTFILE LIE/HydroMechanics/single_fracture_CZ_kf_const.prj RUNTIME 250) OgsTest(PROJECTFILE LIE/HydroMechanics/single_fracture_CZ_kf_const.prj RUNTIME 250)
OgsTest(PROJECTFILE LIE/HydroMechanics/single_fracture_CZ_kf_cubic.prj RUNTIME 120) OgsTest(PROJECTFILE LIE/HydroMechanics/single_fracture_CZ_kf_cubic.prj RUNTIME 120)
OgsTest(PROJECTFILE LIE/HydroMechanics/single_fracture_LE_kf_const.prj RUNTIME 90) OgsTest(PROJECTFILE LIE/HydroMechanics/single_fracture_LE_kf_const.prj RUNTIME 90)
......
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