Skip to content

Commit 916e80a

Browse files
sebproellsebproell
committed
Remove unused TSI define flags
1 parent 969a8e1 commit 916e80a

11 files changed

+1
-1228
lines changed

‎src/mat/4C_mat_damage.cpp‎

Lines changed: 0 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,6 @@ void Mat::Damage::update()
234234
{
235235
if (failedcurr_.at(gp))
236236
{
237-
#ifdef DEBUGMATERIAL
238-
if (!failedlast_.at(gp))
239-
std::cout << "Element " << eleGID << ", ip " << gp << " has failed!\n";
240-
#endif // #ifdef DEBUGMATERIAL
241237
failedlast_.at(gp) = true;
242238
}
243239
}
@@ -518,10 +514,6 @@ void Mat::Damage::evaluate_simplified_lemaitre(const Core::LinAlg::Matrix<3, 3>*
518514
// check if newest astrain^{p,m}_{n+1} is still smaller than threshold
519515
if (strainbar_p < strainbar_p_D)
520516
{
521-
#ifdef DEBUGMATERIAL
522-
if (gp == 0) std::cout << "No damage! Current load step is admissible!" << std::endl;
523-
#endif // #ifdef DEBUGMATERIAL
524-
525517
// no damage occurs, i.e. current solution is correct, no return-map
526518
// considering damage is necessary
527519
damevolution = false;
@@ -583,22 +575,11 @@ void Mat::Damage::evaluate_simplified_lemaitre(const Core::LinAlg::Matrix<3, 3>*
583575
// update damage variable damage_{n+1}
584576
damagecurr_.at(gp) = damage;
585577

586-
#ifdef DEBUGMATERIAL
587-
std::cout << "end strain_p\n " << strain_p << std::endl;
588-
std::cout << "end strainplcurr_->at(gp)\n " << strainplcurr_->at(gp) << std::endl;
589-
#endif // ifdef DEBUGMATERIAL
590578

591579
} // (strainbar_p < strainbar_p_D)
592580
// updated strainbar_p not valid, recalculate step considering damage
593581
else // (strainbar_p > strainbar_p_D)
594582
{
595-
#ifdef DEBUGMATERIAL
596-
if (gp == 0)
597-
std::cout << "New solution strainbar_p^m exceeds damage threshold!"
598-
"\n Recalculate load step considering damage!"
599-
<< std::endl;
600-
#endif // #ifdef DEBUGMATERIAL
601-
602583
// damage occurs, i.e. current solution is not correct, recalculate
603584
// load step considering damage
604585
damevolution = true;
@@ -617,20 +598,6 @@ void Mat::Damage::evaluate_simplified_lemaitre(const Core::LinAlg::Matrix<3, 3>*
617598

618599
if (damevolution == true)
619600
{
620-
#ifdef DEBUGMATERIAL
621-
// only first plastic call is output at screen for every processor
622-
// visualisation of whole plastic behaviour via PLASTIC_STRAIN in postprocessing
623-
if ((plastic_step_ == false) and (gp == 0))
624-
{
625-
std::cout << "damage starts to evolve in element = " << eleID << std::endl;
626-
627-
plastic_step_ = true;
628-
}
629-
630-
std::cout << "Damage has to be considered for current load step and ele = " << eleID
631-
<< ", and gp = " << gp << " ! Threshold exceeded!" << std::endl;
632-
#endif // #ifdef DEBUGMATERIAL
633-
634601
// ------------------------------------------------- return-mapping
635602
// local Newton-Raphson
636603
// ------------------------------- initial guess for Dgamma (12.49)
@@ -669,10 +636,6 @@ void Mat::Damage::evaluate_simplified_lemaitre(const Core::LinAlg::Matrix<3, 3>*
669636
// sanity check: omega < 1.0e-20
670637
if (omega < omegamin)
671638
{
672-
#ifdef DEBUGMATERIAL
673-
std::cout << "Inadmissible value of integrity: omega = " << omega << " in ele " << eleGID
674-
<< "!\n Element has failed.\n";
675-
#endif // ifdef DEBUGMATERIAL
676639
omega = omegamin;
677640
failed = true;
678641
}
@@ -744,10 +707,6 @@ void Mat::Damage::evaluate_simplified_lemaitre(const Core::LinAlg::Matrix<3, 3>*
744707
// update failure flag;
745708
failedcurr_.at(gp) = failed;
746709

747-
#ifdef DEBUGMATERIAL
748-
std::cout << "end strain_p\n " << strain_p << std::endl;
749-
std::cout << "end strainplcurr_->at(gp)\n " << strainplcurr_->at(gp) << std::endl;
750-
#endif // ifdef DEBUGMATERIAL
751710

752711
} // damage evolution has to be considered, damage threshold exceeded
753712

@@ -803,15 +762,6 @@ void Mat::Damage::evaluate_simplified_lemaitre(const Core::LinAlg::Matrix<3, 3>*
803762
setup_cmat_elasto_plastic(*cmat, eleGID, Dgamma, G, bulk, p_tilde, q_tilde, energyrelrate, Ytan,
804763
sigma_y, Hiso, Nbar, gp, damevolution, active_plasticity);
805764

806-
#ifdef DEBUGMATERIAL
807-
std::cout << "Nach Setup Cep\n" << std::endl;
808-
std::cout << " Dgamma " << Dgamma << std::endl;
809-
std::cout << " G " << G << std::endl;
810-
std::cout << " q " << q << std::endl;
811-
std::cout << " flow vector " << Nbar << std::endl;
812-
std::cout << " active_plasticity " << active_plasticity << std::endl;
813-
std::cout << "--> cmat " << cmat << std::endl;
814-
#endif // #ifdef DEBUGMATERIAL
815765

816766
// ------------------------------- return plastic strains for post-processing
817767
params.set<Core::LinAlg::Matrix<Mat::NUM_STRESS_3D, 1>>("plglstrain", strainplcurr_.at(gp));
@@ -1147,24 +1097,6 @@ void Mat::Damage::evaluate_full_lemaitre(const Core::LinAlg::Matrix<3, 3>* defgr
11471097
eta_tilde(5) * eta_tilde(5);
11481098
double qbar_tilde = sqrt(3.0 * J2bar);
11491099

1150-
#ifdef DEBUGMATERIAL
1151-
if (gp == 0)
1152-
{
1153-
std::cout << ": devstress_tilde\n " << devstress_tilde << std::endl;
1154-
std::cout << ": devstrain\n " << devstrain << std::endl;
1155-
std::cout << ": beta\n " << beta << std::endl;
1156-
std::cout << ": eta_tilde\n " << eta_tilde << std::endl;
1157-
std::cout << "plastic load: strainbarplcurr_.at(gp)\n " << strainbarplcurr_.at(gp) << std::endl;
1158-
std::cout << "plastic load: strainbarpllast_.at(gp)\n " << strainbarpllast_.at(gp) << std::endl;
1159-
std::cout << "plastic load: strain_p\n " << strain_p << std::endl;
1160-
std::cout << "plastic load: strainplcurr_.at(gp)\n " << strainplcurr_.at(gp) << std::endl;
1161-
std::cout << "plastic load: strainpllast\n " << strainpllast_.at(gp) << std::endl;
1162-
std::cout << "elastic load: backstresscurr_.at(gp)\n " << backstresscurr_.at(gp) << std::endl;
1163-
std::cout << "elastic load: backstresslast_.at(gp)\n " << backstresslast_.at(gp) << std::endl;
1164-
std::cout << ": q_tilde\n " << q_tilde << std::endl;
1165-
std::cout << ": qbar_tilde\n " << qbar_tilde << std::endl;
1166-
}
1167-
#endif // DEBUGMATERIAL
11681100

11691101
// initialise final (damaged) deviatoric stresses
11701102
Core::LinAlg::Matrix<NUM_STRESS_3D, 1> devstress(Core::LinAlg::Initialization::zero);
@@ -1218,16 +1150,6 @@ void Mat::Damage::evaluate_full_lemaitre(const Core::LinAlg::Matrix<3, 3>* defgr
12181150
// with trial values: Phi_trial = qbar{~,trial} - sigma_y and Dgamma == 0
12191151
double Phi_trial = qbar_tilde - sigma_y;
12201152

1221-
#ifdef DEBUGMATERIAL
1222-
if (gp == 0)
1223-
{
1224-
std::cout << ": Phi_trial " << Phi_trial << std::endl;
1225-
std::cout << ": qbar_tilde " << qbar_tilde << std::endl;
1226-
std::cout << ": sigma_y " << sigma_y << std::endl;
1227-
std::cout << ": kappa " << kappa << std::endl;
1228-
std::cout << ": dkappa_dR " << dkappa_dR << std::endl;
1229-
}
1230-
#endif // DEBUGMATERIAL
12311153

12321154
// --------------------------------------------------------- initialise
12331155

@@ -1252,10 +1174,6 @@ void Mat::Damage::evaluate_full_lemaitre(const Core::LinAlg::Matrix<3, 3>* defgr
12521174
//---------------------------------------------------------------------------
12531175
if (Phi_trial > 1.0e-08 and !failed) // if (Phi_trial > 0.0)
12541176
{
1255-
#ifdef DEBUGMATERIAL
1256-
std::cout << "Damage has to be considered for current load step and ele = " << eleID
1257-
<< ", and gp = " << gp << " ! Threshold exceeded!" << std::endl;
1258-
#endif // #ifdef DEBUGMATERIAL
12591177
// deviatoric stress norm || eta^{~}_{n+1} ||
12601178
double eta_tildenorm = 0.0;
12611179
eta_tildenorm = sqrt(eta_tilde(0) * eta_tilde(0) + eta_tilde(1) * eta_tilde(1) +
@@ -1330,16 +1248,6 @@ void Mat::Damage::evaluate_full_lemaitre(const Core::LinAlg::Matrix<3, 3>* defgr
13301248
// c_D = (Y^trial_{n+1} / r)^s . c_astrain
13311249
double c_D = y * c_strainbar;
13321250

1333-
#ifdef DEBUGMATERIAL
1334-
if (gp == 0)
1335-
{
1336-
std::cout << ": Phi_trial " << Phi_trial << std::endl;
1337-
std::cout << ": qbar_tilde " << qbar_tilde << std::endl;
1338-
std::cout << ": Y " << Y << std::endl;
1339-
std::cout << ": y " << y << std::endl;
1340-
std::cout << ": c_D " << c_D << std::endl;
1341-
}
1342-
#endif // DEBUGMATERIAL
13431251

13441252
// ------------------------------------------------- return-mapping
13451253

@@ -1566,16 +1474,6 @@ void Mat::Damage::evaluate_full_lemaitre(const Core::LinAlg::Matrix<3, 3>* defgr
15661474
}
15671475
break;
15681476
}
1569-
#ifdef DEBUGMATERIAL
1570-
else if (gp == 0)
1571-
printf(
1572-
"Newton method converged after %i iterations; "
1573-
"norm_k_s = %-14.8E, "
1574-
"norm_k_Phi = %-14.8E, "
1575-
"norm_k_b = %-14.8E, "
1576-
"norm_k_D = %-14.8E \n",
1577-
itnum, norm_k_s_tilde, norm_Phi, norm_k_beta, norm_k_D);
1578-
#endif // #ifdef DEBUGMATERIAL
15791477

15801478
// --------------- else: load step NOT converged, calculate corrections
15811479

@@ -1777,19 +1675,6 @@ void Mat::Damage::evaluate_full_lemaitre(const Core::LinAlg::Matrix<3, 3>* defgr
17771675
// c_D = - k_D + y . c_strainbar + (Dgamma / omega) dy_ds_matrixcD
17781676
c_D = -k_D + y * c_strainbar + (Dgamma / omega) * dyds_matrixcD;
17791677

1780-
#ifdef DEBUGMATERIAL
1781-
if (gp == 0)
1782-
{
1783-
std::cout << "End local Newton damage = " << damage << std::endl;
1784-
std::cout << "End local Newton strainbar_p = " << strainbar_p << std::endl;
1785-
std::cout << "End local Newton Rplast = " << Rplast << std::endl;
1786-
1787-
std::cout << "am 1.GP: local Newton: Res " << Res << std::endl;
1788-
std::cout << "local Newton: ResTan " << ResTan << std::endl;
1789-
std::cout << "local Newton: Dgamma " << Dgamma << std::endl;
1790-
std::cout << "local Newton: sigma_y " << sigma_y << std::endl;
1791-
}
1792-
#endif // #ifdef DEBUGMATERIAL
17931678

17941679
} // end of local Newton iteration
17951680

@@ -1856,10 +1741,6 @@ void Mat::Damage::evaluate_full_lemaitre(const Core::LinAlg::Matrix<3, 3>* defgr
18561741

18571742
// update failed state
18581743
failedcurr_.at(gp) = failed;
1859-
#ifdef DEBUGMATERIAL
1860-
std::cout << "end strain_p\n " << strain_p << std::endl;
1861-
std::cout << "end strainplcurr_.at(gp)\n " << strainplcurr_.at(gp) << std::endl;
1862-
#endif // ifdef DEBUGMATERIAL
18631744

18641745
} // plastic corrector
18651746

@@ -1922,15 +1803,6 @@ void Mat::Damage::evaluate_full_lemaitre(const Core::LinAlg::Matrix<3, 3>* defgr
19221803
g, h_alg, G, Hiso, bulk, Hkin, Hkin_rec, Nbetaold, gp, qbar_tilde, y, dy_dsigma_tilde,
19231804
b_NbetaoldN);
19241805

1925-
#ifdef DEBUGMATERIAL
1926-
std::cout << "Nach Setup Cep\n" << std::endl;
1927-
std::cout << " Dgamma " << Dgamma << std::endl;
1928-
std::cout << " G " << G << std::endl;
1929-
std::cout << " q " << q << std::endl;
1930-
std::cout << " flow vector " << Nbar << std::endl;
1931-
std::cout << " active_plasticity " << active_plasticity << std::endl;
1932-
std::cout << "--> cmat " << cmat << std::endl;
1933-
#endif // #ifdef DEBUGMATERIAL
19341806

19351807
return;
19361808

@@ -2127,31 +1999,12 @@ void Mat::Damage::setup_cmat_elasto_plastic(Core::LinAlg::Matrix<NUM_STRESS_3D,
21271999

21282000
// complete material tangent C_ep available
21292001

2130-
#ifdef DEBUGMATERIAL
2131-
if (Dgamma != 0)
2132-
{
2133-
std::cout << "End SetupCmatElastPlast" << std::endl;
2134-
std::cout << "Cep\n"
2135-
<< " Dgamma " << Dgamma << std::endl;
2136-
std::cout << " G " << G << std::endl;
2137-
std::cout << " q " << q << std::endl;
2138-
std::cout << " Nbar " << Nbar << std::endl;
2139-
std::cout << " active_plasticity " << active_plasticity << std::endl;
2140-
std::cout << " epfac " << epfac << std::endl;
2141-
std::cout << " epfac1 " << epfac1 << std::endl;
2142-
std::cout << " cmat " << cmat << std::endl;
2143-
}
2144-
#endif // #ifdef DEBUGMATERIAL
21452002
} // (damevolution == false)
21462003

21472004
// material tangent differs for case damage or not
21482005
// if no damage: use standard tangent of purely plastic behaviour
21492006
else // (damevolution == true)
21502007
{
2151-
#ifdef DEBUGMATERIAL
2152-
if (gp == 0) std::cout << "damage evolution takes place in eleID = " << eleID << endl;
2153-
#endif // #ifdef DEBUGMATERIAL
2154-
21552008
// incremental constitutive function for the stress tensor
21562009
// consistent tangent operator
21572010
// C^{ep} := dsigma_n+1 / dstrain_n+1
@@ -2313,21 +2166,6 @@ void Mat::Damage::setup_cmat_elasto_plastic(Core::LinAlg::Matrix<NUM_STRESS_3D,
23132166
}
23142167
// complete material tangent C_ep available
23152168

2316-
#ifdef DEBUGMATERIAL
2317-
if (Dgamma != 0)
2318-
{
2319-
std::cout << "End SetupCmatElastPlast" << std::endl;
2320-
std::cout << "Cep\n"
2321-
<< " Dgamma " << Dgamma << std::endl;
2322-
std::cout << " G " << G << std::endl;
2323-
std::cout << " q_tilde " << q_tilde << std::endl;
2324-
std::cout << " Nbar " << Nbar << std::endl;
2325-
std::cout << " active_plasticity " << active_plasticity << std::endl;
2326-
std::cout << " epfac " << epfac << std::endl;
2327-
std::cout << " epfac1 " << epfac1 << std::endl;
2328-
std::cout << " cmat " << cmat << std::endl;
2329-
}
2330-
#endif // #ifdef DEBUGMATERIAL
23312169

23322170
} // damage evolves: (damevolution == true)
23332171

0 commit comments

Comments
 (0)