OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,048 Commits 9 Branches 35 Tags
543230c8cf18bacf2033d73279cdab070ece8343
Commit Graph
1646 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 543230c8cf Suppress warnings in unimplemented functions. 
This prevents warnings from functions that are right now just
a throw statement. Also cleaned up a few whitespace issues nearby.
 2014-02-05 14:27:51 +01:00
Atgeirr Flø Rasmussen 708f9a2fa3 Fix initialisation warning. 2014-02-05 13:05:33 +01:00
Bård Skaflestad 1513712e6b Merge pull request #481 from atgeirr/fix-summary-output 
Fix summary output, now contains output for all steps.
 2014-01-31 11:49:58 -08:00
Atgeirr Flø Rasmussen 5ea54d7a4a Merge pull request #478 from osae/endscale 
Saturation table scaling and hysteresis.
 2014-01-31 05:48:56 -08:00
osae a186c0fb9c Removed blanks from strings. 2014-01-31 14:35:35 +01:00
Atgeirr Flø Rasmussen f1ae040aef Removed erroneous comment. 2014-01-31 14:07:30 +01:00
Atgeirr Flø Rasmussen 9f253eb9ae Add summary output of bottom hole pressures. 2014-01-30 14:18:09 +01:00
Atgeirr Flø Rasmussen 445800f738 Fix summary output, now contains output for all steps. 
Previously, the summary output was rewritten for each step,
leaving only the last step's data in the summary data file.
 2014-01-30 11:36:31 +01:00
osae f8696edd7b RV is back in business - a second attempt. 2014-01-29 08:56:07 +01:00
osae 841acacf78 RV is back in business. 2014-01-29 08:42:33 +01:00
osae fa470063ca Saturation table scaling and hysteresis. 
This commit implements some additional scaling keywords.  This includes
the ISWL-family that provide hysteresis behaviour via alternative
scaling of the tables.  The old parser has been somewhat extended for
testing purposes.  The commit also includes a slight refactoring of the
SatFunc-family where a new base class has been introduced.
 2014-01-28 16:36:55 +01:00
Atgeirr Flø Rasmussen ad899fcc10 Now checks for missing TOPS or DEPTHZ in DXV etc. initialization. 2014-01-24 13:55:16 +01:00
Atgeirr Flø Rasmussen e4e4968d90 Merge pull request #462 from totto82/wetgas 
Added pvt functionality for wetgas
 2014-01-24 04:36:51 -08:00
Tor Harald Sandve 06fbc93fef Fixing comments 
The comment now currently say 1/Bg
 2014-01-24 10:14:33 +01:00
Arne Morten Kvarving 60d4a02c0b fix some openmp pragma's 2014-01-21 14:33:14 +01:00
Atgeirr Flø Rasmussen 48f3161a3c Portability fix: 'uint' is nonstandard. 2014-01-15 12:25:50 +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
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
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 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
Joakim Hove 76deba58bd Moved well_controls implementation to separate file well_controls.c. 2014-01-05 14:47:15 +01:00
Joakim Hove e75552750a Extracted everything related to well controls to separate header well_controls.h - to simplify introducing new parser. 2014-01-03 16:04:12 +01:00
Kristian Flikka fd942e347d Implementation (not finished) of wells_equal, well_controls_equal, and tests. To build a WellsManager test for old and new parser 
Conflicts:
	CMakeLists_files.cmake
 2014-01-03 16:00:10 +01:00
Andreas Lauser b660419992 fix typo in guard macro of fsh.h 
on CLang 3.4 svn this produced

```
/home/erne/src/opm-core/opm/core/pressure/fsh.h:20:9: warning: 'OPM_FSH_HEADER_INCLUDED' is used as a
      header guard here, followed by #define of a different macro [-Wheader-guard]
```

which is correct...
 2013-12-15 18:10:27 +01:00
Arne Morten Kvarving f1ba3d4b70 added: nonstandard 'RHO' field in eclipse grid parser 
note that as this is a nonstandard field, there is no unit conversion
handling. use with caution
 2013-12-12 12:43:30 +01:00
Andreas Lauser 34e26ae5bc Property system: some simplifications and bugfixes 
this simplifies the template meta programming a bit. (Which does not
mean that it suddenly gets easy.) The main motivation for this work is
to make the splices feature work properly which allows eWoms to
properly select the spatial discretization at any point.

Further, the number of type tags a node can inherit from now is truely
unlimited thanks the the generic tuple reversal class provided by
https://sydius.me/2011/07/reverse-tuple-in-c/ . (before, the maximum
number of nodes from which a type tag could inherit was 11, so this
limitation did not really matter in practice.)
 2013-12-11 17:26:24 +01:00