OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-11-02 09:16:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix GCONSUMP efficiency factor application

Browse Source 
The GCONSUMP efficiency factor calculation was incorrectly applying group
efficiency factors to the groups themselves, rather than following the
the pattern used elsewhere in the code base:
  - Groups are NOT affected by their own efficiency factors
  - Parent groups apply child efficiency factors when accumulating contributions

Changes:
  - Fix GroupState::update_gconsump() to implement correct efficiency pattern
  - Add test suite with simple and complex hierarchy scenarios
This commit is contained in:
Håkon Hægland committed 2026-01-20 09:28:36 +01:00
1 parent dbaaf241a2
commit f1510deb50
7 files changed
+669 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/test_group_higher_constraints.cpp
+2 -44
View File
@@ -49,6 +49,7 @@
#define BOOST_TEST_MODULE GroupHigherConstraints
#include "SimulatorFixture.hpp"
#include "ToleranceAndUnitFixture.hpp"
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Group/Group.hpp>
@@ -75,50 +76,7 @@ BOOST_GLOBAL_FIXTURE(SimulatorFixture);
namespace {
//! \brief Test fixture with unit conversion helpers and tolerance checks
struct ToleranceAndUnitFixture
{
//! Relative tolerance for exact mathematical relationships
static constexpr double tight_tol = 1e-12;
//! Relative tolerance for rate values with minor numerical differences
static constexpr double rate_tol = 1e-8;
//! Relative tolerance for algorithm results (e.g., scale factors)
static constexpr double algo_tol = 1e-3;
//! Convert SI rate (m³/s) to metric rate (SM3/day)
static double metric_rate(double si_rate)
{
using namespace Opm::unit;
return convert::to(si_rate, cubic(meter) / day);
}
//! Convert metric rate (SM3/day) to SI rate (m³/s)
static double si_rate(double metric_rate)
{
using namespace Opm::unit;
return convert::from(metric_rate, cubic(meter) / day);
}
//! Check that two values are close within tight tolerance (for exact relationships)
static void checkClose(double actual, double expected)
{
BOOST_CHECK_CLOSE(actual, expected, tight_tol);
}
//! Check that two rate values are close
static void checkRate(double actual, double expected)
{
BOOST_CHECK_CLOSE(actual, expected, rate_tol);
}
//! Check that two algorithm results are close (looser tolerance)
static void checkAlgo(double actual, double expected)
{
BOOST_CHECK_CLOSE(actual, expected, algo_tol);
}
};
// Using shared ToleranceAndUnitFixture from ToleranceAndUnitFixture.hpp
//! \brief Test fixture for group constraint tests to avoid code duplication
//!