Commit Graph

66 Commits

Author SHA1 Message Date
Arne Morten Kvarving
6700e08c84 avoid dead store 2023-06-01 09:38:45 +02:00
Markus Blatt
9d995a40e3 Fix ConstructorMINPV.
Exception is now already thrown in createMinpvDefaultCPDeck.
2023-04-03 17:41:22 +02:00
OPMUSER
699f7ad695 Update ConstructorMINPV Test
Update ConstructorMINPV Test for MINPV/MINPORV
2023-04-03 16:37:33 +02:00
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
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
Arne Morten Kvarving
3808c85edf PinchMode: convert to enum class 2023-01-05 15:28:06 +01:00
Arne Morten Kvarving
f832c88d76 MinpvMode: convert to enum class 2023-01-05 14:07:30 +01:00
Arne Morten Kvarving
d135fada0a remove unnecessary <iostream> includes 2023-01-03 16:32:56 +01:00
Cíntia Gonçalves Machado
1bd79a9999
Repeated includes 2022-11-25 09:51:25 +01:00
Bård Skaflestad
013b279682 Apply Generalised ACTNUM Handling to All Grid Types
Commit eca858335 introduced a more comprehensive way of forming the
initial ACTNUM array used when constructing the EclipseGrid from a
corner-point description.  This commit applies that strategy to all
known grid types.  As an additional benefit this will also cover one
special case that was not handled and would effectively discard the
work done in the generalised initial ACTNUM construction.

Add unit tests to exercise the ACTNUM handling for other grid types.
2022-06-24 14:01:17 +02:00
Atgeirr Flø Rasmussen
02c06e9ae3 Add unit tests for new ACTNUM initialization features. 2022-06-20 17:57:25 +02:00
Markus Blatt
274cee38c7 Renames header tests/WorkArea.cpp to tests/WorkArea.hpp 2022-01-21 10:18:56 +01:00
Joakim Hove
aede532b9a Filesystem rename parser/eclipse/ input/eclipse 2022-01-02 14:32:14 +01:00
Daniel
b0f757eb50 Replace Deck::getKeyword(std::string) with operator[std::string] 2021-11-23 14:00:38 +01:00
Joakim Hove
d3cd4c73ba Make sure tests can be run with readonly tests/ 2021-09-17 10:01:17 +02:00
Joakim Hove
a1f8585395 Handle GDFILE with grid without actnum 2021-09-13 09:00:16 +02:00
Joakim Hove
c13edd0826 Handle GRIDUNIT in deck input 2021-08-03 18:22:32 +02:00
Joakim Hove
05fee1fd12 Add small class to handle MAPAXES & MAPUNITS 2021-05-05 16:09:58 +02:00
Joakim Hove
6650369970 Fix dimension handling for MAPAXES / MAPUNITS 2021-05-04 13:15:40 +02:00
Joakim Hove
d3f2f593eb Remove public method EclipseGrid::getMAPUNITS() 2021-05-04 07:48:23 +02:00
Joakim Hove
a6d574581d Remove getMAPAXES from EclipseGrid public api 2021-05-03 15:19:47 +02:00
Arne Morten Kvarving
b063fcd089 remove some unnecessary includes
from tests and a few schedule classes
2021-04-27 12:55:45 +02:00
Arne Morten Kvarving
72ede7df50 changed: remove unnecessary boost includes 2021-04-23 11:27:38 +02:00
Joakim Hove
97652c1313 Store the active volume with a mutable in the grid 2021-04-12 13:53:59 +02:00
Kai Bao
9231c6c25d adding a few functions for simulator usage
return aqufier id and access all the aquifers in NumericalAquifers
2021-02-05 14:40:38 +01:00
Kai Bao
2da3a2987c fixing test TESTCP_ACTNUM_AQUNUM in EclipseGridTests 2021-02-05 14:40:38 +01:00
Joakim Hove
d15a3a918c Replace windows path separators in GDFILE keyword 2021-01-27 16:15:28 +01:00
Peter Verveer
81c7b53449 Support cylindrical grids as a spiderweb with corrected volumes 2020-12-09 15:51:01 +01:00
Peter Verveer
b85ab8813e Allow use of both DZ and DZV when creating a spiderweb grid 2020-12-04 09:44:36 +01:00
Joakim Hove
27883b8a3c
Merge pull request #2105 from GitPaean/aqunum_activating_cells
AQUNUM can activate inactive cells
2020-11-13 17:23:14 +01:00
Kai Bao
72d3346ab8 Numerical aquifer cells need to be active
even the cells are disabled with ACTNUM
2020-11-13 11:18:48 +01:00
Joakim Hove
e61e7afcc8 Refactor the NNC input class
- The NNC and EDITNNC keywords are internalized in the same class.
- The EDITNNC keyword operations are applied directly to the NNC keywords.
- The nnc vectors are ordered with cell1 < cell2 and ascending order.
- An api has been added to get the KeywordLocation from an NCC
- NNC/EDITNNC which is connected to inactive cell is ignored
2020-11-11 19:57:06 +01:00
Joakim Hove
0a0f30133d Remove not interesting test code 2020-10-22 18:52:05 +02:00
Joakim Hove
4a806533db
Merge pull request #1915 from goncalvesmachadoc/addSpyderwebGrid
add Spiderweb grid
2020-10-22 14:08:01 +02:00
Joakim Hove
36e03cf6b9 Use ParserKeyword::prohibits for COORD / GDFILE / ZCORN 2020-10-10 08:30:48 +02:00
Peter Verveer
7e64686b77 Remove or disable tests for RADIAL.
These failed due to replacing support for RADIAL by SPIDER.
2020-10-06 18:26:13 +02:00
Joakim Hove
0ab50fbc95
Merge pull request #1977 from wito/test-warning-noise-fix
Test Compilation Warning Noise Fix
2020-10-02 07:56:14 +02:00
Joakim Hove
6dc84b67df Remove homemade optional - use std::optional 2020-10-01 13:53:58 +02:00
Williham Williham Totland
6d2f8cca5c Adds type information to integer literals. 2020-09-29 13:54:21 +02:00
Cintia Goncalves Machado
296fa9ed51 updateSpider 2020-09-11 14:49:33 +02:00
Markus Blatt
23dd41ba38 Support querying GAP/NOGAP mode for Pinch form EclipseGrid.
While we currently only support GAP and do not need this,
we will need it eventually to support NOGAP in the simulator.
2020-06-04 20:19:51 +02:00
Joakim Hove
650ffb12b8 EclipseGrid: ensure that all ACTNUM manipulations use resetACTNUM 2020-04-08 21:38:41 +02:00
Arne Morten Kvarving
aceb3b443a remove unused enum entry OpmFIL 2020-02-24 11:41:50 +01:00
Arne Morten Kvarving
fb75bcd4e2 changed: use std::filesystem instead of boost::filesystem
since we still support g++-7, where filesystem is marked experimental,
we introduce a wrapper header and expose the namespace to use
as Opm::filesystem.

