OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,202 Commits 9 Branches 35 Tags 15 MiB
f8f7550782
Commit Graph

4202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
06fbc93fef Fixing comments 
The comment now currently say 1/Bg
 2014-01-24 10:14:33 +01:00
Atgeirr Flø Rasmussen
926dfe295b Merge pull request #450 from andlaus/add_message_type 
cmake: make sure all calls to message() exhibit a type
 2014-01-24 00:36:51 -08:00
Joakim Hove
4891a09d6a Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-24 08:59:22 +01:00
Joakim Hove
c1ff5b2974 Merge pull request #460 from flikka/wells-manager-parser-integrate 
Migrating WELSPECS part of WellsManager constructor
 2014-01-23 07:12:17 -08:00
Kristian Flikka
6d970ef189 Removes the WELSPECS usage in WellsManager constructor. Step 1 in rewrite of constructor 2014-01-22 15:22:32 +01:00
Bård Skaflestad
ed5f199f5b Merge pull request #459 from akva2/fix_openmp_pragmas 
fix some openmp pragma's
 2014-01-21 07:39:06 -08:00
Arne Morten Kvarving
60d4a02c0b fix some openmp pragma's 2014-01-21 14:33:14 +01:00
Kristian Flikka
3c74e4bb9e Merged from upstream/opm-parser-integrate 2014-01-21 13:05:59 +01:00
Bård Skaflestad
adf421a9ed Merge pull request #457 from atgeirr/fix-uint 
Portability fix: 'uint' is nonstandard.
 2014-01-15 04:57:47 -08:00
Atgeirr Flø Rasmussen
48f3161a3c Portability fix: 'uint' is nonstandard. 2014-01-15 12:25:50 +01:00
Bård Skaflestad
806be98a95 Merge pull request #456 from rolk/456_blddoc 
Document modules and structures in the build system
 2014-01-15 01:07:13 -08:00
Roland Kaufmann
e79a65bb81 Terminology instead of Notation as section header 
Notation implies that we are going to be given symbols which
represents values or such (which arguably could be true since the
path is a particular value, and from programming we are used to
multi-letter symbols perhaps also with whitespace, but it's a
stretch), but Terminology is more accurate, as this section
describes fits the definition better: it is a vocabulary of
technical terms.

Hat tip: @bska
 2014-01-15 09:08:00 +01:00
Roland Kaufmann
d5a3db50c5 Document modules and structures in the build system 
Give a brief description of each of the modules that comprises the build
system, and the suffices that is used to form a virtual structure of
variables for each project.
 2014-01-14 21:14:17 +01:00
Joakim Hove
2e64991de8 Renamed Parser->parse() -> Parser->parseFile() to follow opm-parser change. 2014-01-11 08:03:42 +01:00
Tor Harald Sandve
829de25a5a Phase pressure is used for surface volumes calculations 2014-01-10 16:07:02 +01:00
Tor Harald Sandve
292b74e189 Change the extrapolation in the livegas pvts 
The special extrapolation for pressure values above
the maximum table value is removed to sync with Mrst
 2014-01-10 16:07:02 +01:00
Tor Harald Sandve
ed9e4e376a Initialization using the RV keyword 
The initial Rv value is specified using the RV keyword in the Parser.
The Rv values are used in the computation of the initial surface
volumes.
 2014-01-10 16:07:02 +01:00
Tor Harald Sandve
598c7a0cb8 Added pvt functionality for wetgas 
The pvt interface is extended to handle wet-gas systems:
1. rvSat is added as a function in the PVT interface
2. SinglePvtLiveGas computes the pvt values and its derivatives
3. The old rbub variable is changed to rsSat for clearity
4. The new interface is tested in test_blackoilfluid with data from
liveoil.DATA and wetgas.DATA
 2014-01-10 16:07:02 +01:00
Kristian Flikka
2a35d3057c Changed phaseUsageFromDeck to use eclipseState 2014-01-10 13:43:02 +01:00
Joakim Hove
824c7768de Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 
Conflicts:
	CMakeLists_files.cmake
 2014-01-10 13:04:00 +01:00
Bård Skaflestad
15211bc445 Merge pull request #454 from joakim-hove/wellmanager 
Refactoring of well controls
 2014-01-09 03:44:11 -08:00
