From 40de927ad3249b58edf87f75348577f21dc20899 Mon Sep 17 00:00:00 2001 From: Mark Messner Date: Fri, 18 Nov 2022 08:23:49 -0600 Subject: [PATCH] Fixes memory leak in CIVET valgrind tests This fixes the memory leak in NEML causing these errors and corrects the original NEML driver to reflect the new API names for internal variables. closes #310 --- contrib/neml | 2 +- src/materials/NEMLStressBase.C | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/neml b/contrib/neml index 3e926c42..8bad63c6 160000 --- a/contrib/neml +++ b/contrib/neml @@ -1 +1 @@ -Subproject commit 3e926c422d9d5e457878e082b31bb7d6ac584eee +Subproject commit 8bad63c60026e73417f9ddc44b3ea4802c951c93 diff --git a/src/materials/NEMLStressBase.C b/src/materials/NEMLStressBase.C index c570404e..1a3f721c 100644 --- a/src/materials/NEMLStressBase.C +++ b/src/materials/NEMLStressBase.C @@ -88,10 +88,10 @@ NEMLStressBase::computeQpStress() double T_np1 = _temperature[_qp]; double T_n = _temperature_old[_qp]; - mooseAssert(_model->nhist() == _hist[_qp].size(), "History data storage size mismatch"); - double * const h_np1 = (_model->nhist() > 0 ? _hist[_qp].data() : nullptr); - mooseAssert(_model->nhist() == _hist_old[_qp].size(), "History data storage size mismatch"); - const double * const h_n = (_model->nhist() > 0 ? _hist_old[_qp].data() : nullptr); + mooseAssert(_model->nstore() == _hist[_qp].size(), "History data storage size mismatch"); + double * const h_np1 = (_model->nstore() > 0 ? _hist[_qp].data() : nullptr); + mooseAssert(_model->nstore() == _hist_old[_qp].size(), "History data storage size mismatch"); + const double * const h_n = (_model->nstore() > 0 ? _hist_old[_qp].data() : nullptr); double A_np1[36]; @@ -198,9 +198,9 @@ NEMLStressBase::initQpStatefulProperties() ComputeStressBase::initQpStatefulProperties(); // Figure out initial history - _hist[_qp].resize(_model->nhist()); + _hist[_qp].resize(_model->nstore()); - if (_model->nhist() > 0) + if (_model->nstore() > 0) { try {