diff --git a/dG3D/src/axisymmetricDG3DDomain.cpp b/dG3D/src/axisymmetricDG3DDomain.cpp
index b77802da0aef44b689fc3dd2e765d46ea9ce8e4b..3581253db5edbb03b78a3f1128efdc2d06d8cdfe 100644
--- a/dG3D/src/axisymmetricDG3DDomain.cpp
+++ b/dG3D/src/axisymmetricDG3DDomain.cpp
@@ -131,19 +131,6 @@ void axisymmetricDG3DDomain::computeStrain(MElement *e, const int npts_bulk, Int
}
}
- // compute nonlocal var for law
- //if (getNumNonLocalVariable() > 0)
- //{
- // make equal
- // for(int j=0;j<npts_bulk;j++){
- // IPStateBase* ips = (*vips)[j];
- // dG3DIPVariableBase *ipv = static_cast<dG3DIPVariableBase*>(ips->getState(ws));
- // for (int nl = 0; nl < ipv->getNumberNonLocalVariable(); nl++)
- // {
- // ipv->getRefToNonLocalVariableInMaterialLaw(nl) = ipv->getConstRefToNonLocalVariable(nl);
- // }
- // }
- //}
};
@@ -469,27 +456,6 @@ void axisymmetricDG3DDomain::computeStrain(AllIPState *aips,MInterfaceElement *i
ipvp->getRefToNonLocalJump()(nl) = epsjump;
}
}
- //if (getNumNonLocalVariable() > 0)
- // {
-
- // for(int j=0;j<npts;j++)
- // {
- // IPStateBase* ipsm = (*vips)[j];
- // IPStateBase* ipsp = (*vips)[j+npts];
-
- // dG3DIPVariableBase* ipvm = static_cast<dG3DIPVariableBase*>(ipsm->getState(ws));
- // dG3DIPVariableBase* ipvp = static_cast<dG3DIPVariableBase*>(ipsp->getState(ws));
- // for (int nlm = 0; nlm < ipvm->getNumberNonLocalVariable(); nlm++)
- // {
- // ipvm->getRefToNonLocalVariableInMaterialLaw(nlm) = ipvm->getConstRefToNonLocalVariable(nlm);
- // }
- // for (int nlp = 0; nlp < ipvp->getNumberNonLocalVariable(); nlp++)
- // {
- // ipvp->getRefToNonLocalVariableInMaterialLaw(nlp) = ipvp->getConstRefToNonLocalVariable(nlp);
- // }
-
- // }
- //}
// if _averageStrainBased, avergaed both sides
if (_averageStrainBased and (efMinus->getMaterialLaw()->getNum() == efPlus->getMaterialLaw()->getNum())){
@@ -505,11 +471,6 @@ void axisymmetricDG3DDomain::computeStrain(AllIPState *aips,MInterfaceElement *i
// loop on n-l variables
for (int nlv = 0; nlv < ipvm->getNumberNonLocalVariable(); nlv++)
{
- // average values
- //double& valminus = ipvm->getRefToNonLocalVariableInMaterialLaw(nlv);
- //valminus += ipvp->getConstRefToNonLocalVariableInMaterialLaw(nlv);
- //valminus *= 0.5;
- //ipvp->getRefToNonLocalVariableInMaterialLaw(nlv) = valminus;
double& valminus = ipvm->getRefToNonLocalVariable(nlv);
valminus += ipvp->getConstRefToNonLocalVariable(nlv);
diff --git a/dG3D/src/dG3DDomain.cpp b/dG3D/src/dG3DDomain.cpp
index 25d2dd0b2623d28060086d881076202e6342792f..bbc348a0fa29ab6fc6eb447df2c43b555306ba81 100644
--- a/dG3D/src/dG3DDomain.cpp
+++ b/dG3D/src/dG3DDomain.cpp
@@ -2444,17 +2444,6 @@ void dG3DDomain::computeStrain(MElement *e, const int npts_bulk, IntPt *GP,
}
}
}
-
- // compute nonlocal var for law
- //for(int j=0;j<npts_bulk;j++){
- // IPStateBase* ips = (*vips)[j];
- // dG3DIPVariableBase *ipv = static_cast<dG3DIPVariableBase*>(ips->getState(ws));
- // for (int nl = 0; nl < ipv->getNumberNonLocalVariable(); nl++)
- // {
- // if (evaluateNonLocalField[nl])
- // ipv->getRefToNonLocalVariableInMaterialLaw(nl) = ipv->getConstRefToNonLocalVariable(nl);
- // }
- // }
}
/*
@@ -2675,7 +2664,6 @@ bool dG3DDomain::computeIpv(AllIPState *aips,MElement *e, IPStateBase::whichStat
if (numNL > 0){
dnonlocalVar.resize(numNL);
for (int iv = 0; iv < numNL; iv++){
- //dnonlocalVar(iv) = (dgipv->getConstRefToNonLocalVariableInMaterialLaw(iv) - dgipvprev->getConstRefToNonLocalVariableInMaterialLaw(iv));
dnonlocalVar(iv) = (dgipv->getConstRefToNonLocalVariable(iv) - dgipvprev->getConstRefToNonLocalVariable(iv));
}
}
@@ -2690,8 +2678,6 @@ bool dG3DDomain::computeIpv(AllIPState *aips,MElement *e, IPStateBase::whichStat
F.daxpy(dF,time);
for (int iv=0; iv < numNL; iv++){
- //dgipv->getRefToNonLocalVariableInMaterialLaw(iv) = dgipvprev->getConstRefToNonLocalVariableInMaterialLaw(iv);
- //dgipv->getRefToNonLocalVariableInMaterialLaw(iv) += (time*dnonlocalVar(iv));
dgipv->getRefToNonLocalVariable(iv) = dgipvprev->getConstRefToNonLocalVariable(iv);
dgipv->getRefToNonLocalVariable(iv) += (time*dnonlocalVar(iv));
}
@@ -3238,26 +3224,6 @@ void dG3DDomain::computeStrain(AllIPState *aips,MInterfaceElement *ie, IntPt *GP
}
}
-
- //for(int j=0;j<npts;j++)
- //{
- // IPStateBase* ipsm = (*vips)[j];
- // IPStateBase* ipsp = (*vips)[j+npts];
-
- // dG3DIPVariableBase* ipvm = static_cast<dG3DIPVariableBase*>(ipsm->getState(ws));
- // dG3DIPVariableBase* ipvp = static_cast<dG3DIPVariableBase*>(ipsp->getState(ws));
- // for (int nlm = 0; nlm < ipvm->getNumberNonLocalVariable(); nlm++)
- // {
- // if (evaluateNonLocalField[nlm]) ipvm->getRefToNonLocalVariableInMaterialLaw(nlm) = ipvm->getConstRefToNonLocalVariable(nlm);
- // }
- // for (int nlp = 0; nlp < ipvp->getNumberNonLocalVariable(); nlp++)
- // {
- // if (evaluateNonLocalField[nlp]) ipvp->getRefToNonLocalVariableInMaterialLaw(nlp) = ipvp->getConstRefToNonLocalVariable(nlp);
- // }
-
- //}
-
-
// mean part
if (_averageStrainBased and (efMinus->getMaterialLaw()->getNum() == efPlus->getMaterialLaw()->getNum()))
{
@@ -3271,11 +3237,6 @@ void dG3DDomain::computeStrain(AllIPState *aips,MInterfaceElement *ie, IntPt *GP
// average nonlocal values
for (int nlv = 0; nlv < ipvm->getNumberNonLocalVariable(); nlv++){
if (evaluateNonLocalField[nlv]) {
- // value averge
- //double &valminus = ipvm->getRefToNonLocalVariableInMaterialLaw(nlv);
- //valminus += ipvp->getConstRefToNonLocalVariableInMaterialLaw(nlv);
- //valminus *= 0.5;
- //ipvp->getRefToNonLocalVariableInMaterialLaw(nlv) = valminus;
double &valminus = ipvm->getRefToNonLocalVariable(nlv);
valminus += ipvp->getConstRefToNonLocalVariable(nlv);
valminus *= 0.5;
@@ -3847,7 +3808,6 @@ bool dG3DDomain::computeIpv(AllIPState *aips,MInterfaceElement *ie, IntPt *GP,co
if (numNL > 0){
dnonlocalVarm.resize(numNL);
for (int iv = 0; iv < numNL; iv++){
- //dnonlocalVarm(iv) = (dgipvm->getConstRefToNonLocalVariableInMaterialLaw(iv) - dgipvmprev->getConstRefToNonLocalVariableInMaterialLaw(iv));
dnonlocalVarm(iv) = (dgipvm->getConstRefToNonLocalVariable(iv) - dgipvmprev->getConstRefToNonLocalVariable(iv));
}
}
@@ -3862,8 +3822,6 @@ bool dG3DDomain::computeIpv(AllIPState *aips,MInterfaceElement *ie, IntPt *GP,co
F.daxpy(dF,time);
for (int iv=0; iv < numNL; iv++){
- //dgipvm->getRefToNonLocalVariableInMaterialLaw(iv) = dgipvmprev->getConstRefToNonLocalVariableInMaterialLaw(iv);
- //dgipvm->getRefToNonLocalVariableInMaterialLaw(iv) += (time*dnonlocalVarm(iv));
dgipvm->getRefToNonLocalVariable(iv) = dgipvmprev->getConstRefToNonLocalVariable(iv);
dgipvm->getRefToNonLocalVariable(iv) += (time*dnonlocalVarm(iv));
}
@@ -3911,7 +3869,6 @@ bool dG3DDomain::computeIpv(AllIPState *aips,MInterfaceElement *ie, IntPt *GP,co
if (numNL > 0){
dnonlocalVarp.resize(numNL);
for (int iv = 0; iv < numNL; iv++){
- //dnonlocalVarp(iv) = (dgipvp->getConstRefToNonLocalVariableInMaterialLaw(iv) - dgipvpprev->getConstRefToNonLocalVariableInMaterialLaw(iv));
dnonlocalVarp(iv) = (dgipvp->getConstRefToNonLocalVariable(iv) - dgipvpprev->getConstRefToNonLocalVariable(iv));
}
}
@@ -3926,8 +3883,6 @@ bool dG3DDomain::computeIpv(AllIPState *aips,MInterfaceElement *ie, IntPt *GP,co
F.daxpy(dF,time);
for (int iv=0; iv < numNL; iv++){
- //dgipvp->getRefToNonLocalVariableInMaterialLaw(iv) = dgipvpprev->getConstRefToNonLocalVariableInMaterialLaw(iv);
- //dgipvp->getRefToNonLocalVariableInMaterialLaw(iv) += (time*dnonlocalVarp(iv));
dgipvp->getRefToNonLocalVariable(iv) = dgipvpprev->getConstRefToNonLocalVariable(iv);
dgipvp->getRefToNonLocalVariable(iv) += (time*dnonlocalVarp(iv));
}
diff --git a/dG3D/src/dG3DIPVariable.h b/dG3D/src/dG3DIPVariable.h
index 464aefb96abc3f04022b44be209380d34e41e77e..bea3054c60863c045f4a311dd367d4c0d6265102 100644
--- a/dG3D/src/dG3DIPVariable.h
+++ b/dG3D/src/dG3DIPVariable.h
@@ -965,10 +965,6 @@ virtual void setValueForBodyForce(const STensor43& K, const int _ModuliType);
return _nonlocalData->localVariable;
};
- //
- //virtual double getConstRefToNonLocalVariableInMaterialLaw(const int idex) const {Msg::Error("getConstRefToNonLocalVariable not defined"); static double a=0; return a;};
- //virtual double& getRefToNonLocalVariableInMaterialLaw(const int idex) {Msg::Error("getRefToNonLocalVariable not defined"); static double a=0; return a;};
- //
virtual double getConstRefToNonLocalVariable(const int idex) const
{
if(_nonlocalData==NULL)