for gcc we unconditionally link with libstdc++fs in the python bindings.
the setup.py stuff links as c code, not c++ code, so it is not
automatically added on any gcc version. this might prove unportable
later.
2020-02-13 12:34:19 +01:00
Arne Morten Kvarving
ae10af208f changed: hide the templated 'has' and 'get' interfaces in FieldPropsManager
motivation: an upcoming parallel frontend to the field props manager.
templated functions cannot be virtualized, and thus having these exposed
would give a great chance of confusing the users in the downstream
code, where properties would be caught from the (potentially) empty
backend instead of from the frontend.
2020-01-28 14:31:25 +01:00
Joakim Hove
ecb5fce19b
Only active cells (#1298)
Use FieldProps implementation for 3D properties
2020-01-13 15:46:06 +01:00
Joakim Hove
90d30e3bc9 Rename class Section -> DeckSection 2020-01-02 15:27:22 +01:00
Joakim Hove
e9b6ac54d9 Add PORO keyword to testdata 2019-11-28 20:06:39 +01:00
Bård Skaflestad
3b9ea5dcd8 Consume Owning Raw Pointers in Smart Pointers
This fixes several memory leaks identified by Address Sanitizer.
2019-10-26 18:17:19 -05:00
Bård Skaflestad
c013639b51 Make Most Unit Tests Independent of LibECL
This commit switches a set of OPM-Common's unit tests away from
using direct calls to libecl functions and into using base types
from OPM-Common itself (along with Boost.Filesystem).

In particular summary related queries are replaced by calls to ESmry
member functions (wrapped in libecl-like interfaces to minimise code
changes).  We disable checks on unit strings since ESmry currently
does not have a way of associating those with individual variables.
2019-10-14 06:13:38 -05:00