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

765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liu Ming
cf9bb49af5 Add PLYVISC to be used calculation of effective water viscosity. 2014-03-17 10:27:27 +08:00
Liu Ming
106c337435 Add PLYROCK, dealing with permeability reduction. 2014-03-17 10:24:17 +08:00
Liu Ming
45fa031dd4 Add PLYMAX, to be used calculation of the maximum polymer fluid viscosity. 2014-03-17 10:20:30 +08:00
Liu Ming
362585e056 Add PLYADS, dealing with polymer adsorption. 2014-03-17 10:18:18 +08:00
Liu Ming
8de830e225 Add PLMIXPAR for Todd-Longstaff mixing parameter. 2014-03-17 10:15:50 +08:00
Joakim Hove
b4bbbb7c8e Merge pull request #137 from joakim-hove/Norne-Schedule 
Small changes to support loading of Norne Schedule file
 2014-03-11 20:08:15 +01:00
Andreas Lauser
08331914bd TimeMap: extend unit tests for the time levels 
I forgot, sorry...
 2014-03-11 19:01:23 +01:00
Andreas Lauser
30a16410aa TimeMap: fix the timePassedUntil() method 
whoever wrote the original code must have his brain left in the bed
that day ;)...
 2014-03-11 15:01:14 +01:00
Joakim Hove
6e62e087ea Changed installation of keywords to use a plain recursive install without consulting git. 2014-03-06 07:00:11 +01:00
Joakim Hove
2259d32258 Added two new keywords. 2014-03-04 16:47:00 +01:00
Joakim Hove
8598fa279e Added throw() in Schedule if trying to control well on an item which has been defaulted. 2014-03-03 15:06:26 +01:00
Joakim Hove
7dc8767c80 Made sure that groups were added when reading the GRUPTREE keyword. 2014-03-03 15:06:26 +01:00
Joakim Hove
ceb4a8df8d Added check on Well->status before reading controlmode. 2014-03-03 15:06:25 +01:00
Atgeirr Flø Rasmussen
3ab6a5388c Suppress unused argument warnings. 2014-03-03 11:06:44 +01:00
Bård Skaflestad
57f34f2ab7 Restore C++-11 checks 
While reformatting the parser-prereqs file I accidentally replaced
the feature search 'CXX11Features' with 'CXX10Features'.  This
commit fixes that blunder.
 2014-02-28 22:17:13 +01:00
Joakim Hove
ee7e034b08 Merge pull request #134 from bska/uniform-parser-prereqs 
Uniform parser 'prereqs' file
 2014-02-28 21:18:41 +01:00
Joakim Hove
8c3f384b5f Merge pull request #132 from andlaus/add_rv 
add RV keyword
 2014-02-28 21:17:28 +01:00
Bård Skaflestad
600a07f7e2 Depend on Boost.Iostreams 
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
 2014-02-28 19:21:33 +01:00
Bård Skaflestad
97980cb37f Reformat prerequisite file according to convention 
This commit makes a few adjustments to the white-space of file
'opm-parser-prereqs.cmake' to honour the conventions of the other
*-prereqs.cmake files within the OPM project's module suites.

No functional changes.
 2014-02-28 19:21:27 +01:00
Andreas Lauser
0901cd3586 add RV keyword 
For now, this is required to read in the initial condition of Norne...
 2014-02-28 16:27:20 +01:00
Andreas Lauser
b43859a2ad use raw values for context dependent rates in the wrapper of WCONINJE 2014-02-27 13:35:51 +01:00
Joakim Hove
f91229218e Moved the implementation of two micro functions from .hpp to .cpp file + changed one int -> size_t. 2014-02-26 23:24:31 +01:00
Joakim Hove
b0ee11ebb3 Merge pull request #130 from AtleH/pathskeyword 
PATHS keyword
 2014-02-26 23:10:45 +01:00
Joakim Hove
1907a8e467 Merge pull request #129 from andlaus/refactor_timemap 
Refactor timemap
 2014-02-26 23:09:50 +01:00
