Skip to content

GitLab

Commit 556327b1 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'fix/cc-internal-dirichlet' into 'master' 

Fix/cc internal dirichlet

Closes #929

See merge request !2240
parents ad754df0 2c2b5249
Hide whitespace changes
Inline Side-by-side
dumux/assembly/cclocalassembler.hh
View file @ 556327b1
......@@ -284,7 +284,7 @@ public:
{
if (internalDirichletConstraintsOwnElement[eqIdx])
{
origResiduals[0][eqIdx] = this->curElemVolVars()[scv].priVars()[eqIdx] - dirichletValues[eqIdx];
origResiduals[0][eqIdx] = origVolVars.priVars()[eqIdx] - dirichletValues[eqIdx];
A[globalI][globalI][eqIdx][pvIdx] = (eqIdx == pvIdx) ? 1.0 : 0.0;
}
else
......@@ -454,7 +454,7 @@ public:
{
if (internalDirichletConstraints[eqIdx])
{
residual[eqIdx] = this->curElemVolVars()[scv].priVars()[eqIdx] - dirichletValues[eqIdx];
residual[eqIdx] = origVolVars.priVars()[eqIdx] - dirichletValues[eqIdx];
A[globalI][globalI][eqIdx][pvIdx] = (eqIdx == pvIdx) ? 1.0 : 0.0;
}
else
......@@ -579,7 +579,7 @@ public:
{
if (internalDirichletConstraints[eqIdx])
{
residual[eqIdx] = this->curElemVolVars()[scv].priVars()[eqIdx] - dirichletValues[eqIdx];
residual[eqIdx] = volVars.priVars()[eqIdx] - dirichletValues[eqIdx];
A[globalI][globalI][eqIdx][pvIdx] = (eqIdx == pvIdx) ? 1.0 : 0.0;
// inner faces
......@@ -660,7 +660,7 @@ public:
{
if (internalDirichletConstraints[eqIdx])
{
residual[eqIdx] = this->curElemVolVars()[scv].priVars()[eqIdx] - dirichletValues[eqIdx];
residual[eqIdx] = volVars.priVars()[eqIdx] - dirichletValues[eqIdx];
A[globalI][globalI][eqIdx][pvIdx] = (eqIdx == pvIdx) ? 1.0 : 0.0;
}
}
......
dumux/multidomain/subdomaincclocalassembler.hh
View file @ 556327b1
......@@ -415,7 +415,7 @@ public:
{
if (internalDirichletConstraintsOwnElement[eqIdx])
{
origResiduals[0][eqIdx] = this->curElemVolVars()[scv].priVars()[eqIdx] - dirichletValues[eqIdx];
origResiduals[0][eqIdx] = origVolVars.priVars()[eqIdx] - dirichletValues[eqIdx];
A[globalI][globalI][eqIdx][pvIdx] = (eqIdx == pvIdx) ? 1.0 : 0.0;
}
else
......@@ -717,7 +717,7 @@ public:
{
if (internalDirichletConstraints[eqIdx])
{
residual[eqIdx] = this->curElemVolVars()[scv].priVars()[eqIdx] - dirichletValues[eqIdx];
residual[eqIdx] = origVolVars.priVars()[eqIdx] - dirichletValues[eqIdx];
A[globalI][globalI][eqIdx][pvIdx] = (eqIdx == pvIdx) ? 1.0 : 0.0;
}
else
......@@ -846,7 +846,7 @@ public:
{
if (internalDirichletConstraints[eqIdx])
{
residual[eqIdx] = this->curElemVolVars()[scv].priVars()[eqIdx] - dirichletValues[eqIdx];
residual[eqIdx] = volVars.priVars()[eqIdx] - dirichletValues[eqIdx];
A[globalI][globalI][eqIdx][pvIdx] = (eqIdx == pvIdx) ? 1.0 : 0.0;
// inner faces
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment