OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,113 Commits 18 Branches 75 Tags
eb4f0b68d6e894e7f2efa23017376a5331980cfd
Commit Graph

1444 Commits

Author SHA1 Message Date
Joakim Hove
81b71d5d08 Removed EclipseGrid member from Schedule class. 2016-09-12 21:42:34 +02:00
Joakim Hove
8f3ebe23ee Removed grid argument from Well construction. 2016-09-12 21:42:34 +02:00
Joakim Hove
b47e7579d0 Completion: Internalize cell depth immediately. 2016-09-12 21:42:34 +02:00
Joakim Hove
9a1a1e2f00 Removed EclipseGrid dependency from CompletionSet. 2016-09-12 21:42:34 +02:00
Jørgen Kvalsvik
9aee6e7708 Return identity when compressing active-only cells. 2016-09-12 21:14:07 +02:00
Joakim Hove
74e1aff9dc Compress std::vector<T> and GridPropery. 2016-09-08 09:14:30 +02:00
Joakim Hove
56077998e0 Added EclipseGrid::getGlobalIndex( activeIndex ) 2016-09-08 09:14:29 +02:00
Joakim Hove
15588fe7ca Added EclipseGrid::allActive() convenience method. 2016-09-08 09:14:28 +02:00
Joakim Hove
489602c51c EclipseGrid: default copy and move constructors. 2016-09-08 09:14:27 +02:00
Joakim Hove
c2b4ee687f Added class ZcornMapper. 2016-09-07 11:08:31 +02:00
Joakim Hove
4af4c40dc6 Added EclipseGrid processed copy. 2016-09-07 11:07:51 +02:00
Joakim Hove
c8d77dff99 Expand ALLPROPS in SOLUTION section RPTRST. 2016-09-06 00:25:07 +02:00
Joakim Hove
ba6e2a0eb1 Merge pull request #909 from andlaus/implement_multregp 
Implement support for MULTREGP
 2016-09-05 18:11:18 +02:00
Joakim Hove
2fa5ee628b Merge pull request #910 from joakim-hove/store-mapaxes 
Do not apply the MAPAXES transform.
 2016-09-05 17:31:39 +02:00
Joakim Hove
bcb4f51a4d Added some tests to verify ALLPROPS handling. 2016-09-05 13:11:41 +02:00
Joakim Hove
37c1418876 Do not apply the MAPAXES transform. 2016-09-02 14:35:14 +02:00
Andreas Lauser
cf8c957968 add a unit test for the MULTREGP keyword 2016-09-02 11:16:34 +02:00
Andreas Lauser
f9b3a42598 implement support for the MULTREGP keyword 
Note that this keyword is pretty quirky. Depending on whether
E100/E300 considers it for MINPV handling or not, this patch is also
not going to cut it. (After this patch, OPM will consider MULTREGP for
the MINPV handling. Could somebody with access to E check?)
 2016-09-02 11:16:34 +02:00
Joakim Hove
aa99e3e39c Merge pull request #904 from qilicun/fix-msg-order-issues 
Argument of warning() method is msg, filename, linenumber.
 2016-08-29 10:02:52 +02:00
Liu Ming
756b4d1edd argument of warning() method is msg, filename, linenumber. 2016-08-29 14:01:14 +08:00
Joakim Hove
b6c4043f20 Merge pull request #902 from joakim-hove/gridproperty-cells 
Scan a property and return cells equal to a value.
 2016-08-26 11:04:42 +02:00
Joakim Hove
bea47dc06d Scan a property and return cells equal to a value. 2016-08-25 17:27:36 +02:00
Joakim Hove
949b955d37 Merge pull request #901 from jokva/grid-export-compressed-map 
Active cell cache with automatic storage
 2016-08-25 15:15:49 +02:00
Jørgen Kvalsvik
bb2d0c5324 Active cell cache with automatic storage 
Simplify slightly by using automatic memory management, rather than
heap-alloc.
 2016-08-25 13:51:46 +02:00
Joakim Hove
aa9f43686d Merge pull request #900 from joakim-hove/grid-export-compressed-map 
EclipseGrid::activeMap( ) will cache the results.
 2016-08-25 13:46:35 +02:00
Joakim Hove
1c0716aefd EclipseGrid::activeMap( ) will cache the results. 2016-08-25 11:50:09 +02:00
Joakim Hove
422ac7335b Special case 'ALLPROPS' mneomonic. 2016-08-22 17:08:16 +02:00
Joakim Hove
30a4974178 Added RestartConfig::getkeyword() to check mneonic 2016-08-22 16:45:28 +02:00
Joakim Hove
e093e470c8 Added RPTRST memonic without corresponding int. 2016-08-22 16:45:28 +02:00
Atgeirr Flø Rasmussen
a40e094380 Do not use constexp pair constructor. 
That constructor is not available in C++11, only from C++14 on.
 2016-08-19 13:08:19 +02:00
