OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,581 Commits 18 Branches 75 Tags 73 MiB
359558536e
Commit Graph

6581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
44ae1fd574 Modify warning message 2019-10-01 21:12:18 +02:00
Joakim Hove
04eb33771c
Merge pull request #1045 from joakim-hove/guide-rate-nnn 
Guide rate nnn
 2019-10-01 07:27:22 +02:00
Joakim Hove
78820654c7
Merge pull request #1057 from bska/uncouple-libecl 
Make UnitSystem Independent of LibECL
 2019-10-01 07:26:30 +02:00
Bård Skaflestad
c51842d65b Make UnitSystem Independent of LibECL 
This commit decouples the UnitSystem class from the LibECL type
ert_ecl_unit_enum.  This, in turn, makes UnitSystem independent of
LibECL.

Update the unit test accordingly, and include <ert/util/util.h>
where needed.  This header was included transitively through
UnitSystem.hpp before.
 2019-09-30 23:49:57 +02:00
Atgeirr Flø Rasmussen
51b3d14851
Merge pull request #1044 from joakim-hove/deck-sistate 
DeckItem - use same store for both si and raw
 2019-09-30 23:14:37 +02:00
Joakim Hove
650dd32274 Ensure that DeckItem is written raw in output 2019-09-30 19:08:06 +02:00
Joakim Hove
809177af03 Update DeckItem::equal() implementation 
When the DeckItem::dval vector is used transparently for both raw values and SI
values the ::equal implementation must be aware of this.
 2019-09-30 18:51:35 +02:00
Joakim Hove
6c34aee00e Use only one double vector in DeckItem 2019-09-30 18:51:35 +02:00
Joakim Hove
25f8ec6641
Merge pull request #1049 from bska/revised-summary-node 
Decouple SummaryConfig Class From LibECL
 2019-09-30 18:50:22 +02:00
Joakim Hove
c55c1799f6
Merge pull request #1053 from joakim-hove/W 
Add W keywords up to WSEGTABL
 2019-09-30 18:43:27 +02:00
Joakim Hove
6cdd4fd76f Protext against zero potential 2019-09-30 16:15:35 +02:00
Joakim Hove
3f83f2ed56 Fix bug 2019-09-30 16:15:24 +02:00
Tor Harald Sandve
f7b611afec various fixes to make guiderate work 2019-09-30 14:14:09 +02:00
Joakim Hove
a55f691581 Improvements to GuideRate 2019-09-30 14:14:09 +02:00
Joakim Hove
e738712ad5 GuideRateConfig class has a pointer to GuideRateModel 2019-09-30 14:14:09 +02:00
Bård Skaflestad
70daf0f2c8 Decouple SummaryConfig From LibECL 
This commit reimplements the SummaryNode class in order not to use
the ecl::smspec_node class from LibECL.  Consequently, we remove
class SummaryConfig's binding to LibECL.

Class SummaryNode maintains the same information as before.  We also
implement a "named constructor" strategy to assign data members that
only make sense for a subset of the node categories.  The previous
member function 'type' is renamed to 'category' to identify the
attachment category (e.g., Well, Group, Field, Block, Region).  In
turn, we introduce a new 'type' member function to identify the
parameter kind (e.g, pressure, rate, cumulative total, well count)
represented by a given node.  We furthermore capture whether or not
the node is a user defined quantity (i.e., a UDQ).

We reimplement the keyword classifier operations that are currently
needed as free functions named 'is_*()' in SummaryConfig.cpp.

Note that in addition to the renamed member functions of class
SummaryNode, this commit also switches the summary key strategy for
block parameters.  Rather than capturing the 'ijk' values
individually as "BOSAT:3,3,6", we now store the equivalent global
(Cartesian) index (i.e., as "BOSAT:523").  Code that directly
constructs block parameter keys must be updated accordingly.

Chase the API change in the 'Summary' constructor and update unit
tests as needed.
 2019-09-30 13:59:34 +02:00
Bård Skaflestad
dff62946dd Summary Config: Simplify Derivation of Maximum Number of Segments 
Since switching to Well2 we no longer need a time loop to derive the
maximum number of segments in an MSW.
 2019-09-30 13:27:32 +02:00
Bård Skaflestad
0a6dda5d6d Summary Config: Make 'is_udq' Predicate More Robust 
In particular, don't classify 'RUNSUM' as a UDQ keyword.  Moreover,
restrict the known UDQ patterns to

    AU*, BU*, CU*, FU*, GU*, RU*, SU*, and WU*
 2019-09-30 13:27:32 +02:00
Bård Skaflestad
d2db04ec13 Uncouple SummaryState from LibECL 
This commit removes the member function

    void SummaryState::update(const ecl::smspec_node&, double)

and places an equivalent implementation into Summary.cpp's private
helper function namespace.  Doing so allows us to make the summary
state object independent of the 'libecl' library.
 2019-09-30 13:27:32 +02:00
Joakim Hove
f799d7c6b9
Merge pull request #1055 from joakim-hove/rename-debug-class 
Renamed DEBUG -> DEBUG_LEVEL
 2019-09-30 12:57:14 +02:00
Joakim Hove
ce95cd5721 Renamed DEBUG -> DEBUG_LEVEL 2019-09-30 12:29:37 +02:00
Joakim Hove
4416721686
Merge pull request #1048 from stefoss23/deck_value 
introduced new class DeckValue.
 2019-09-30 10:16:13 +02:00
