Commit Graph

2848 Commits

Author SHA1 Message Date
OPMUSER
1fac541b6e Remove MINPVFIL - WIP
MINPVFIL is an OPM Flow specific keyword that is not used by the simulator,  and thus it should be deleted.

Previously, we moved the checks that only allow either the MINPV or MINPORV keywords to be used in the input deck to the JSON keyword files.  This was done to avoid confusion over which global limits are being applied.

Note that if the MINPVV keyword is also in the input deck then these limits are applied post processing the global limits defined by the MINPV/MINPORV keywords. This behavior is unchanged by this PR.

The PR is marked as WIP to give developers time to object for the removal of MINPVFIL keyword.
2023-04-03 16:37:33 +02:00
Bård Skaflestad
200b6a2cbc Merge pull request #3456 from blattms/support-pinch-maxgap
EclipseGrid: make option 3 (MAX_EMPTY_GAP) of PINCH available
2023-03-30 15:18:01 +02:00
Markus Blatt
055547c709 EclipseGrid: make option 3 (MAX_EMPTY_GAP) of PINCH available
This is needed to prevent creation of NNCs if the the empty gap created
by pinched out cells is larger than this threshold.
2023-03-28 11:55:14 +02:00
Tor Harald Sandve
bf7cef4ebd Support DIFFCGAS and DIFFCWAT for the CO2STORE module 2023-03-27 10:15:54 +02:00
goncalvesmachadoc
3e08afeafd delete makeState 2023-03-21 14:24:23 +01:00
goncalvesmachadoc
7c29f6c2a5 test read name 2023-03-17 14:26:26 +01:00
goncalvesmachadoc
4c93e18971 integration test framework 2023-03-17 14:26:26 +01:00
goncalvesmachadoc
ca08609810 rebase 2023-03-17 14:26:25 +01:00
Bård Skaflestad
32b104f828 Merge pull request #3449 from totto82/output_moles
add moles unit to unitsystem
2023-03-16 12:33:16 +01:00
Bård Skaflestad
ae29bb9101 Add Constructors for CellData Objects
This enables using in-place construction in Solution::insert().
2023-03-16 12:15:44 +01:00
Bård Skaflestad
0adcc7dd07 Add Restart File Output Support for Constant Flux Aquifers
We support constant flux aquifers (AQUFLUX keyword) entered both in
the SOLUTION and in the SCHEDULE sections.  The primary structural
change is that we have to support analytic aquifers being introduced
dynamically, whence the connection information (xCAQ) must be
captured without knowing the full set of analytic aquifers.  We
therefore allocate those output arrays purely from the maximum sizes
entered in the RUNSPEC section whereas we defer determining the
maximum aquifer ID to the point of capturing the dynamic values.

The xAAQ values for constant flux aquifers amount to a new aquifer
type integer value (=2) in IAAQ[11] and the flux value in SAAQ[0].
2023-03-16 10:32:43 +01:00
Tor Harald Sandve
932ed862d5 add moles unit to unitsystem 2023-03-16 09:18:39 +01:00
Bård Skaflestad
d87ac33791 Merge pull request #3434 from blattms/refactor-parserinit
Reduce g++-12 resource consumptions for generated parser files.
2023-03-10 13:02:07 +01:00
Markus Blatt
995ec609e3 Added missing include to ParserTests.cpp 2023-03-08 22:27:46 +01:00
Bård Skaflestad
040f0fddd8 Enumerate Columns According to Horizontal Model Dimensions
The inner loop is always across the model layers while we ensure
that the 'outer' loop always iterates over an index range that is at
least as large as that of the 'middle' loop.  This follows from
recent work on compatibility prompted by real field models with the
constant flux analytic aquifer type.

Thanks to [at]tskille for the additional insight.
2023-03-08 17:57:10 +01:00
Arne Morten Kvarving
3fddcc0dd8 split out timing macros to separate header 2023-03-01 13:17:00 +01:00
Tor Harald Sandve
b5fdf35fbc Implement WSF/GSF satfunc familiy for CO2STORE 2023-02-24 15:07:30 +01:00
Kai Bao
1d8e92a262 putting AQUFLUX aquifers in one class 2023-02-17 17:32:24 +01:00
Kai Bao
fceb3515b7 let AquiferConfig handle the AQUFLUX aquifer existence
for summary and restart file output.
2023-02-17 15:44:08 +01:00
Arne Morten Kvarving
735bca1d8f test_Serialization: mark variables const 2023-02-14 13:49:51 +01:00
Markus Blatt
febb03c9d6 Merge pull request #3395 from akva2/multregp_multiple_record
fixed: process all MULTREGP entries in the deck
2023-02-10 15:03:52 +01:00
Bård Skaflestad
335c375c9d Merge pull request #3391 from goncalvesmachadoc/errorMsgTables
Improve Simple Table errros messages
2023-02-10 12:26:33 +01:00
goncalvesmachadoc
b24130aedc update unit tests 2023-02-09 20:51:41 +01:00
Arne Morten Kvarving
49fb77a339 fixed: process all MULTREGP entries in the deck 2023-02-09 11:00:05 +01:00
Atgeirr Flø Rasmussen
46d268fba0 Merge pull request #3383 from akva2/mempacker_public
changed: rename the packer used in test_Serialization to MemPacker
2023-02-08 10:19:28 +01:00
Bård Skaflestad
2109552335 Recognise Numbers as Part of UDQ Set Selector
Needed in order to support segment sets which, potentially, have
both a well name pattern and a segment number.

This change also means that we now support *parsing* block (cell)
UDQ sets like

    BPR 11 22 33

and that, in turn, means we detect unsupported UDQ types later than
we used to.  That also means that the error detection exception type
changes, so update affected unit tests accordingly.
2023-02-07 09:47:46 +01:00
Bård Skaflestad
b1f3b3b4cf Adjust Whitespace in UDQ Tests Implementation File
In preparation of adding tests for segment level UDQs.
2023-02-03 17:59:10 +01:00
Bård Skaflestad
2b2330ab24 Prepare for Handling UDQ ASSIGN for Segments
This commit adds support for constructing UDQ ASSIGN records for
enumerated well items such as those encountered in UDQs at the
segment level, e.g.,

    ASSIGN SUSPECT PROD01    123.456 /
    ASSIGN SUSPECT PROD02 17 654.321 /

We do not support this syntax quite yet, but this is a step on the
way there.
2023-02-02 12:43:16 +01:00
Arne Morten Kvarving
b138598518 changed: rename the packer used in test_Serialization to MemPacker
make it a public header so it can be reused elsewhere.
2023-02-01 10:48:48 +01:00
Arne Morten Kvarving
abce488f3b Summary.hpp: forward PAvgCalculatorCollection 2023-01-19 13:19:27 +01:00
Bård Skaflestad
b82508dd7c Merge pull request #3372 from akva2/summarystate.hpp_reduce_hotness
ActionContext: forward SummaryState
2023-01-18 15:42:44 +01:00
Arne Morten Kvarving
f8eca58408 ActionContext: forward SummaryState 2023-01-18 13:48:46 +01:00
Arne Morten Kvarving
9ef643345d Schedule.hpp: forward Well 2023-01-18 11:01:41 +01:00
Arne Morten Kvarving
8e29ef4c07 move string conversion of WellGuideRateTarget to WellEnums.cpp 2023-01-18 09:33:50 +01:00
Arne Morten Kvarving
0ef729ba72 move printing of WellProducerCMode to WellEnums.cpp 2023-01-18 09:20:43 +01:00
Arne Morten Kvarving
a540ac54b8 move printing of WellInjectorCMode to WellEnums.cpp 2023-01-18 09:08:27 +01:00
Arne Morten Kvarving
3d0ca8438b move printing of WellStatus to WellEnums.cpp 2023-01-18 08:59:09 +01:00
Arne Morten Kvarving
ddef6302e6 ParseContext: forward InputErrorAction 2023-01-16 22:17:50 +01:00
Arne Morten Kvarving
edf937e2e5 InputErrorAction: convert to enum class 2023-01-16 22:17:50 +01:00
Arne Morten Kvarving
7468f23875 (Eclipse|Restart)IO: forward Restart(Key|Value) 2023-01-16 15:19:48 +01:00
Arne Morten Kvarving
f51c065772 Well.hpp: forward WVFPEXP 2023-01-16 09:57:57 +01:00
Arne Morten Kvarving
74098e23cd Well.hpp: forward WellEconProductionLimits 2023-01-13 21:16:06 +01:00
Arne Morten Kvarving
c58fc34a71 Well.hpp: forward WellMICPProperties 2023-01-13 15:29:28 +01:00
Arne Morten Kvarving
80dabaea3b Well.hpp: forward WellPolymerProperties 2023-01-13 14:04:12 +01:00
Arne Morten Kvarving
0750cc8cc2 Well.hpp: forward WellTracerProperties 2023-01-13 12:40:04 +01:00
Arne Morten Kvarving
5f6d3176b8 Well.hpp: forward WellBrineProperties 2023-01-13 11:36:00 +01:00
Arne Morten Kvarving
253bb22e3c Well.hpp: forward WellFoamProperties 2023-01-13 10:16:37 +01:00
Arne Morten Kvarving
574407746d Well.hpp: forward WellSegments 2023-01-12 14:37:46 +01:00
Arne Morten Kvarving
cc68336d22 Well.hpp: forward WellConnections 2023-01-12 12:24:38 +01:00
Arne Morten Kvarving
5e74b915b5 ScheduleState.hpp: forward Action::Actions 2023-01-11 13:51:28 +01:00