Kristian Flikka
bc8ad56db1 Changed new WellsManager constructor to take in EclipseStateConstPtr instead of SchedulePtr 2014-01-08 16:10:55 +01:00
Joakim Hove
43faea6678 Comparing well names protects againts NULL. 2014-01-08 16:10:43 +01:00
Joakim Hove
dee5c880ea Removed commented out code. 2014-01-08 15:58:11 +01:00
Joakim Hove
c3b4a95d82 Removed access to internal variabel cpty. 2014-01-08 11:32:00 +01:00
Kristian Flikka
43fd5e23ab New constructor for WellsManager that also takes the new parser as argument. New test comparing old and new 2014-01-07 16:10:45 +01:00
Kristian Flikka
593dcf3cd7 Merge from joakim/wellmanager 2014-01-07 16:09:35 +01:00
Joakim Hove
28658347db Using && instead of &= in the functions comparing wells and well_controls. 2014-01-06 19:22:39 +01:00
Joakim Hove
6725740f71 Removed explicit (struct WellControls *) cast to align with the rest of the code. 2014-01-06 19:09:36 +01:00
Joakim Hove
86c9acad5b Removed temoporary file opm/core/well_control_type.h. 2014-01-06 19:09:01 +01:00
Joakim Hove
38b635a97f Moved struct WellControls to the implementation file well_controls.c. 2014-01-06 15:13:32 +01:00
Joakim Hove
23b91c5466 Implemented well_controls based on well_controls_get_xxx() functions. 2014-01-06 15:02:19 +01:00
Joakim Hove
57a0ed6d98 Implemented well_controls based on well_controls_get_xxx() functions. 2014-01-06 14:59:11 +01:00
Joakim Hove
dc1935cc77 Implemented well_controls based on well_controls_get_xxx() functions. 2014-01-06 14:51:11 +01:00
Joakim Hove
bb2604a39b Implemented well_controls based on well_controls_get_xxx() functions. 2014-01-06 14:40:55 +01:00
Joakim Hove
b346845903 Added functions to get type, target and distr of *current* control. 2014-01-06 14:40:03 +01:00
Joakim Hove
a19881f5f4 Implemented well_controls based on well_controls_iset_xxx() functions. 2014-01-06 14:19:09 +01:00
Joakim Hove
57226cde9e Implemented well_control based on well_controls_iset_xxx() functions. 2014-01-06 12:40:03 +01:00
Joakim Hove
4cfa151e25 Implemented well_controls_add_new() with well_controls_iset_xxx() functions. 2014-01-06 12:24:32 +01:00
Joakim Hove
58ba8f45eb Added new function well_controls_iset_distr(). 2014-01-06 12:22:15 +01:00
Joakim Hove
ad73015cb9 Using new function well_controls_invert_current(). 2014-01-06 12:08:29 +01:00
Joakim Hove
fdf7bdba85 Added new functions to set target and type and invert value of current control. 2014-01-06 12:06:36 +01:00
Joakim Hove
85984a72e4 Changes test_wells to use well_controls_get_xxx() functions. 2014-01-06 10:34:25 +01:00
Joakim Hove
9d9c6a5676 Changed test_wellsmanager to use well_controls_get_xxx() functions. 2014-01-06 10:26:46 +01:00
Joakim Hove
1462952511 Using well_controls_get_num() and well_controls_get|set_current() in WellsManager 2014-01-06 10:12:11 +01:00
Joakim Hove
0b37bdd1ec Temporarily added symbol HAVE_WELLCONTROLS before including well_controls.h - to get acces to the internal elements in struct WellControls. 2014-01-05 16:25:31 +01:00
Joakim Hove
5ef171b212 Reimplemnted struct WellControls access to use the set/get functions in well_controls.c 2014-01-05 16:23:22 +01:00
Joakim Hove
49f6ff9791 Added well_controls_get_xxx() and well_controls_set_xxx() functions. The well_controls_reserved() function is called from well_controls_add() and not explicitly. 2014-01-05 16:22:30 +01:00
Joakim Hove
35d46225b8 Removed #include <opm/core/well_controls.h> from wells.h and inserted explicit #include <opm/core/well_controls.h> where needed. 2014-01-05 15:03:30 +01:00
Joakim Hove
f4142899b3 Removed struct WellControlManagement and replaced with simple integer field cpty in the WellControls structure. 2014-01-05 14:54:56 +01:00