Andreas Lauser
af13b5ed31 TimeMap: always assume the presence of the TIME item 
i.e., the number of items in a date record must now always be 4. to
make this happen, some tests had to be fixed, too...
 2014-02-26 22:15:53 +01:00
Andreas Lauser
b9956385ef fixup! TimeMap: Expose more data 2014-02-26 15:46:18 +01:00
Andreas Lauser
57f199a6e8 fixup! TimeMap: add constructor which takes a deck 2014-02-26 15:33:08 +01:00
Atle Haugan
c81fe99fec Fixed definition for PATHS keyword + improved unit test for same 2014-02-26 15:03:04 +01:00
Joakim Hove
47fee36223 Merge pull request #128 from flikka/add-WGRUPCON 
Add WGRUPCON support to parser
 2014-02-25 20:06:45 +01:00
Joakim Hove
b28c082b1a Changed datatype FLOAT -> DOUBLE in configuration of WGRUPCON keyword. 2014-02-25 20:03:45 +01:00
Andreas Lauser
bffa709dd3 TimeMap: extend test to check "from deck construction" and the new accessor methods 2014-02-21 17:06:22 +01:00
Andreas Lauser
9b8c5d317e TimeMap: add constructor which takes a deck 
this simplifies things considerably and hopefully avoids code
excessive code duplication..
 2014-02-21 17:06:22 +01:00
Andreas Lauser
e6c0ff4546 TimeMap: Expose more data 
basically, we now can access the beginning of a timestep its length
and the total time passed since the beginning of life, the universe
and all the rest.
 2014-02-21 17:06:21 +01:00
Andreas Lauser
be137414c8 TimeMap: simplify the initialization of the eclipse month name map slightly 2014-02-21 17:06:21 +01:00
Andreas Lauser
18eb2fd8f4 TimeMap: replace boost::gregorian::date by boost::posix_time::ptime 
this is necessary because boost::gregorian::date does not have a
notion of "time during a day" which is required to specify time step
lengths less than a day...
 2014-02-21 17:06:21 +01:00
Andreas Lauser
1f9c5d2583 trivial: fix end-of-file comment in Completion.hpp 
that clearly was a copy-and-pasteo...
 2014-02-21 17:06:21 +01:00
Andreas Lauser
4a2ab048e9 fix the definition of the START keyword 
this one had the same problems as DATES
 2014-02-21 17:06:21 +01:00
Andreas Lauser
6b70634f94 fix the "DATES" keyword 
The time of the day field was missing. The defaults for it are those
of E100.
 2014-02-21 17:06:21 +01:00
Atle Haugan
e4a404023c Removed some logging output from Parser 2014-02-21 13:14:11 +01:00
Atle Haugan
280e722501 Forgot to add new JSON file for PATHS keyword 2014-02-21 12:57:26 +01:00
Atle Haugan
9ac0401af5 Support for PATHS keyword - first take 2014-02-21 12:56:20 +01:00
Kristian Flikka
b3dc1ea5ca Added rest of WGRUPCON handlingin Well and Schedule 2014-02-21 12:48:36 +01:00
Joakim Hove
d49ff37891 Merge pull request #126 from AtleH/floatitem 
Added DeckFloatItem, ParserFloatItem
 2014-02-20 12:56:43 +01:00
Kristian Flikka
e4eb60be4b Added guide rate phase enum 2014-02-20 09:30:33 +01:00
Atle Haugan
0d134e8dcd Removed special float/double handling in ParserFloatItem 2014-02-20 07:23:56 +01:00
Kristian Flikka
b69f41f32d Added support for guide rate 2014-02-19 15:43:42 +01:00
Atle Haugan
442d0fb7bf Added ParserFloatItem + some tests. More tests may be needed. 2014-02-18 11:02:38 +01:00
Kristian Flikka
bd564ad944 Added WGRUPCON, and simple YES/NO handling in Schedule 2014-02-17 16:10:31 +01:00
Atle Haugan
ed17058ad3 Renamed FLOAT to DOUBLE in JSON files, tests and some code using the enum 2014-02-17 15:02:40 +01:00
Atle Haugan
d672f4f5eb Added DOUBLE enum to ParserValueTypeEnum 2014-02-17 14:32:32 +01:00