Skip to content
Snippets Groups Projects
Commit c84ec7b7 authored by Van Dung NGUYEN's avatar Van Dung NGUYEN
Browse files

use current only

parent 6b09a2bd
Branches
Tags
1 merge request!131Vdg cm3
......@@ -232,7 +232,7 @@ void mlawNonLocalPorousCoupledLaw::createIPState(IPStateBase* &ips,const bool* s
double mlawNonLocalPorousCoupledLaw::yieldFunction(const double kcorEq, const double pcor, const double R, const double yieldfV,
const IPNonLocalPorosity* q0, const IPNonLocalPorosity* q1, const double* T) const{
bool coalesFlag = q0->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
bool coalesFlag = q1->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
if (coalesFlag){
return _mlawCoales->yieldFunction(kcorEq,pcor,R,yieldfV,q0,q1,T);
......@@ -250,7 +250,7 @@ void mlawNonLocalPorousCoupledLaw::computeResidual(SVector3& res, STensor3& J,
const double* T
) const{
bool coalesFlag = q0->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
bool coalesFlag = q1->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
if (coalesFlag){
_mlawCoales->computeResidual(res,J,kcorEqpr,pcorpr,R,H,yieldfV,DyieldfVDfV,q0,q1,
......@@ -276,7 +276,7 @@ void mlawNonLocalPorousCoupledLaw::computeDResidual(STensor3 &dres0dEpr, STensor
double *dres0dT, double *dres1dT, double *dres2dT
) const{
bool coalesFlag = q0->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
bool coalesFlag = q1->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
if (coalesFlag){
_mlawCoales->computeDResidual(dres0dEpr,dres1dEpr,dres2dEpr,
......@@ -316,7 +316,7 @@ void mlawNonLocalPorousCoupledLaw::computeDResidualLocal(STensor3 &dres0dEpr, ST
const STensor3* DdevKcorprDT , const double* DpcorprDT, const double* DDeltafVDT,
double *dres0dT, double *dres1dT, double *dres2dT
) const{
bool coalesFlag = q0->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
bool coalesFlag = q1->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
if (coalesFlag){
_mlawCoales->computeDResidualLocal(dres0dEpr, dres1dEpr, dres2dEpr,
......@@ -626,7 +626,7 @@ void mlawNonLocalPorousCoupledLaw::computeResidual_multipleNonLocalVariables(SVe
const double DeltaHatD, const double DeltaHatQ, const double DeltaHatP, // 3 unknonwn
const double DeltafV, const double* T
) const{
bool coalesFlag = q0->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
bool coalesFlag = q1->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
if (coalesFlag){
_mlawCoales->computeResidual_multipleNonLocalVariables(res,J,kcorEqpr,pcorpr,R,H,yieldfV,DyieldfVDfV,q0,q1,
DeltaHatD,DeltaHatQ,DeltaHatP,DeltafV,T);
......@@ -648,7 +648,7 @@ void mlawNonLocalPorousCoupledLaw::computeDResidual_multipleNonLocalVariables(ST
const STensor3* DdevKcorprDT, const double* DpcorprDT, const double* DDeltafVDT,
double *dres0dT, double *dres1dT, double *dres2dT
) const{
bool coalesFlag = q0->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
bool coalesFlag = q1->getConstRefToIPCoalescence().getCoalescenceActiveFlag();
if (coalesFlag){
_mlawCoales->computeDResidual_multipleNonLocalVariables(dres0dEpr,dres1dEpr,dres2dEpr,
dres0dtildefV,dres1dtildefV,dres2dtildefV,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment