Skip to content

Commit

Permalink
Final cleanup and gold files update ref idaholab#184
Browse files Browse the repository at this point in the history
  • Loading branch information
@vprithiv
vprithiv committed Jul 3, 2024
1 parent 6586c6a commit fbb921c
Show file tree
Hide file tree
Showing 8 changed files with 226 additions and 318 deletions.
123 changes: 59 additions & 64 deletions doc/content/source/materials/DamagePlasticityStressUpdate.md
View file

Large diffs are not rendered by default.

53 changes: 0 additions & 53 deletions include/materials/DamagePlasticityStressUpdate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ class DamagePlasticityStressUpdate : public MultiParameterPlasticityStressUpdate
const Real _ac;
const Real _zt;
const Real _zc;
const Real _dPhit;
const Real _dPhic;
const Real _sqrtPhit_max;
const Real _sqrtPhic_max;
const Real _dt_bt;
const Real _dc_bc;

Expand Down Expand Up @@ -133,27 +129,6 @@ class DamagePlasticityStressUpdate : public MultiParameterPlasticityStressUpdate
const Real & exponent,
const Real & kappa) const;

// /**
// * Obtain the partial derivative of the undamaged tensile strength to the damage state
// * @param intnl (Array containing damage states in tension and compression, respectively)
// * @return value of dft (partial derivative of the tensile strength to the damage state)
// */
// Real dftbar(const std::vector<Real> & intnl) const;

// /**
// * Obtain the undamaged conpressive strength
// * @param intnl (Array containing damage states in tension and compression, respectively)
// * @return value of fc (compressive strength)
// */
// Real fcbar(const std::vector<Real> & intnl) const;

// /**
// * Obtain the partial derivative of the undamaged compressive strength to the damage state
// * @param intnl (Array containing damage states in tension and compression, respectively)
// * @return value of dfc
// */
// Real dfcbar(const std::vector<Real> & intnl) const;
// /**
// * Obtain the damaged tensile strength
// * @param intnl (Array containing damage states in tension and compression, respectively)
// * @return value of ft (tensile strength)
Expand All @@ -162,27 +137,6 @@ class DamagePlasticityStressUpdate : public MultiParameterPlasticityStressUpdate
const Real & a,
const Real & kappa) const;

// /**
// * Obtain the partial derivative of the damaged tensile strength to the damage state
// * @param intnl (Array containing damage states in tension and compression, respectively)
// * @return value of dft (partial derivative of the tensile strength to the damage state)
// */
// Real dft(const std::vector<Real> & intnl) const;

// /**
// * Obtain the damaged compressive strength
// * @param intnl (Array containing damage states in tension and compression, respectively)
// * @return value of fc (compressive strength)
// */
// Real fc(const std::vector<Real> & intnl) const;

// /**
// * Obtain the partial derivative of the damaged compressive strength to the damage state
// * @param intnl (Array containing damage states in tension and compression, respectively)
// * @return value of dfc
// */
// Real dfc(const std::vector<Real> & intnl) const;

/**
* Obtain the partial derivative of the undamaged strength to the damage state
* @param intnl (Array containing damage states in tension and compression, respectively)
Expand All @@ -200,13 +154,6 @@ class DamagePlasticityStressUpdate : public MultiParameterPlasticityStressUpdate
*/
Real beta(const std::vector<Real> & intnl) const;

/**
* dbeta_dkappa is a derivative of beta wrt. kappa (plastic damage variable)
* @param intnl (Array containing damage states in tension and compression, respectively)
* @return value of dbeta_dkappa
*/
Real dbeta_dkappa(const std::vector<Real> & intnl) const;

/**
* dbeta0 is a derivative of beta wrt. tensile strength (ft)
* @param intnl (Array containing damage states in tension and compression, respectively)
Expand Down
9 changes: 0 additions & 9 deletions src/materials/DamagePlasticityStressUpdate.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,6 @@ DamagePlasticityStressUpdate::initQpStatefulProperties()
used, the following commented lines show several different options. Some other options are
still being considered. In this code, we define the element length as the cube root of the
element volume */

