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

3309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
7a7787f05c Merge remote-tracking branch 'upstream/master' 2013-06-03 09:59:19 +02:00
Bård Skaflestad
481c3a4e00 Merge pull request #250 from atgeirr/combined 
A collection of various updates
 2013-06-03 00:58:50 -07:00
Bård Skaflestad
cadd324192 Merge remote-tracking branch 'upstream/master' 2013-06-03 09:33:58 +02:00
Atgeirr Flø Rasmussen
a8535b1653 Merge pull request #249 from rolk/249_suse 
Depend on development version of packages
 2013-06-02 23:48:09 -07:00
Roland Kaufmann
82e4a129cd Depend on development version of packages 
Using this combination of packages, I am able to compile opm-core on a
minimal installation of OpenSuSE.
 2013-06-03 00:19:53 +02:00
Atgeirr Flø Rasmussen
21771218b9 Ensures well rate initialization actually happens. 
Do not use the well's comp_frac member, only rely on the control's distr
member for initialization. This forced a change to WellsManager's
initialization of the distr member.
 2013-06-02 23:30:43 +02:00
Atgeirr Flø Rasmussen
9c890bc19a Bugfix in well rate init. 
Do not always try to initialize, also initialize proper phase rates.
 2013-06-02 22:19:43 +02:00
Atgeirr Flø Rasmussen
b3acdbb8de Refined well state initialization. 
For SURFACE_RATE controlled wells, initialize wellRates() to match.
 2013-06-02 21:58:30 +02:00
Atgeirr Flø Rasmussen
d42bccaa8e Unit conversion factor of RS is not 1 for FIELD units. 2013-05-30 14:37:48 +02:00
Atgeirr Flø Rasmussen
31dd4f707c Initialize rate-controlled well bhp with safety factor. 
Safety factor is 1.01 (INJECTOR) or 0.99 (PRODUCER), similar to
mrst's ad-fi/utils/initWellSolLocal.m > initialize().
 2013-05-30 11:03:08 +02:00
Atgeirr Flø Rasmussen
8f722702c6 Fix SatGwseg* to handle no-gas situation gracefully. 2013-05-29 00:30:50 +02:00
Atgeirr Flø Rasmussen
7bad081eb4 Merge remote-tracking branch 'totto82/newfluid2' into combined 2013-05-27 15:45:18 +02:00
Atgeirr Flø Rasmussen
af675fcc9d Created new initialization routine, using RS from deck. 2013-05-27 15:44:07 +02:00
Atgeirr Flø Rasmussen
3b69bef702 Added gasoilratio() to BlackoilState. 2013-05-27 12:53:06 +02:00
Tor Harald Sandve
01bb02f4cd Adds the new interface to SinglePvtLivGas 2013-05-27 11:14:39 +02:00
Atgeirr Flø Rasmussen
ddfbda7419 Added assert to guard against wrong usage. 2013-05-24 09:21:41 +02:00
Atgeirr Flø Rasmussen
897ec0e909 Fix bug in upwinding code. 
Accidental usage of std::vector's operator< discovered.
 2013-05-24 09:20:46 +02:00
Bård Skaflestad
894bb5e072 Merge remote-tracking branch 'upstream/master' 2013-05-24 00:44:01 +02:00
Bård Skaflestad
628c162574 Merge from upstream 2013-05-23 09:50:46 +02:00
Atgeirr Flø Rasmussen
729d17785b Merge pull request #246 from rolk/246_bind 
Use boost::bind instead of std::bind to compile with C++03
 2013-05-23 00:19:34 -07:00
Roland Kaufmann
eefb7a0431 Use boost::bind instead of std::bind to compile with C++03 2013-05-22 21:25:29 +02:00
Roland Kaufmann
d6c2e52d63 Demote consequence of not having C++11 support 
This module sets individual flags for each feature; there is not one
"CXX11Features_FOUND" flags which is set. Thus, when putting the
module as REQUIRED, the only consequence is that we cannot disable
searching for it.

Instead, we make it optional, meaning that the flags won't get set if
it isn't included and the dependent modules will adjust accordingly.
 2013-05-22 20:50:59 +02:00
totto82
1c904aa451 Add new fluid interface 
- in progress
 2013-05-22 12:57:18 +02:00
Atgeirr Flø Rasmussen
7ee481a601 Merge pull request #242 from rolk/242_callback 
Let external objects observe individual timesteps in a simulation
 2013-05-22 03:46:02 -07:00
Atgeirr Flø Rasmussen
221bc7a468 Added wellRates() member. 2013-05-21 23:54:30 +02:00
Atgeirr Flø Rasmussen
cfb4cf459d Merge pull request #243 from rolk/243_single 
Try singular name if plural not defined
 2013-05-16 05:21:48 -07:00
Roland Kaufmann
56ff7975f0 Include possibility that uppercase is used 2013-05-16 13:26:33 +02:00
Tor Harald Sandve
268a810eb3 Merge branch 'master' of git://github.com/OPM/opm-core 2013-05-16 12:11:02 +02:00
Bård Skaflestad
9401a482d6 Merge pull request #244 from atgeirr/add-phaseusage-to-interface 
Add phaseUsage() to BlackoilPropertiesInterface
 2013-05-16 02:21:11 -07:00