Arne Morten Kvarving
fc90cdcf97 changed: remove unused references 
quells unused variable compile warnings
 2016-08-15 14:53:53 +02:00
Jørgen Kvalsvik
07b1706c58 Support for RPTRST/RPTSCHED options 
A RestartConfig refurbishment that generalises some of the previously
special-casing. Short synopsis:

* Integer list input is first translated to their corresponding
  mnemonics.
* Mnemonic implementation support turning off input parameters via
  mnemonic=0, handled generally rather than special-cased for BASIC/FREQ
* Restart configuration setup is handled in one else-less, linear code
  path. RPTRST and RPTSCHED are interpreted by their separate helper
  functions, but they produce the same resulting object. Should be
  easier to follow
* Ignores unknown mnemonics, has a list of known/supported mnemonics
  that will be internalised.

The explicit list over supported keywords is from the Eclipse100 manual
and must be manually maintained, i.e. no dynamic solution is in place
yet. This might never be necessary, but support it dynamically isn't a
problem.
 2016-08-11 09:59:54 +02:00
Jørgen Kvalsvik
295ef91063 Moved RestartConfig out of IOConfig 
RestartConfig is a first-class citizen of EclipseConfig rather than
being embedded in IOConfig. This narrows IOConfig's responsibility to
only that of paths file system definitions and interactions, and
RestartConfig to what and when to output the restart file.
 2016-08-11 09:59:54 +02:00
Joakim Hove
0e53246009 Internalize whih keywords to restart - in addition to when. 2016-08-10 16:33:25 +02:00
Joakim Hove
2b1b74d3ae Added method back() to DynamicState() 2016-08-10 16:33:05 +02:00
Tor Harald Sandve
5ccc85b717 Shut wells where all completions are shut 2016-08-09 10:43:08 +02:00
Joakim Hove
9bcdadd443 Merge pull request #890 from pgdr/transmult-and-shared_ptrs 
Removing some use of shared_ptr
 2016-08-09 09:32:41 +02:00
Jørgen Kvalsvik
d928f53a52 Use getCellDepth; hoist size() in numApply 2016-08-08 11:56:40 +02:00
Pål Grønås Drange
41b158bb2b Shortified names, instead of state.getEclipseConfig().getSummaryConfig(), use state.cfg().summary() 2016-08-08 11:39:59 +02:00
Pål Grønås Drange
dde7a25673 Made EclipseConfig.SimulationConfig and .InitConfig references 2016-08-08 09:37:13 +02:00
Jørgen Kvalsvik
9966e3fbfd Prefer .at over checking size and throwing 
Seems to be slightly faster and is much simpler.
 2016-08-05 15:57:44 +02:00
Jørgen Kvalsvik
0650996655 Short-circuit table lookup of constant strings 
A keyword cannot be equal to multiple distinct strings at once, so we
can stop looking if one proposition evaluates to true.
 2016-08-05 15:45:39 +02:00
Jørgen Kvalsvik
d7ac7ee9b8 Remove SCHEDULE as a special section 
SCHEDULESection with its special implementation is a remnant of older
design and largely unnecessary now. The implementation also relied on
shared_ptr for efficiency and was not really used at all.

SCHEDULESection now is no longer special, and uses the same
implementation as SUMMARY, RUNSPEC etc. The one thing that separated it,
looking up keywords within a timestep, was only used once and this
computation has been inlined in the function.
 2016-08-05 15:28:29 +02:00
Pål Grønås Drange
b359e9c0fb transmult is member, use ref's, use proper constructor of EclipseState 2016-08-05 15:07:15 +02:00
Jørgen Kvalsvik
34a354c1dd Prefer to/from_si to string parsing for conversion 2016-08-05 13:24:30 +02:00
Jørgen Kvalsvik
6266314f8d String -> ScheduleEnum assumes pre-trimmed strings 
Reduce the overhead in the WCONHIST parsing by assuming that strings are
pre-trimmed when they're given to the translation.
 2016-08-05 12:34:08 +02:00
Jørgen Kvalsvik
e88cbc523b Precompute control modes in history/prediction 2016-08-05 12:22:48 +02:00
Atgeirr Flø Rasmussen
9b924b1fe1 Remove two unused functions. 2016-08-01 15:15:41 +02:00
Joakim Hove
19aa54a7e1 Merge pull request #883 from jokva/summary-config-well-name-matching 
[Summary] W-keywords accept patterns
 2016-07-19 09:43:57 +02:00
jokva
6fc1aec8c0 Merge pull request #882 from joakim-hove/restart-config 
Extracted configuration of *when* to write restart
 2016-07-18 23:10:33 +02:00