// if (_current_elem->n_vertices() < 3)
// _ele_len[_qp] = _current_elem->length(0, 1);
// else if (_current_elem->n_vertices() < 5)
// _ele_len[_qp] = (_current_elem->length(0, 1) + _current_elem->length(1, 2)) / 2.;
// else
// _ele_len[_qp] =
// (_current_elem->length(0, 1) + _current_elem->length(1, 2) + _current_elem->length(0, 4))
// / 3.;
_ele_len[_qp] = std::cbrt(_current_elem->volume());

_gt[_qp] = _FEt / _ele_len[_qp];
Expand Down
90 changes: 45 additions & 45 deletions test/tests/damage_plasticity_model/gold/dilatancy_out.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,48 +5,48 @@ time,displacement_x,e_xx,ep_xx,react_x,s_xx,volumetric_strain
30,-0.0003,-0.0003,0,9.5100000000004,-9.5100000000004,-0.00019198156917977
40,-0.0004,-0.0004,0,12.68,-12.68,-0.00025596723479604
50,-0.0005,-0.0005,0,15.85,-15.85,-0.00031994880546093
60,-0.0006,-0.0006,-1.1665738232695e-05,18.650196118397,-18.650196118397,-0.00035614282315743
70,-0.0007,-0.0007,-6.1828854256181e-05,20.158118921705,-20.158118921705,-0.00030064680681963
80,-0.0008,-0.0008,-0.00011331162648892,21.334432816519,-21.334432816519,-0.00024200461336688
90,-0.0009,-0.0009,-0.00016614913708567,22.416123211693,-22.416123211693,-0.00018013186395605
100,-0.001,-0.001,-0.00022037903585689,23.403594041213,-23.403594041213,-0.00011493827993692
110,-0.0011,-0.0011,-0.00027604130414689,24.29730204034,-24.29730204034,-4.6327966773618e-05
120,-0.0012,-0.0012,-0.00033317799381014,25.097776879489,-25.097776879489,2.5799966407725e-05
130,-0.0013,-0.0013,-0.00039183297149043,25.80564063209,-25.80564063209,0.00010155080142793
140,-0.0014,-0.0014,-0.00045205165978624,26.421626612503,-26.421626612503,0.00018103359893895
150,-0.0015,-0.0015,-0.00051388076630347,26.946597815556,-26.946597815556,0.00026436055778145
160,-0.0016,-0.0016,-0.00057736797596275,27.381566352239,-27.381566352239,0.0003516465822615
170,-0.0017,-0.0017,-0.0006425616575271,27.727706334389,-27.727706334389,0.00044300735151637
180,-0.0018,-0.0018,-0.00070951052885508,27.986379747075,-27.986379747075,0.00053856047597312
190,-0.0019,-0.0019,-0.00077826318801117,28.159148034979,-28.159148034979,0.00063842301136541
200,-0.002,-0.002,-0.00084886769514124,28.247791272165,-28.247791272165,0.00074271083270294
210,-0.0021,-0.0021,-0.00092137106591391,28.254324170102,-28.254324170102,0.00085153743048116
220,-0.0022,-0.0022,-0.00099581870620686,28.181011331419,-28.181011331419,0.00096501256609294
230,-0.0023,-0.0023,-0.0010722537858888,28.030380980245,-28.030380980245,0.0010832407810357
240,-0.0024,-0.0024,-0.0011507165516958,27.805236645313,-27.805236645313,0.0012063197596193
250,-0.0025,-0.0025,-0.0012312435818667,27.508666191805,-27.508666191805,0.0013343385512292
260,-0.0026,-0.0026,-0.0013138669884325,27.144047528988,-27.144047528988,0.0014673756658661
270,-0.0027,-0.0027,-0.0013986135768529,26.715050269669,-26.715050269669,0.0016054970657726
280,-0.0028,-0.0028,-0.0014855039769868,26.225632593792,-26.225632593792,0.0017487540861813
290,-0.0029,-0.0029,-0.0015745517640636,25.680032580799,-25.680032580799,0.0018971813294333
300,-0.003,-0.003,-0.0016657625931362,25.082753334829,-25.082753334829,0.0020507945882438
310,-0.0031,-0.0031,-0.0017591333751467,24.438541341851,-24.438541341851,0.0022095888650772
320,-0.0032,-0.0032,-0.0018546515267932,23.752357675995,-23.752357675995,0.0023735365643793
330,-0.0033,-0.0033,-0.0019522943910391,23.029341963938,-23.029341963938,0.0025425862783206
340,-0.0034,-0.0034,-0.0020520284412335,22.2747677891,-22.2747677891,0.0027166599366719
350,-0.0035,-0.0035,-0.0021538095487603,21.493998405543,-21.493998405543,0.0028956551718606
360,-0.0036,-0.0036,-0.0022575823253257,20.692422407394,-20.692422407394,0.0030794421478335
370,-0.0037,-0.0037,-0.0023632805093535,19.875400849711,-19.875400849711,0.003267865088308
380,-0.0038,-0.0038,-0.0024708273331579,19.048202325047,-19.048202325047,0.0034607430605169
390,-0.0039,-0.0039,-0.0025801361706607,18.215940108345,-18.215940108345,0.0036578714780258
400,-0.004,-0.004,-0.0026911114471323,17.383510747769,-17.383510747769,0.0038590242449542
410,-0.0041,-0.0041,-0.0028036497814008,16.555536432998,-16.555536432998,0.0040639564579886
420,-0.0042,-0.0042,-0.0029176413247561,15.736313397885,-15.736313397885,0.0042724075817051
430,-0.0043,-0.0043,-0.0030329712499113,14.929768288804,-14.929768288804,0.0044841049865935
440,-0.0044,-0.0044,-0.00314952133541,14.139424020279,-14.139424020279,0.0046987677201216
450,-0.0045,-0.0045,-0.00326717163969,13.368375742274,-13.368375742274,0.0049161108236475
460,-0.0046,-0.0046,-0.0033858019253512,12.61927840845,-12.61927840845,0.0051358474282963
470,-0.0047,-0.0047,-0.0035052933649444,11.894346691443,-11.894346691443,0.0053576947783152
480,-0.0048,-0.0048,-0.0036255298401004,11.195360464619,-11.195360464619,0.0055813760528074
490,-0.0049,-0.0049,-0.0037463991756173,10.523683243842,-10.523683243842,0.0058066236436187
500,-0.005,-0.005,-0.0038677940117025,9.8802875310769,-9.8802875310769,0.0060331809640377
60,-0.0006,-0.0006,-9.1669120668388e-06,18.729408887481,-18.729408887481,-0.00036209417652089
70,-0.0007,-0.0007,-5.1100405080019e-05,20.480388180155,-20.480388180155,-0.00032619960446634
80,-0.0008,-0.0008,-9.4379488537372e-05,21.842176200533,-21.842176200533,-0.00028709878756816
90,-0.0009,-0.0009,-0.00013911416050504,23.082819869485,-23.082819869485,-0.00024452934243235
100,-0.001,-0.001,-0.00018541745675529,24.199780448795,-24.199780448795,-0.00019822157075589
110,-0.0011,-0.0011,-0.00023340663909691,25.190720917952,-25.190720917952,-0.00014789561727513
120,-0.0012,-0.0012,-0.00028320471414772,26.053504111012,-26.053504111012,-9.3257838422622e-05
130,-0.0013,-0.0013,-0.00033494147858477,26.786206261363,-26.786206261363,-3.3998296411264e-05
140,-0.0014,-0.0014,-0.00038875445895819,27.387143977919,-27.387143977919,3.021149822291e-05
150,-0.0015,-0.0015,-0.00044478885987997,27.854934856356,-27.854934856356,9.9718484357636e-05
160,-0.0016,-0.0016,-0.00050319898547507,28.188536109209,-28.188536109209,0.00017489146115257
170,-0.0017,-0.0017,-0.00056414738965333,28.387329985863,-28.387329985863,0.00025611909080281
180,-0.0018,-0.0018,-0.00062780478900611,28.451219898281,-28.451219898281,0.00034380972109638
190,-0.0019,-0.0019,-0.00069434920301473,28.380736556975,-28.380736556975,0.00043838936953322
200,-0.002,-0.002,-0.00076396445061699,28.177165326922,-28.177165326922,0.00054029817543122
210,-0.0021,-0.0021,-0.00083683783532906,27.842690489329,-27.842690489329,0.0006499849189312
220,-0.0022,-0.0022,-0.00091315682537807,27.380553973888,-27.380553973888,0.00076789914334285
230,-0.0023,-0.0023,-0.00099310453316238,26.795223576689,-26.795223576689,0.00089448041134865
240,-0.0024,-0.0024,-0.0010768538250872,26.092562056488,-26.092562056488,0.0010301442880194
250,-0.0025,-0.0025,-0.0011645599632525,25.279983939445,-25.279983939445,0.0011752648101582
260,-0.0026,-0.0026,-0.0012563518152646,24.366581592785,-24.366581592785,0.0013301535216756
270,-0.0027,-0.0027,-0.0013523217001089,23.363199984937,-23.363199984937,0.001495035229127
280,-0.0028,-0.0028,-0.001452515656565,22.282412851501,-22.282412851501,0.0016700247317505
290,-0.0029,-0.0029,-0.0015569213245906,21.138421960984,-21.138421960984,0.0018550978156373
300,-0.003,-0.003,-0.0016654606744881,19.946792804303,-19.946792804303,0.0020500737708264
310,-0.0031,-0.0031,-0.0017779831789587,18.724049172024,-18.724049172024,0.0022545989241167
320,-0.0032,-0.0032,-0.0018942641465703,17.487143393173,-17.487143393173,0.0024681424560244
330,-0.0033,-0.0033,-0.0020140082947401,16.252815970977,-16.252815970977,0.0026900047066953
340,-0.0034,-0.0034,-0.0021368589938802,15.036913337511,-15.036913337511,0.0029193390247211
350,-0.0035,-0.0035,-0.0022624126097281,13.853738724886,-13.853738724886,0.0031551858172942
360,-0.0036,-0.0036,-0.0023902364343348,12.715514313872,-12.715514313872,0.003396515221098
370,-0.0037,-0.0037,-0.0025198880640689,11.632017261926,-11.632017261926,0.0036422732956947
380,-0.0038,-0.0038,-0.0026509339358262,10.610422180391,-10.610422180391,0.0038914262781964
390,-0.0039,-0.0039,-0.002782965089357,9.6553470172073,-9.6553470172072,0.0041429982781065
400,-0.004,-0.004,-0.0029156089333603,8.7690683071801,-8.7690683071801,0.00439609947789
410,-0.0041,-0.0041,-0.0030485366039898,7.9518528448446,-7.9518528448446,0.0046499438372609
420,-0.0042,-0.0042,-0.0031814662031486,7.2023481521898,-7.2023481521898,0.0049038569688302
430,-0.0043,-0.0043,-0.0033141626550219,6.5179810814301,-6.5179810814301,0.0051572759334462
440,-0.0044,-0.0044,-0.003446435109213,5.8953274140784,-5.8953274140784,0.0054097431621782
450,-0.0045,-0.0045,-0.0035781328009164,5.3304303250977,-5.3304303250977,0.0056608966738658
460,-0.0046,-0.0046,-0.0037091401361174,4.8190585889557,-4.8190585889557,0.0059104584208118
470,-0.0047,-0.0047,-0.003839371578319,4.356904820951,-4.356904820951,0.0061582221404615
480,-0.0048,-0.0048,-0.0039687667248337,3.9397297528545,-3.9397297528545,0.0064040416422462
490,-0.0049,-0.0049,-0.0040972858027194,3.5634612215178,-3.5634612215178,0.0066478200821194
500,-0.005,-0.005,-0.0042249056959746,3.2242571376929,-3.2242571376929,0.0068895004943903
56 changes: 28 additions & 28 deletions test/tests/damage_plasticity_model/gold/shear_test_out.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@ time,e_xy,ep_xy,s_xy
0,0,0,0
5,7.8182642983415e-06,0,0.66498115657902
10,1.5636528591598e-05,0,1.3299623130426
15,2.3452074951896e-05,4.8983821438774e-07,1.8597699615448
20,3.1171096317802e-05,2.3402390354366e-06,1.9957411207585
25,3.8953715744496e-05,4.3144052368041e-06,2.1193699480148
30,4.6800867741694e-05,6.3955307618849e-06,2.2428277546278
35,5.5655695121865e-05,1.2095885208344e-05,2.2884800606222
40,6.4887705610769e-05,1.8474922611195e-05,2.3236101673253
45,7.440502468223e-05,2.5198091613366e-05,2.356566968123
50,8.4187054613461e-05,3.2241992754993e-05,2.3882556131892
55,9.401159776781e-05,3.9971695561668e-05,2.4101616596486
60,0.00010338033680737,4.9085263419077e-05,2.4042945560395
65,0.00011281439236663,5.8362558366631e-05,2.3950062148185
70,0.00012232009850832,6.7761648832007e-05,2.38432596789
75,0.00013189086765114,7.7262519498049e-05,2.3725090336921
80,0.00014152159167585,8.6850076139939e-05,2.3597322824429
85,0.00015120842100567,9.6513149578552e-05,2.3461300399041
90,0.00016092874359371,0.00010623041065843,2.3330556963112
95,0.00017068567253073,0.00011599606146946,2.3198767221114
100,0.00018047911045853,0.00012580544978692,2.3064133062834
105,0.00019030664536916,0.00013565398059374,2.2927233230542
110,0.00020016527362133,0.00014553747877069,2.2789204272634
115,0.00021003576134283,0.00015544217447879,2.2662878314405
120,0.00021992865864995,0.00016536932057557,2.2537113938821
125,0.00022984240675046,0.00017531700685573,2.2411960375094
130,0.00023977530424017,0.00018528382299711,2.2287385663326
135,0.00024972616547397,0.00019526828146045,2.2163479234135
140,0.0002596939415043,0.00020526911796477,2.2040309148733
145,0.00026967769966424,0.00021528525206936,2.1917922967591
150,0.00027967660824062,0.00022531575412505,2.1796352296801
15,2.3452942579244e-05,4.909775947702e-07,1.85972220034
20,3.1170444537696e-05,2.3446630533557e-06,1.9957658984007
25,3.8937175168089e-05,4.3177448402497e-06,2.1201180140516
30,4.6761633253159e-05,6.3934989443464e-06,2.243936989742
35,5.5582665760452e-05,1.2072106128636e-05,2.2898334885283
40,6.4772321822859e-05,1.8421679998463e-05,2.324907142761
45,7.4238096905006e-05,2.5103788886935e-05,2.3575535955192
50,8.3958852172671e-05,3.2094434251767e-05,2.3887363856108
55,9.3705845077172e-05,3.9767139045216e-05,2.4097318565037
60,0.00010298810192046,4.8798317682579e-05,2.4030047870696
65,0.00011232658518956,5.7977735123915e-05,2.3929423386959
70,0.00012172662902616,6.726665258888e-05,2.3814088104059
75,0.00013118235998486,7.6645852258031e-05,2.3686419411157
80,0.00014068949359589,8.6101114941365e-05,2.3548051286361
85,0.00015024516716526,9.5622313507776e-05,2.3400146078255
90,0.00015983110415471,0.00010519139385668,2.3254071517662
95,0.00016944979956828,0.00011480314553222,2.3105040499412
100,0.00017910192938049,0.00012445399327563,2.2951463105256
105,0.00018878612455347,0.00013414054703901,2.2793882927109
110,0.00019850137767844,0.00014386047434706,2.2632728477185
115,0.00020823526544992,0.00015360354219724,2.2478069011565
120,0.00021799171392252,0.0001633701666081,2.2323898751356
125,0.00022777173485429,0.00017316021549842,2.2168522134588
130,0.00023757484926882,0.00018297296864154,2.2012137034622
135,0.00024740068262291,0.00019280793054675,2.1854926435378
140,0.00025724894758144,0.00020266477573483,2.16970505669
145,0.00026711942680453,0.00021254330678078,2.1538650970437
150,0.00027701195853931,0.00022244342128784,2.1379853693726
Loading

0 comments on commit fbb921c

Please sign in to comment.