From 652bbdfa4627640fade145c41d3e47e870018076 Mon Sep 17 00:00:00 2001
From: jleclerc <julien.leclerc@ulg.ac.be>
Date: Fri, 9 Mar 2018 15:35:22 +0100
Subject: [PATCH] correct mistake and update ref values in benchmarks
---
.../materialLaw/mlawNonLocalPorousCoalescence.cpp | 7 ++-----
dG3D/benchmarks/Thomason_cube/cube.py | 4 ++--
dG3D/benchmarks/Thomason_planeStrain/model.py | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/NonLinearSolver/materialLaw/mlawNonLocalPorousCoalescence.cpp b/NonLinearSolver/materialLaw/mlawNonLocalPorousCoalescence.cpp
index 934210e6a..7dad6c1bb 100644
--- a/NonLinearSolver/materialLaw/mlawNonLocalPorousCoalescence.cpp
+++ b/NonLinearSolver/materialLaw/mlawNonLocalPorousCoalescence.cpp
@@ -114,21 +114,18 @@ void mlawNonLocalPorousThomasonLaw::computeConcentrationFactor(const double Chi,
double ChiBis = 1.e-8;
double Cft_1 = (1.-ChiBis*ChiBis);
double Cft_2 = alpha*(1./ChiBis - 1.)*(1./ChiBis - 1.) + beta*pow(ChiBis,-0.5);
- Cft = 1.5*Cft_1*Cft_2;
+ Cft = Cft_1*Cft_2;
dCftDChi = (-2.)*ChiBis*Cft_2 + Cft_1*(2.*alpha*(1./ChiBis - 1.)*(-1./ChiBis/ChiBis) - 0.5*beta*pow(ChiBis,-1.5));
- dCftDChi *= 1.5;
-
}
else
{
double Cft_1 = (1.-Chi*Chi);
double Cft_2 = alpha*(1./Chi - 1.)*(1./Chi - 1.) + beta*pow(Chi,-0.5);
- Cft = 1.5*Cft_1*Cft_2;
+ Cft = Cft_1*Cft_2;
dCftDChi = (-2.)*Chi*Cft_2 + Cft_1*(2.*alpha*(1./Chi - 1.)*(-1./Chi/Chi) - 0.5*beta*pow(Chi,-1.5));
- dCftDChi *= 1.5;
}
};
diff --git a/dG3D/benchmarks/Thomason_cube/cube.py b/dG3D/benchmarks/Thomason_cube/cube.py
index addaff82c..081f5219d 100755
--- a/dG3D/benchmarks/Thomason_cube/cube.py
+++ b/dG3D/benchmarks/Thomason_cube/cube.py
@@ -141,13 +141,13 @@ mysolver.solve()
# Test
# ===========
check = TestCheck()
-check.equal(1.965028e+00,mysolver.getArchivedForceOnPhysicalGroup("Face", 31, 0),1.e-5)
+check.equal(1.300809e+00,mysolver.getArchivedForceOnPhysicalGroup("Face", 31, 0),1.e-5)
import csv
data = csv.reader(open('IPVolume29val_LOCAL_POROSITYMean.csv'), delimiter=';')
porosity = list(data)
-check.equal(3.410872e-01,float(porosity[-1][1]),1e-5)
+check.equal(3.403506e-01,float(porosity[-1][1]),1e-5)
data = csv.reader(open('IPVolume29val_LIGAMENT_RATIOMean.csv'), delimiter=';')
porosity = list(data)
diff --git a/dG3D/benchmarks/Thomason_planeStrain/model.py b/dG3D/benchmarks/Thomason_planeStrain/model.py
index 048c9e04e..77cbd49ec 100644
--- a/dG3D/benchmarks/Thomason_planeStrain/model.py
+++ b/dG3D/benchmarks/Thomason_planeStrain/model.py
@@ -172,7 +172,7 @@ mysolver.solve()
check = TestCheck()
-check.equal(-2.144151e+02,mysolver.getArchivedForceOnPhysicalGroup("Edge", 4, 0),1.e-4)
+check.equal(-1.249122e+02,mysolver.getArchivedForceOnPhysicalGroup("Edge", 4, 0),1.e-4)
--
GitLab