Steinar Foss
9c4ccd0ff6 DeckValue: DeckValueEnum as enum class. 2019-09-30 09:57:37 +02:00
Joakim Hove
4ca993400b
Merge pull request #1052 from tskille/EGrid 
Changed EGrid API, function getCellCorners.
 2019-09-30 08:31:49 +02:00
Joakim Hove
1b63b8193b Add W keywords up to WSEGTABL 2019-09-30 08:13:18 +02:00
Steinar Foss
584f7ed5ca DeckValue: DeckValueEnum. 2019-09-29 20:12:57 +02:00
Steinar Foss
dc636e244c DeckValue: removed reset method. 2019-09-29 14:29:33 +02:00
Steinar Foss
7af66a6eab DeckValue: single arg constructors are explicit. 2019-09-29 14:20:02 +02:00
Torbjørn Skille
7b2a7aa419 Changed EGrid API, function getCellCorners. Changed from std::vector<double> to std::array<double,8> 2019-09-28 17:46:04 +02:00
Joakim Hove
3d3f315b0a
Merge pull request #1050 from joakim-hove/keywords-V 
Keywords v
 2019-09-28 16:43:19 +02:00
Joakim Hove
fe99293f33 T keywords up to TRACTVD 2019-09-28 15:02:02 +02:00
Joakim Hove
c312c05732 Add T keywords up to TIGHTEN 2019-09-27 21:27:33 +02:00
Joakim Hove
b9fa2ec10d Add keywords on U 2019-09-27 21:27:33 +02:00
Joakim Hove
82a28a29bf Keywords on V 2019-09-27 21:27:20 +02:00
Joakim Hove
41a350ad23
Merge pull request #1047 from stefoss23/add_keywords_G 
added keywords beginning w/ G only.
 2019-09-27 20:57:16 +02:00
Steinar Foss
fd986cb397 DeckValue under namespace Opm. 2019-09-26 15:08:21 +02:00
Steinar Foss
af878ba229 introduced new class DeckValue. 
added DeckValue.cpp.

completed DeckValue.
 2019-09-26 14:12:05 +02:00
Steinar Foss
8c5ef89bd3 added keywords beginning w/ G only. 
added keywords GCVD, GDCQ, GDCQECON.

added keywords GDIMS, GDRILPOT.

added keywords GETGLOB, GI.

added keywords GIMODEL, GINODE, GLIFTLIM.

added keywords GNETDP, GNETPUMP.

added keywords GRADGRUP, GRADRESV.

added keywords GRADRFT, GRADWELL, GRAVCONS.

added keywords GRAVDR, GRAVDRB, GRAVDRM.

keyword GRACONS set to size unlimited.

added keyword GRDREACH.

added keywords GRUPMAST, GRUPRIG.
 2019-09-25 15:32:33 +02:00
Atgeirr Flø Rasmussen
0edd5c2207
Merge pull request #1035 from joakim-hove/equil-data 
Changed EquilRecord to take SI values instead of DeckRecord
 2019-09-24 08:28:17 +02:00
Joakim Hove
3f8a8f9de8
Merge pull request #1042 from joakim-hove/create_dkw 
python: DeckKeyword constructor, w/ ParserKeyword arg.
 2019-09-23 23:48:02 +02:00
Steinar Foss
11d1c7d634 python: DeckKeyword constructor, w/ ParserKeyword arg. 
parserkeyword can create deckkeyword.

python parserkeyword: removed create_deckkeyword.

DeckKeyword: member parser_keyword is shared_ptr.

python DeckKeyword constructor.

python: no exposure of ParserKeyword.

DeckKeyword: shared_ptr<ParserKeyword> -> ParskerKeyword.

python/cxx/deck_keyword.cpp: cosntructor takes arg const ParskerKeyword&.

test_parser.py: simplified test_pyinut.

...
 2019-09-23 23:27:03 +02:00
Joakim Hove
3229c343f7
Merge pull request #1010 from joakim-hove/python-context 
Python context
 2019-09-23 22:04:24 +02:00
Joakim Hove
9c96588f36 Changed EquilRecord to take SI values instead of DeckRecord 2019-09-23 21:44:59 +02:00
Joakim Hove
69ddffc966 Expose C++ objects to Python runtime 2019-09-23 21:31:45 +02:00
Bård Skaflestad
604c476554
Merge pull request #1041 from bska/fix-build-gcc49 
Construct tuple<> Objects Explicitly
 2019-09-23 19:01:34 +02:00
Bård Skaflestad
060fb59c57
Merge pull request #1040 from bska/index-out-of-bounds 
Ensure ACTNUM Has Expect Number of Elements
 2019-09-23 19:00:58 +02:00
Bård Skaflestad
d4ab231124 Construct tuple<> Objects Explicitly 
Needed in GCC 4.9 due to incomplete standard library implementation
of class template tuple<>--especially its conditionally implicit
constructors.
 2019-09-23 17:38:40 +02:00
Bård Skaflestad
c429a8a800 Ensure ACTNUM Has Expect Number of Elements 2019-09-23 17:32:52 +02:00
Joakim Hove
40570f1aba
Merge pull request #1019 from joakim-hove/opmlog-python 
Add Python wrapping for OpmLog
 2019-09-23 16:54:18 +02:00
Atgeirr Flø Rasmussen
a5e897bdc7
Merge pull request #1039 from akva2/janitoring 
fixed: remove unused variable
 2019-09-23 15:59:32 +02:00