OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,834 Commits 18 Branches 75 Tags 73 MiB
adcfba1810
Commit Graph

1834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chflo
adcfba1810 OPM-222: Fixed error in completionorder enum conversion method 2015-09-02 12:24:33 +02:00
chflo
2c27fa6076 Fix in getWells(..wellNamePattern), - use new Well::wellNameInWellNamePattern 2015-08-31 18:57:40 +02:00
chflo
a19c52566d OPM-222: Support COMPORD: Change in ParseModeTests due to added COMPORD INPUT support 2015-08-31 18:57:40 +02:00
chflo
fb9105d1e9 OPM-222: Support COMPORD: Verify new compord support 2015-08-31 18:57:39 +02:00
chflo
dba0ce4582 OPM-222: Support COMPORD: Check compord when handling WELSPECS 2015-08-31 18:57:39 +02:00
chflo
2cf06a2a4f OPM-222: Support COMPORD: Added comporder property to Well class 2015-08-31 18:57:38 +02:00
chflo
47ef5d3c9a OPM-222 Added new enum for completionOrder 2015-08-31 18:57:38 +02:00
chflo
e5dbfd9359 OPM-222: Support COMPORD: Added new class DeckTimeStep and populate SCHEDULESection with DeckTimeSteps 2015-08-31 18:57:37 +02:00
Atgeirr Flø Rasmussen
61c33599cf Silence unused argument warning. 2015-08-31 11:05:18 +02:00
Joakim Hove
717821cf90 Changed int -> size_t to squash warnings. 2015-08-28 15:20:44 +02:00
Joakim Hove
6701f91d90 Merge pull request #563 from andlaus/support_SLGOF 
Support slgof
 2015-08-25 18:05:47 +02:00
Joakim Hove
451fb97439 Added SimulationConfig::hasThresholdPressure() 2015-08-25 15:26:03 +02:00
Joakim Hove
f7283eb238 Changed THPRES implementation 
With the current implementation the THPRES pressure table is implemented
with a map indexed by the equilibration region indicies for the regions
in contact.
 2015-08-25 12:01:56 +02:00
Joakim Hove
e1e2487d5d ParseMode::INTERNAL_ERROR_UNINITIALZIED_THPRES 2015-08-25 12:01:55 +02:00
Andreas Lauser
619bd45052 update getSaturationFunctionFamily() for SLGOF 
again, thanks to [at]totto82 for finding this
 2015-08-25 11:48:30 +02:00
Andreas Lauser
018547eac4 add unit test for SLGOF 
thanks to [at]totto82
 2015-08-25 11:32:50 +02:00
Andreas Lauser
698a296cb4 SlgofTable: make the checks more strict 
thanks to [at]totto82 for the hint.
 2015-08-25 11:32:50 +02:00
Andreas Lauser
c99d0b08d3 implement finding the endpoints for SLGOF 
before the code expected the SGOF tables to be used for family 1.
 2015-08-25 11:32:50 +02:00
Andreas Lauser
dd99ac75a5 implement the table class for the SLGOF keyword 
as far as I can see, this is the table which is required to support
all saturation functions.
 2015-08-25 11:32:50 +02:00
Joakim Hove
3ee3c023e6 Handle quotes when stripping off comments. 2015-08-24 20:06:01 +02:00
Fredrik Gundersen
b10401d7c4 Added verification of values in ThresholdPressureTest 2015-08-24 15:35:32 +02:00
Fredrik Gundersen
5421609e65 Fixed tests to work with the new TP behavior 2015-08-24 14:26:01 +02:00
Fredrik Gundersen
e493ad22cb Added new Threshold Pressure behavior 2015-08-24 14:24:53 +02:00
Joakim Hove
89336ac6d8 Merge pull request #555 from chflo/OPM-217 
Opm 217 IOConfig restart write
 2015-08-19 12:07:52 +02:00
Tor Harald Sandve
aa3515fc6a Add phase info to tests 
OIL, GAS and WATER is specified to avoid the 3-phase assert test in
SatfuncPropertyInitializers to fail
 2015-08-19 09:05:10 +02:00