Roland Kaufmann
26475f448b Try singular name if plural not defined 
In CMake "canon" (i.e. tutorial on Kitware's website) it is stated that
the _DIR suffix should be used for the directory of the library alone,
whereas _DIRS are entire list of paths necessary to compile (i.e.
dependencies are included).

Eigen3 only uses the singular form (since it doesn't have any
dependencies); it should really be copied to the plural form, but it may
be advantageous to have the find-module included unchanged, so we put in
an extra effort to find it here.
 2013-05-16 10:58:24 +02:00
Roland Kaufmann
5644611dfd Provide template functions in separate header 
Template functions must be defined in the header since the library
cannot contain generic code. To keep only the interface in the main
header, all such function bodies are put in a separate _impl file.
 2013-05-15 21:32:32 +02:00
Atgeirr Flø Rasmussen
18a3c7fc91 Merge remote-tracking branch 'upstream/master' into add-phaseusage-to-interface 2013-05-15 10:10:18 +02:00
Roland Kaufmann
05636c70c7 Subtract time spend in callbacks from total 
Since this is not time spent on the simulation itself, it is "unfair"
that this is accounted on the simulator.
 2013-05-14 11:38:09 +02:00
Roland Kaufmann
1ae1405c21 Notify callbacks when a timestep has completed 
Client code can do additional processing for the output of each
timestep.
 2013-05-14 11:36:13 +02:00
Bård Skaflestad
7add6048cc Merge pull request #240 from atgeirr/tof-improvements 
Ensure (average of) tracers sum to one for DG1.
 2013-05-14 02:28:21 -07:00
Roland Kaufmann
34acf3ecd0 Make implementation class "package" visible 
Since a definition of the class is not in the header, no other
compilation units can safely access the internals of the Impl class
anyway, so it may as well be a regular struct so that the outer class
(SimulatorIncompTwophase) can access it.
 2013-05-14 11:11:18 +02:00
Atgeirr Flø Rasmussen
9f927ca6df Merge pull request #241 from bska/double-refpress 
Always interpret 'ref_pressure' as a double
 2013-05-14 01:40:13 -07:00
Bård Skaflestad
53b082af28 Always interpret 'ref_pressure' as a double 
Otherwise, when specifying (e.g.)

   ref_pressure=1.0e-5

(1 Pascal in bars), the value gets reinterpreted as

   ref_pressure=1

which is one bar.
 2013-05-14 10:19:12 +02:00
Tor Harald Sandve
80ec30c22f Merge branch 'master' of git://github.com/OPM/opm-core 2013-05-14 08:21:13 +02:00
Atgeirr Flø Rasmussen
6d1b47e419 Merge pull request #238 from rolk/238_dtd 
Provide DTD schema to describe parameter file format
 2013-05-13 07:21:38 -07:00
Atgeirr Flø Rasmussen
280bf30a26 Add phaseUsage() method to BlackoilPropertiesInterface. 
Also implement method in derived classes.
 2013-05-13 16:20:00 +02:00
Atgeirr Flø Rasmussen
238bd6b891 Ensure (average of) tracers sum to one for DG1. 2013-05-13 16:17:41 +02:00
Bård Skaflestad
7db46d507f Merge pull request #239 from rolk/239_stlcheck 
Probe for library without using STL
 2013-05-13 02:44:52 -07:00
Roland Kaufmann
229cf6d134 Probe for library without using STL 
If dune-grid has been compiled with _GLIBCXX_DEBUG, linking the test
program will fail since probing doesn't get the flags that are specified
for the main project, and thus configuration halts. Instead, we use a
smaller test program which doesn't need proper STL linkage to compile
and link.
 2013-05-13 11:28:37 +02:00
Roland Kaufmann
0fb4f14b28 Provide DTD schema to describe parameter file format 
Notice that this definition specifies a superset of the actual format
as the ParameterGroup tag is context-dependent (which cannot be captured
by DTD schemata).
 2013-05-13 10:50:22 +02:00
Atgeirr Flø Rasmussen
1d5e210822 Merge pull request #235 from joakim-hove/ert-master 
Minor update to build opm-core with current ert master
 2013-05-02 13:24:27 -07:00
Joakim Hove
1281d17b60 Changed writeECLDate() to write UNFORMATTED restart files. 2013-05-02 19:06:43 +02:00
Joakim Hove
a6e3bbd610 Updated calls to ecl_util_fmt_file() - result is by reference 2013-05-02 19:04:09 +02:00
Bård Skaflestad
0ed065586a Merge pull request #234 from atgeirr/tof-improvements 
New and improved capabilities for time-of-flight and tracer partitioning computations.
 2013-04-24 23:24:37 -07:00
Atgeirr Flø Rasmussen
61829dd238 Added limiter for tracer. 2013-04-24 11:27:04 +02:00