Merge branch 'MPL-Perm-new' into 'master'

Gas Pressure Dependent Permeability : MPa changes in gas perm

See merge request ogs/ogs!3753

MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp

@@ -62,10 +62,11 @@ PropertyDataType GasPressureDependentPermeability<DisplacementDim>::value(
 
     auto k_data = k0_(t, pos);
 
-    double const factor = (gas_pressure <= pressure_threshold_)
-                              ? (1.0 + a1_ * gas_pressure)
-                              : (a2_ * (gas_pressure - pressure_threshold_) +
-                                 1.0 + a1_ * pressure_threshold_);
+    double const factor =
+        (gas_pressure <= pressure_threshold_)
+            ? (1.0 + a1_ * gas_pressure / 1.0e6)
+            : (a2_ * (gas_pressure - pressure_threshold_) / 1.0e6 + 1.0 +
+               a1_ * pressure_threshold_ / 1.0e6);
 
     for (auto& k_i : k_data)
     {

MaterialLib/MPL/Properties/GasPressureDependentPermeability.h

@@ -41,6 +41,10 @@ namespace MaterialPropertyLib
  *  where \f$\mathbf{k}\f$ is the permeability, \f$\mathbf{k}_0\f$ is the
  * initial intrinsic permeability, \f$p_g\f$ is the gas pressure, \f$a_1\f$,
  * \f$a_2\f$ and \f$p_\text{thr}\f$ are three parameters.
+ * The threshold pressure and gas pressure, \f$p_g\f$ , \f$p_\text{thr}\f$, are
+ * in Pascal, and the \f$a_1\f$ and \f$a_2\f$ are dimensionless, representing
+ * the values reported in \cite xu2013coupled, and
+ * permeabilities,\f$\mathbf{k}\f$ and \f$\mathbf{k}_0\f$ are in \f$m^2\f$.
  *
  */
 template <int DisplacementDim>

Tests/MaterialLib/TestGasPressureDependentPermeability.cpp

@@ -27,7 +27,7 @@ TEST(MaterialPropertyLib, GasPressureDependentPermeability)
     ParameterLib::ConstantParameter<double> const k0("k0", 1.e-20);
     double const a1 = 0.125;
     double const a2 = 152.0;
-    double const pressure_threshold = 3.2;
+    double const pressure_threshold = 3.2e6;
     double const min_permeability = 1.e-22;
     double const max_permeability = 1.e-10;
 
@@ -42,7 +42,7 @@ TEST(MaterialPropertyLib, GasPressureDependentPermeability)
 
     /// For gas pressure smaller than threshold value.
     {
-        double const p_gas = 2.5;
+        double const p_gas = 2.5e6;
 
         vars[static_cast<int>(MPL::Variable::phase_pressure)] = p_gas;
         auto const k = MPL::formEigenTensor<3>(k_model.value(vars, pos, t, dt));
@@ -58,7 +58,7 @@ TEST(MaterialPropertyLib, GasPressureDependentPermeability)
     }
     /// For gas pressure bigger than threshold value.
     {
-        double const p_gas = 4.5;
+        double const p_gas = 4.5e6;
 
         vars[static_cast<int>(MPL::Variable::phase_pressure)] = p_gas;
         auto const k = MPL::formEigenTensor<3>(k_model.value(vars, pos, t, dt));

scripts/ci/jobs/pre-commit.yml

@@ -8,7 +8,7 @@ pre commit:
     SKIP: clang-format
   script:
     - pre-commit install
-    - TARGET_SHA1=$(git show-ref -s ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME})
+    - TARGET_SHA1=$(git show-ref -s ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} | tail -1)
     - pre-commit run --from-ref `git merge-base ${TARGET_SHA1} HEAD` --to-ref HEAD
     - echo "Target branch is ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}, target sha is ${TARGET_SHA1}."
     - git diff --check `git merge-base ${TARGET_SHA1} HEAD` HEAD -- . ':!*.md' ':!*.pandoc' ':!*.asc' ':!*.dat' ':!*.ts'