From ac822899c7a77fb87336412eb90bcbd1211a915f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Thu, 11 Jan 2024 20:25:47 +0100 Subject: [PATCH 01/19] Debug jenkins failure in opm-simulators --- opm/models/discretization/common/fvbaseelementcontext.hh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 55e1cdc51..ce9ce18cc 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -154,7 +154,10 @@ public: // update the finite element geometry stencil_.updatePrimaryTopology(elem); - + std::cout << "resizing dofVars_: " + << "current size: " << dofVars_.size() + << "new size: numPrimaryDof: " << stencil_.numPrimaryDof() + << std::endl; dofVars_.resize(stencil_.numPrimaryDof()); } From 686545cb1a9df9dccbed9c70c615defcab4a6f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Thu, 11 Jan 2024 21:55:18 +0100 Subject: [PATCH 02/19] Decrease output size --- opm/models/discretization/common/fvbaseelementcontext.hh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index ce9ce18cc..6ab989390 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -154,9 +154,8 @@ public: // update the finite element geometry stencil_.updatePrimaryTopology(elem); - std::cout << "resizing dofVars_: " - << "current size: " << dofVars_.size() - << "new size: numPrimaryDof: " << stencil_.numPrimaryDof() + std::cout << dofVars_.size() + << "-" << stencil_.numPrimaryDof() << std::endl; dofVars_.resize(stencil_.numPrimaryDof()); } From 9ef9034f733c68c933db4031bc6fd3e3734ed01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 12 Jan 2024 08:42:45 +0100 Subject: [PATCH 03/19] Removed debugging output --- opm/models/discretization/common/fvbaseelementcontext.hh | 3 --- 1 file changed, 3 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 6ab989390..65ceca6e9 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -154,9 +154,6 @@ public: // update the finite element geometry stencil_.updatePrimaryTopology(elem); - std::cout << dofVars_.size() - << "-" << stencil_.numPrimaryDof() - << std::endl; dofVars_.resize(stencil_.numPrimaryDof()); } From 09f56a1a662315cfe8478b601aa0acd38528a464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 12 Jan 2024 10:40:09 +0100 Subject: [PATCH 04/19] Added opm critical pragma --- opm/models/discretization/common/fvbaseelementcontext.hh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 65ceca6e9..725b4d4e7 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -154,6 +154,11 @@ public: // update the finite element geometry stencil_.updatePrimaryTopology(elem); + #pragma omp critical + { + std::cout << dofVars_.size() + << "-" << stencil_.numPrimaryDof() + } dofVars_.resize(stencil_.numPrimaryDof()); } From 99e1525fd860aeed3bca1d0d20d88b4b7973a4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 12 Jan 2024 10:55:44 +0100 Subject: [PATCH 05/19] Fixed build failure --- opm/models/discretization/common/fvbaseelementcontext.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 725b4d4e7..7518421cf 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -157,7 +157,7 @@ public: #pragma omp critical { std::cout << dofVars_.size() - << "-" << stencil_.numPrimaryDof() + << "-" << stencil_.numPrimaryDof(); } dofVars_.resize(stencil_.numPrimaryDof()); } From b9aab55099cbca6ef09bfb31edc455b396692d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 12 Jan 2024 11:40:30 +0100 Subject: [PATCH 06/19] Added a newline --- opm/models/discretization/common/fvbaseelementcontext.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 7518421cf..eba023eb1 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -157,7 +157,8 @@ public: #pragma omp critical { std::cout << dofVars_.size() - << "-" << stencil_.numPrimaryDof(); + << "-" << stencil_.numPrimaryDof() + << std::endl; } dofVars_.resize(stencil_.numPrimaryDof()); } From 3a9c4301c16746d28c753b709aa9d7f0c7b1e27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 12 Jan 2024 15:28:57 +0100 Subject: [PATCH 07/19] Add one more line of output --- opm/models/discretization/common/fvbaseelementcontext.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index eba023eb1..374091215 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -153,8 +153,9 @@ public: elemPtr_ = &elem; // update the finite element geometry - stencil_.updatePrimaryTopology(elem); #pragma omp critical + std::cout << "u" << std::endl; + stencil_.updatePrimaryTopology(elem); { std::cout << dofVars_.size() << "-" << stencil_.numPrimaryDof() From 22b542f3c88c0f9fde9a573df98ec7d7bad5d90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 12 Jan 2024 18:24:35 +0100 Subject: [PATCH 08/19] Added more output --- .../discretization/common/fvbaseelementcontext.hh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 374091215..13b51d9ca 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -154,14 +154,15 @@ public: // update the finite element geometry #pragma omp critical - std::cout << "u" << std::endl; - stencil_.updatePrimaryTopology(elem); { - std::cout << dofVars_.size() - << "-" << stencil_.numPrimaryDof() + std::cout << "u" << std::endl; + stencil_.updatePrimaryTopology(elem); + auto numDof = stencil_.numPrimaryDof(); + std::cout << dofVars_.size() + << "-" << numDof << std::endl; - } - dofVars_.resize(stencil_.numPrimaryDof()); + dofVars_.resize(numDof); + std::cout << "x" << std::endl; } /*! From 616298f879c48300b7a873c0cdbd5d9e6770d5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 12 Jan 2024 20:42:49 +0100 Subject: [PATCH 09/19] Removed lines --- opm/models/discretization/common/fvbaseelementcontext.hh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 13b51d9ca..b53d70e45 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -157,11 +157,7 @@ public: { std::cout << "u" << std::endl; stencil_.updatePrimaryTopology(elem); - auto numDof = stencil_.numPrimaryDof(); - std::cout << dofVars_.size() - << "-" << numDof - << std::endl; - dofVars_.resize(numDof); + dofVars_.resize(stencil_.numPrimaryDof()); std::cout << "x" << std::endl; } From 2d8744663f95105bd3064b5c55f48867fed323de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 12 Jan 2024 21:44:48 +0100 Subject: [PATCH 10/19] Restructure --- opm/models/discretization/common/fvbaseelementcontext.hh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index b53d70e45..823f29528 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -156,9 +156,13 @@ public: #pragma omp critical { std::cout << "u" << std::endl; - stencil_.updatePrimaryTopology(elem); - dofVars_.resize(stencil_.numPrimaryDof()); + } + stencil_.updatePrimaryTopology(elem); + dofVars_.resize(stencil_.numPrimaryDof()); + #pragma omp critical + { std::cout << "x" << std::endl; + } } /*! From 13eb7186129ef3c54930ffed3f96c7ba838843f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Sat, 13 Jan 2024 12:38:26 +0100 Subject: [PATCH 11/19] Revert to original version --- opm/models/discretization/common/fvbaseelementcontext.hh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 823f29528..55e1cdc51 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -153,16 +153,9 @@ public: elemPtr_ = &elem; // update the finite element geometry - #pragma omp critical - { - std::cout << "u" << std::endl; - } stencil_.updatePrimaryTopology(elem); + dofVars_.resize(stencil_.numPrimaryDof()); - #pragma omp critical - { - std::cout << "x" << std::endl; - } } /*! From e7572c4d8d9263ca93061acec8e409444919b5ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Sat, 13 Jan 2024 18:13:11 +0100 Subject: [PATCH 12/19] Changed back to previous version --- .../discretization/common/fvbaseelementcontext.hh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 55e1cdc51..e0f70a032 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -153,9 +153,17 @@ public: elemPtr_ = &elem; // update the finite element geometry - stencil_.updatePrimaryTopology(elem); - - dofVars_.resize(stencil_.numPrimaryDof()); + #pragma omp critical + { + std::cout << "u" << std::endl; + stencil_.updatePrimaryTopology(elem); + auto numDof = stencil_.numPrimaryDof(); + std::cout << dofVars_.size() + << "-" << numDof + << std::endl; + dofVars_.resize(numDof); + std::cout << "x" << std::endl; + } } /*! From c641648a55de059891ff2e5a10bf813b4fc29347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 19 Jan 2024 11:17:52 +0100 Subject: [PATCH 13/19] Resize dofVars_ at construction --- opm/models/discretization/common/fvbaseelementcontext.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index e0f70a032..b0331498d 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -98,6 +98,7 @@ public: enableStorageCache_ = EWOMS_GET_PARAM(TypeTag, bool, EnableStorageCache); stashedDofIdx_ = -1; focusDofIdx_ = -1; + dofVars_.resize(1); } static void *operator new(size_t size) From 9feac72cb4f430e05f3cf6fb48d2356271c2c494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Sun, 28 Jan 2024 23:24:38 +0100 Subject: [PATCH 14/19] Check environment variable --- .../common/fvbaseelementcontext.hh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index b0331498d..a367c68af 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -36,6 +36,7 @@ #include #include +#include namespace Opm { @@ -98,7 +99,6 @@ public: enableStorageCache_ = EWOMS_GET_PARAM(TypeTag, bool, EnableStorageCache); stashedDofIdx_ = -1; focusDofIdx_ = -1; - dofVars_.resize(1); } static void *operator new(size_t size) @@ -153,16 +153,20 @@ public: // remember the current element elemPtr_ = &elem; - // update the finite element geometry - #pragma omp critical - { + const char* opm_debug = std::getenv("OPM_DEBUG"); + const bool debug = opm_debug != NULL && std::string(opm_debug) == "1"; + if (debug) { std::cout << "u" << std::endl; - stencil_.updatePrimaryTopology(elem); - auto numDof = stencil_.numPrimaryDof(); + } + stencil_.updatePrimaryTopology(elem); + auto numDof = stencil_.numPrimaryDof(); + if (debug) { std::cout << dofVars_.size() << "-" << numDof << std::endl; - dofVars_.resize(numDof); + } + dofVars_.resize(numDof); + if (debug) { std::cout << "x" << std::endl; } } From 0cb70a674be5a432a57f01542605bd0070e0d040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 2 Feb 2024 00:13:19 +0100 Subject: [PATCH 15/19] Add more output --- .../discretization/common/fvbaseelementcontext.hh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index a367c68af..8386d8cff 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -221,7 +221,14 @@ public: * \param timeIdx The index of the solution vector used by the time discretization. */ void updatePrimaryIntensiveQuantities(unsigned timeIdx) - { updateIntensiveQuantities_(timeIdx, numPrimaryDof(timeIdx)); } + { + const char* opm_debug = std::getenv("OPM_DEBUG"); + const bool debug = opm_debug != NULL && std::string(opm_debug) == "1"; + if (debug) { + std::cout << "a" << std::endl; + } + updateIntensiveQuantities_(timeIdx, numPrimaryDof(timeIdx)); + } /*! * \brief Compute the intensive quantities of a single sub-control volume of the @@ -558,6 +565,11 @@ protected: */ void updateIntensiveQuantities_(unsigned timeIdx, size_t numDof) { + const char* opm_debug = std::getenv("OPM_DEBUG"); + const bool debug = opm_debug != NULL && std::string(opm_debug) == "1"; + if (debug) { + std::cout << "b" << std::endl; + } // update the intensive quantities for the whole history const SolutionVector& globalSol = model().solution(timeIdx); From 4628931493a9dbb755fe800b0b7cbb12d387698c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Sat, 3 Feb 2024 21:47:06 +0100 Subject: [PATCH 16/19] Resize dofVars_ at contruction --- opm/models/discretization/common/fvbaseelementcontext.hh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index 8386d8cff..cf087efc9 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -99,6 +99,12 @@ public: enableStorageCache_ = EWOMS_GET_PARAM(TypeTag, bool, EnableStorageCache); stashedDofIdx_ = -1; focusDofIdx_ = -1; + const char* opm_debug = std::getenv("OPM_DEBUG"); + const bool debug = opm_debug != NULL && std::string(opm_debug) == "1"; + if (debug) { + std::cout << "rd" << std::endl; + dofVars_.resize(1); + } } static void *operator new(size_t size) From 2bb0cf6f2bf9989198da6211046229bce9645916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Sun, 4 Feb 2024 23:03:52 +0100 Subject: [PATCH 17/19] Add more debug output --- .../discretization/common/fvbaseelementcontext.hh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index cf087efc9..bb8c6ca5a 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -462,7 +462,16 @@ public: IntensiveQuantities& intensiveQuantities(unsigned dofIdx, unsigned timeIdx) { assert(dofIdx < numDof(timeIdx)); - return dofVars_[dofIdx].intensiveQuantities[timeIdx]; + const char* opm_debug = std::getenv("OPM_DEBUG"); + const bool debug = opm_debug != NULL && std::string(opm_debug) == "1"; + if (debug) { + std::cout << "iq" << std::endl; + } + auto iq = dofVars_[dofIdx].intensiveQuantities[timeIdx]; + if (debug) { + std::cout << "iq2" << std::endl; + } + return iq; } /*! From 0590c617958431f9246bc34a14c8961f5e0c5213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Wed, 21 Feb 2024 11:44:05 +0100 Subject: [PATCH 18/19] Removed debug code --- .../discretization/common/fvbaseelementcontext.hh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index bb8c6ca5a..cf556587d 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -467,11 +467,12 @@ public: if (debug) { std::cout << "iq" << std::endl; } - auto iq = dofVars_[dofIdx].intensiveQuantities[timeIdx]; - if (debug) { - std::cout << "iq2" << std::endl; - } - return iq; + //auto iq = dofVars_[dofIdx].intensiveQuantities[timeIdx]; + //if (debug) { + // std::cout << "iq2" << std::endl; + //} + //return iq; + return dofVars_[dofIdx].intensiveQuantities[timeIdx]; } /*! From 71d06b2559a900802e3a808473a643b8d0ce114d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Wed, 21 Feb 2024 16:25:04 +0100 Subject: [PATCH 19/19] Added some more debug output --- opm/models/discretization/ecfv/ecfvstencil.hh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/opm/models/discretization/ecfv/ecfvstencil.hh b/opm/models/discretization/ecfv/ecfvstencil.hh index a83cfd9e3..a4958ee98 100644 --- a/opm/models/discretization/ecfv/ecfvstencil.hh +++ b/opm/models/discretization/ecfv/ecfvstencil.hh @@ -41,6 +41,7 @@ #include #include +#include namespace Opm { /*! @@ -293,10 +294,24 @@ public: void updatePrimaryTopology(const Element& element) { + const char* opm_debug = std::getenv("OPM_DEBUG"); + const bool debug = opm_debug != NULL && std::string(opm_debug) == "1"; + if (debug) { + std::cout << "upt1" << std::endl; + } // add the "center" element of the stencil subControlVolumes_.clear(); + if (debug) { + std::cout << "upt2" << std::endl; + } subControlVolumes_.emplace_back(/*SubControlVolume(*/element/*)*/); + if (debug) { + std::cout << "upt3" << std::endl; + } elements_.clear(); + if (debug) { + std::cout << "upt4" << std::endl; + } elements_.emplace_back(element); }