From 652a5a4646fc71990abc2b33de33592f325524ae Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 14 Feb 2025 11:11:49 +0100
Subject: [PATCH] GenericOutputBlackoilModule: check schedule directly for
 vappars

avoids a bool param in doAllocBuffers
---
 opm/simulators/flow/GenericOutputBlackoilModule.cpp | 3 ++-
 opm/simulators/flow/GenericOutputBlackoilModule.hpp | 1 -
 opm/simulators/flow/OutputBlackoilModule.hpp        | 1 -
 opm/simulators/flow/OutputCompositionalModule.hpp   | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/opm/simulators/flow/GenericOutputBlackoilModule.cpp b/opm/simulators/flow/GenericOutputBlackoilModule.cpp
index 07b20ca51..96e0d20f8 100644
--- a/opm/simulators/flow/GenericOutputBlackoilModule.cpp
+++ b/opm/simulators/flow/GenericOutputBlackoilModule.cpp
@@ -752,7 +752,6 @@ doAllocBuffers(const unsigned bufferSize,
                const bool     substep,
                const bool     log,
                const bool     isRestart,
-               const bool     vapparsActive,
                const bool     enablePCHysteresis,
                const bool     enableNonWettingHysteresis,
                const bool     enableWettingHysteresis,
@@ -953,6 +952,8 @@ doAllocBuffers(const unsigned bufferSize,
         this->micpC_.allocate(bufferSize);
     }
 
+    const bool vapparsActive = schedule_[std::max(reportStepNum, 0u)].oilvap().getType() ==
+                                  OilVaporizationProperties::OilVaporization::VAPPARS;
     if (vapparsActive) {
         soMax_.resize(bufferSize, 0.0);
     }
diff --git a/opm/simulators/flow/GenericOutputBlackoilModule.hpp b/opm/simulators/flow/GenericOutputBlackoilModule.hpp
index f8ac70fbf..79beec842 100644
--- a/opm/simulators/flow/GenericOutputBlackoilModule.hpp
+++ b/opm/simulators/flow/GenericOutputBlackoilModule.hpp
@@ -327,7 +327,6 @@ protected:
                         const bool substep,
                         const bool log,
                         const bool isRestart,
-                        const bool vapparsActive = false,
                         const bool enablePCHysteresis = false,
                         const bool enableNonWettingHysteresis = false,
                         const bool enableWettingHysteresis = false,
diff --git a/opm/simulators/flow/OutputBlackoilModule.hpp b/opm/simulators/flow/OutputBlackoilModule.hpp
index 44287fe71..d45eb6f28 100644
--- a/opm/simulators/flow/OutputBlackoilModule.hpp
+++ b/opm/simulators/flow/OutputBlackoilModule.hpp
@@ -184,7 +184,6 @@ public:
                              substep,
                              log,
                              isRestart,
-                             problem.vapparsActive(std::max(simulator_.episodeIndex(), 0)),
                              problem.materialLawManager()->enablePCHysteresis(),
                              problem.materialLawManager()->enableNonWettingHysteresis(),
                              problem.materialLawManager()->enableWettingHysteresis(),
diff --git a/opm/simulators/flow/OutputCompositionalModule.hpp b/opm/simulators/flow/OutputCompositionalModule.hpp
index d0dd19727..f94289742 100644
--- a/opm/simulators/flow/OutputCompositionalModule.hpp
+++ b/opm/simulators/flow/OutputCompositionalModule.hpp
@@ -162,7 +162,6 @@ public:
         this->compC_.allocate(bufferSize, rstKeywords);
 
         this->doAllocBuffers(bufferSize, reportStepNum, substep, log, isRestart,
-                             /* vapparsActive =*/ false,
                              /* enablePCHysteresis = */ false,
                              /* enableNonWettingHysteresis =*/ false,
                              /* enableWettingHysteresis =*/ false,