chflo
920759b2e0 OPM-217: IOConfig - changes after review 2015-08-18 16:50:24 +02:00
Joakim Hove
bb6537f631 Fixed minor bug. 2015-08-18 16:01:53 +02:00
Tor Harald Sandve
c6ac070b4f Remove print() 2015-08-18 13:34:00 +02:00
Tor Harald Sandve
70835021f7 Fix bug in ISWCR default? 2015-08-17 11:29:16 +02:00
Tor Harald Sandve
f59ca7f392 Support familyII in the SatfuncInitializer 
- Moves saturation function family check from EclipseState to
SatfuncPropertyInitializers
- Add tests in SatfuncPropertyInitializersTests
- Fixes error in the SatfuncPropertyInitializers implementation for
familyII
 2015-08-17 11:29:16 +02:00
Tor Harald Sandve
641ff37832 Support for family 2 is added to the satfunc property initializer 
Now either family I (SWOF,SGOF) or family II (SWFN, SGFN and SOF3)
keywords can be specified.

Other keyword alternatives like SLGOF, SOF2 and SGWFN and the two
dimensional saturation tables are still not supported.
 2015-08-17 11:29:16 +02:00
Tor Harald Sandve
c081090a30 Add function for getting the saturation function family 
If SWOF and SGOF (family1) are specified in the deck the function
returns 1
If SWFN, SGFN and SOF3 (family2) are specified in the deck the function
return 2
If keywords are missing or mixed, an error is given.
 2015-08-17 11:29:15 +02:00
Joakim Hove
3b12ed762d Merge pull request #554 from atgeirr/fix-groupcontrol-resv 
Add reservoirVolumeTarget property for group production.
 2015-08-14 13:47:32 +02:00
Joakim Hove
1f54a118a0 Merge pull request #552 from babrodtk/vfpinj 
Updates for VFPINJ
 2015-08-14 09:45:15 +02:00
chflo
a09ff8b80e OPM-217: Added integration test for IOConfig handling of restart file write 2015-08-13 11:43:30 +02:00
chflo
bbe73bd0fa OPM-217: Fixed IOConfig RPTRST BASIC with frequency 2015-08-13 11:41:03 +02:00
chflo
de844ad4b9 OPM-217: Added support for RPTSOL RESTART keyword to IOConfig 2015-08-13 11:35:18 +02:00
Atgeirr Flø Rasmussen
dc5a19a402 Add reservoirVolumeTarget property for group production. 
Also change defaults for production rate properties to
-999e100, since 0 is an actual possible rate, and while
it would be possible to ask if a default was applied
(the default should be no rate or limit, not a zero rate),
unlike for wells there are no methods doing this currently.
 2015-08-13 10:23:32 +02:00
Joakim Hove
e0b0c11864 Initialize group rates to large negative number. 
Temporary fix to get old two phase simulators to work.
 2015-08-12 15:28:12 +02:00
babrodtk
905715d74a Updated defaults and removed comments in WCONPROD for VFP tables 2015-08-12 10:34:29 +02:00
babrodtk
3c7e1c5624 Updates for VFPINJ 2015-08-11 16:28:52 +02:00
Joakim Hove
fdc8a0f936 Merge pull request #550 from totto82/familiy2 
Add support for sat func family 2 keywords
 2015-08-11 15:18:25 +02:00
Joakim Hove
482cba0639 Disable external warning: -Wunused-local-typedefs 2015-08-10 17:00:29 +02:00
Joakim Hove
d26428dd52 Reimplmented ParseMode based on string keys. 
Completely reimplemented the ParseMode class. Now the main datastructure
is a map<string,action> where the possible error situations are the
keys. This approach allows for a much more flexible
setting/filtering/querying of the ParseMode settings.
 2015-08-10 14:27:53 +02:00
Joakim Hove
601f1b577b Merge pull request #549 from atgeirr/fix-warnings 
Fix warnings
 2015-08-10 14:27:26 +02:00
Tor Harald Sandve
b9f1dd4fc9 Add support for sat func family 2 keywords 
Saturation functions input using SGFN and SOF3
 2015-08-10 14:07:18 +02:00
Atgeirr Flø Rasmussen
88049d4023 Disable external warning -Wcast-align. 2015-08-10 13:27:27 +02:00
Atgeirr Flø Rasmussen
c86dc758af Disable external warning -Wunused-parameter. 2015-08-10 13:23:05 +02:00
Joakim Hove
19e8c48bea Merge pull request #548 from totto82/ssfn 
Add support for SSFN
 2015-08-10 13:12:03 +02:00
Atgeirr Flø Rasmussen
3845e1c239 Suppress warnings from boost. 
Done by using the disable_warnings.h and reenable_warnings.h headers.
In some cases also a little reordering of includes, to put all boost
includes in the warning-suppressed part.
 2015-08-10 13:06:50 +02:00