diff --git a/NonLinearSolver/materialLaw/mlawHyperelastic.cpp b/NonLinearSolver/materialLaw/mlawHyperelastic.cpp index 995c23bd907ca7f540848d1693ba59963f9dfd7b..1f8f2bcf8aadb40e20751c09e12f8b63dbcf3f91 100644 --- a/NonLinearSolver/materialLaw/mlawHyperelastic.cpp +++ b/NonLinearSolver/materialLaw/mlawHyperelastic.cpp @@ -162,7 +162,7 @@ void mlawHyperViscoElastic::evaluatePhiPCorrection(double tr, const STensor3 &de intA = getVolumeCorrection()*3./(2.*getXiVolumeCorrection()) * sqrt(1+x*x); } else{ - A_v = -1. + 1.e+5; + A_v = -1. + 1.e-5; dA_vdE = 0.; intA = 0.; // correct it inside extraBranchLaw } @@ -179,12 +179,10 @@ void mlawHyperViscoElastic::evaluatePhiPCorrection(double tr, const STensor3 &de } else{ - B_d = -1. + 1.e+5; + B_d = -1. + 1.e-5; STensorOperation::zero(dB_vddev); intB = 0.; // correct it inside extraBranchLaw } - intB = getDevCorrection()/(2.*getThetaDevCorrection()) * sqrt(1+y*y); - // Msg::Error(" Inside evaluatePhiPCorrection, A_v = %e, B_d = %e !!", A_v, B_d); @@ -215,7 +213,7 @@ void mlawHyperViscoElastic::evaluatePhiPCorrection(double tr, const STensor3 &de } intB=0.; - Msg::Error(" Inside evaluatePhiPCorrection, A_v = %e, B_d = %e !!", A_v, B_d); + // Msg::Error(" Inside evaluatePhiPCorrection, A_v = %e, B_d = %e !!", A_v, B_d); } diff --git a/NonLinearSolver/materialLaw/mlawNonLinearTVE.cpp b/NonLinearSolver/materialLaw/mlawNonLinearTVE.cpp index 516784ea7514956d1356a938e700d67f24c8f9ae..87db501e6d5a8870d7483ad530b8e28dbcb16515 100644 --- a/NonLinearSolver/materialLaw/mlawNonLinearTVE.cpp +++ b/NonLinearSolver/materialLaw/mlawNonLinearTVE.cpp @@ -1106,14 +1106,14 @@ void mlawNonLinearTVE::extraBranchLaw(const STensor3& Ee, const double& T, const double intA(0.), intB(0.), dA_dT(0.), dB_dT(0.), ddA_dTT(0.), ddB_dTT(0.); evaluateElasticCorrection(trEe, devEe, T, A, dA_dTrEe, intA, dA_dT, B, dB_dDevEe, intB, dB_dT, &ddA_dTT, &ddB_dTT); - if (A <= -1. + 1.e+5){ // saturated + if (A <= -1. + 1.e-5){ // saturated double trEe_0 = q0->_Ee.trace(); intA = q0->_intA; intA += A*0.5 *(trEe*trEe-trEe_0*trEe_0); } q1->_intA = intA; - if (B <= -1. + 1.e+5){ // saturated + if (B <= -1. + 1.e-5){ // saturated static STensor3 devEe_0; double trEe_0; STensorOperation::decomposeDevTr(q0->_Ee,devEe_0,trEe_0); diff --git a/dG3D/src/dG3DMaterialLaw.cpp b/dG3D/src/dG3DMaterialLaw.cpp index 0eaf97c271bd3789d7841c27fb8314f9f61d5abe..62969d4c24692f0d039b2875970bcdcadb77d4ab 100644 --- a/dG3D/src/dG3DMaterialLaw.cpp +++ b/dG3D/src/dG3DMaterialLaw.cpp @@ -246,7 +246,7 @@ void dG3DMaterialLawWithTangentByPerturbation::stress(IPVariable* ipv, const IPV _stressLaw->stress(ipvcur,ipvprev,false,checkfrac,dTangent); -#if 0 +#if 1 _stressLaw->stress(ipvcur,ipvprev,true,checkfrac,dTangent); ipvcur->getConstRefToDeformationGradient().print("F Analytique"); // FLE ipvcur->getConstRefToFirstPiolaKirchhoffStress().print("P Analytique"); // FLE @@ -288,7 +288,7 @@ void dG3DMaterialLawWithTangentByPerturbation::stress(IPVariable* ipv, const IPV Msg::Info("dEMFieldSource dp Analytique: %e",ipvcur->getConstRefTodEMFieldSourcedNonLocalVariable()(j,i)); } } - + /* for (int i=0; i< numExtraDof; i++) { Msg::Info("Field Analytique: %e",ipvcur->getConstRefToField(i)); // FLE @@ -329,8 +329,8 @@ void dG3DMaterialLawWithTangentByPerturbation::stress(IPVariable* ipv, const IPV for (unsigned int k = 0; k < numNonLocalVars; ++k) { Msg::Info("dp dExtraDofDiffusionField Analytique: %e",ipvcur->getRefTodLocalVariableDExtraDofDiffusionField()(k,i)); - }*/ - } + } + }*/ for (unsigned int i = 0; i < numCurlDof; ++i) { ipvcur->getConstRefTodPdVectorPotential()[i].print("dPdMagneticVectorPotential Analytique"); @@ -616,7 +616,7 @@ void dG3DMaterialLawWithTangentByPerturbation::stress(IPVariable* ipv, const IPV } } -#if 0 +#if 1 ipvcur->getConstRefToDeformationGradient().print("F Numerique"); // FLE ipvcur->getConstRefToFirstPiolaKirchhoffStress().print("P Numerique"); // FLE ipvcur->getConstRefToTangentModuli().print("dPdE Numerique"); @@ -656,7 +656,7 @@ void dG3DMaterialLawWithTangentByPerturbation::stress(IPVariable* ipv, const IPV } } - for (int i=0; i< numExtraDof; i++) + /*for (int i=0; i< numExtraDof; i++) { Msg::Info("Field Numerique: %e",ipvcur->getConstRefToField(i)); // FLE ipvcur->getConstRefToFlux()[i].print("Flux Numerique"); // FLE @@ -695,8 +695,8 @@ void dG3DMaterialLawWithTangentByPerturbation::stress(IPVariable* ipv, const IPV for (unsigned int k = 0; k < numNonLocalVars; ++k) { Msg::Info("dp dExtraDofDiffusionField Numerique: %e",ipvcur->getRefTodLocalVariableDExtraDofDiffusionField()(k,i)); - }*/ - } + } + }*/ for (unsigned int i = 0; i < numCurlDof; ++i) { const unsigned int extradof_T = 0; // Thermal field EM source