Skip to content
Snippets Groups Projects
Commit 652bbdfa authored by Julien Leclerc's avatar Julien Leclerc
Browse files

correct mistake and update ref values in benchmarks

parent b79dca56
No related branches found
No related tags found
2 merge requests!50Coal jl2,!49Transfer Coal jl2 into master
......@@ -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;
}
};
......
......@@ -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)
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment