Anders Matheson
6d0d17a895
Only add present phases from WCONHIST
2016-11-02 13:44:33 +01:00
Joakim Hove
f5eb4763ea
Merge pull request #958 from jokva/phase-information-and-runspec
...
Phase information and runspec
2016-11-02 11:52:12 +01:00
Jørgen Kvalsvik
21aaceaed9
Runspec object; move phases from TableManager
...
There has never really been a natural home for initial properties that
aren't InitConfig, meaning information such as phases in the deck and
other runspec information hasn't had a natural home.
This patch introduces the Runspec object on EclipseState for phase
information and other similar properties that are interesting and static
for when setting up parameters etc. for simulation, that aren't all that
interesting once simulation starts.
An additional benefit is a leaner implementation for the phase enum and
some stricter semantics via enum classes.
2016-11-01 16:41:19 +01:00
Kai Bao
eba6b7be75
fixing the runScheduleCrateFromDeck test.
2016-11-01 15:44:35 +01:00
Kai Bao
86851e2fed
completing the keywrods GCONPROD
...
And putting a E300 version in 001_Eclipse300.
2016-11-01 13:48:20 +01:00
Kai Bao
879f7b504e
adding a keyword WSEGITER.
...
K-model needs it while not sure if it is used actually.
2016-11-01 12:36:24 +01:00
Jørgen Kvalsvik
4ad9b17449
Remove shared_ptr constructor in Schedule
2016-10-31 16:18:24 +01:00
Kai Bao
eb6c8aa1dc
always applying the BHP limit from WCONINJE.
2016-10-31 15:40:54 +01:00
Jørgen Kvalsvik
c07878800f
changelog 2016-10
2016-10-28 20:00:03 +02:00
Joakim Hove
6e12cc461f
Merge pull request #952 from atgeirr/fix-contructor-bug
...
Make constructor explicit, fix operator<<.
2016-10-25 15:58:15 +02:00
Atgeirr Flø Rasmussen
d34711d600
Make constructor explicit, fix operator<<.
2016-10-25 11:39:43 +02:00
Jørgen Kvalsvik
a89adafb4b
Reference MessageLimit functions.
2016-10-24 17:06:50 +02:00
Joakim Hove
3eeb2e2027
Merge pull request #949 from jokva/appveyor-opm-data
...
appveyor clones opm-data
2016-10-24 13:40:24 +02:00
Joakim Hove
18fbbeecd3
Changes to MessageLimits:
...
1. Will retain already set values when only some items are set.
2. Will parse the sections before the SCHEDULE section to create a
correctly initialized MessageLimits object.
2016-10-24 13:00:04 +02:00
Jørgen Kvalsvik
df1c2448de
appveyor clones opm-data
2016-10-24 08:52:30 +02:00
Joakim Hove
bd5c92737e
Merge pull request #942 from GitPaean/efficiency_factor
...
efficiency factor should not be part of productiondata.
2016-10-21 16:42:26 +02:00
Joakim Hove
df9bdeabbc
Merge pull request #946 from jokva/overflow-guarded-separator-check
...
Check for separator/quote table overflow
2016-10-21 16:41:40 +02:00
Jørgen Kvalsvik
0c1dae7016
Check for separator/quote table overflow
...
Just relying on the char data type is not sufficient to guard against
overflows, and several input decks would invoke undefined behaviour.
This code path is extremely hot, so we're essentially only reading the
least significant 7 bits to achieve branchless lookup.
2016-10-21 10:33:28 +02:00
Kai Bao
85b47dffad
efficiency factor should not be part of productiondata.
...
It applies to both the injection wells and production wells in the group.
2016-10-21 09:48:31 +02:00
Andreas Lauser
d48da54ded
PORV: fix the case where PORO contains some NaNs but the code should not choke anyway
...
thanks to @joakim-hove for catching this.
2016-10-21 09:21:04 +02:00
Andreas Lauser
3008e45367
fix the PORV grid property for clang with optimizations
...
for some reason, it looks like `std::find_if()` does not work on
ubuntu 16.10 with clang and enabled optimizations. since as far I can
see this 'if' is a minor performance improvement in non-time critical
code, let's just remove the condition.
2016-10-21 09:21:04 +02:00
Joakim Hove
17ff5847b4
Merge pull request #947 from jokva/heuristic-short-circuit-strip
...
Short circuit when line terminator is found first
2016-10-21 08:50:32 +02:00
Jørgen Kvalsvik
728a9c2e69
Short circuit when line terminator is found first
...
The termination logic would sometimes need to scan the full line to see
if some terminating condition was found inside quotes. Plenty of
comments in a file start on the first character of a line, meaning this
scan is unnecessary.
2016-10-20 15:11:44 +02:00
Jørgen Kvalsvik
7652e0fcb5
TableColumn stores ColumnSchema, not pointer
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
4c13f6ad06
Use public parseFile in cparser.cc
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
331d61cba5
Parser.parseFile() assumes default parse context
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
066be72ce1
Small doc on GridProperty guarantees
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
6f35591fad
Make IOConfig::getOutputEnabled const
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
bf057f157c
Deck units no longer unique
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
37c04328ca
Remove shared_ptr typedefs
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
f2e509f59f
UnitSystem named constructors with automatic storage
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
0e7752c499
Make group no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
f9cb516b99
Remove DeckPtr+ParserPtr aliases
...
Remove the deprecated DeckPtr and ParserPtr aliases and removes
shared_ptr<Deck> and friends from all interfaces.
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
0059446147
Make Completion+CompletionSet no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
239ef7a34c
Remove shared_ptr typedef in TimeMap
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
8645af71b8
Make PvtxTable no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
8b4350f720
TransMult stores MULTREGTScanner as value
...
Improves copying semantics and fixes a memory leak in TransMult
initialisation.
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
56608e9a10
3DProperties default constructible
...
This also means UnitSystem must be default constructible, which now
makes the default unit system metric. GridProperties must also be
default constructible (a valid 0x0x0 grid with no properties).
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
7a13488fb1
Make SimpleTable no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
930a6216c8
Make SimulationConfig no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
5a48ec4539
Make ThresholdPressure no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
4b51d9b0f5
Make Segment/Compsegs no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
f5a1630dc0
Make InitConfig no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
1906bf4d16
Make EclipseGrid no longer use shared_ptr
2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
fcc93085ee
Make NNC no longer use shared_ptr
2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
64b44eda77
Make Box+BoxManager no longer use shared_ptr
2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
7cff418ae5
Make RestartConfig no longer use shared_ptr
2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
53f178d7ce
Make IOConfig no longer use shared_ptr
2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
c893a92aa6
Make Dimension+UnitSystem no longer use shared_ptr
2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
d53c73fb41
Make Fault+FaultFace no longer use shared_ptr
2016-10-19 20:38:27 +02:00