add new variables + cleaning

NonLinearSolver/internalPoints/ipNonLocalDamageGurson.cpp

@@ -24,7 +24,7 @@ IPNonLocalDamageGurson::IPNonLocalDamageGurson() : IPVariableMechanics(),  _elas
   _Fp(0,0)=1.;
   _Fp(1,1)=1.;
   _Fp(2,2)=1.;
-  _DFvStarDStrain=0;
+  _DFvStarDStrain=0.;
   _logsqrtCe = 0.; 
 };
 
@@ -32,8 +32,11 @@ IPNonLocalDamageGurson::IPNonLocalDamageGurson(double fVinitial, const J2Isotrop
                                                  const CLengthLaw *cll,
                                                  const std::vector<GursonDamageNucleation*> *gdnLawContainer) :
                                                  IPVariableMechanics(),  _elasticEnergy(0.),
-                                                 _eplmatrix(0.), _fV(fVinitial),  _fVstar(fVinitial),
-                                                 _nldfVstar(fVinitial), _DFvStarDNldfVstar(1.),_dissipationBlocked(false)
+                                                 _eplmatrix(0.), _fV(fVinitial),
+                                                 _fVstar(fVinitial),_nldfVstar(fVinitial),
+                                                 _DFvStarDNldfVstar(1.),
+                                                 _dissipationBlocked(false),
+                                                 _NonLocalToLocal(false)
 {
   ipvJ2IsotropicHardening=NULL;
   if(j2IH ==NULL) Msg::Error("IPNonLocalDamageGurson::IPNonLocalDamageGurson has no j2IH");
@@ -61,7 +64,7 @@ IPNonLocalDamageGurson::IPNonLocalDamageGurson(double fVinitial, const J2Isotrop
   
   _logsqrtCe = 0.;
   
-  _DFvStarDStrain=0;
+  _DFvStarDStrain = 0.;
   
 };
 
@@ -93,6 +96,7 @@ IPNonLocalDamageGurson::IPNonLocalDamageGurson(const IPNonLocalDamageGurson &sou
   _DFvStarDStrain=source._DFvStarDStrain;
   _DFvStarDNldfVstar=source._DFvStarDNldfVstar;
   _dissipationBlocked = source._dissipationBlocked;
+  _NonLocalToLocal = source._NonLocalToLocal;
 }
 
 IPNonLocalDamageGurson& IPNonLocalDamageGurson::operator=(const IPVariable &source)
@@ -154,14 +158,12 @@ IPNonLocalDamageGurson& IPNonLocalDamageGurson::operator=(const IPVariable &sour
     _DFvStarDStrain=src->_DFvStarDStrain;
     _DFvStarDNldfVstar=src->_DFvStarDNldfVstar;
     _dissipationBlocked = src->_dissipationBlocked;
+    _NonLocalToLocal = src->_NonLocalToLocal;
   }
   return *this;
 }
 
 
-
-
-
 void IPNonLocalDamageGurson::restart()
 {
   IPVariableMechanics::restart();
@@ -178,6 +180,7 @@ void IPNonLocalDamageGurson::restart()
   restartManager::restart(_logsqrtCe);
   restartManager::restart(_DFvStarDStrain);
   restartManager::restart(_dissipationBlocked);
+  restartManager::restart(_NonLocalToLocal);
   return;
 }
 

NonLinearSolver/internalPoints/ipNonLocalDamageGurson.h

@@ -39,8 +39,8 @@ class IPNonLocalDamageGurson : public IPVariableMechanics
   double _DFvStarDNldfVstar;  //derivative of the local corrected porosity with the non local corrected porosity
   
   // Damage and transition managing
-  bool _dissipationBlocked;
-  
+  bool _dissipationBlocked; // True if dissipation is blocked at the IPv
+  bool _NonLocalToLocal;    // True if transition from local to non-local allowed
   
   // Energies
   double _elasticEnergy; // elastic energy stored