OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,482 Commits 9 Branches 35 Tags
37d54be703e94e54c4daec8ed4549817d31a5eec
Commit Graph

1099 Commits

Author SHA1 Message Date
Bård Skaflestad
37d54be703 Merge branch 'master' into gravity-in-wells 2012-10-18 10:58:28 +02:00
Atgeirr Flø Rasmussen
3a61778066 Reinstate disabled test. Assert more. 2012-10-18 10:51:12 +02:00
Bård Skaflestad
011fe02f59 Merge branch 'master' into gravity-in-wells 2012-10-17 22:10:14 +02:00
Atgeirr Flø Rasmussen
dcee95ec96 Fix support for velocity interpolation in 2d. 2012-10-17 21:30:53 +02:00
Bård Skaflestad
a593efb1ea Merge branch 'master' into gravity-in-wells 2012-10-17 13:30:37 +02:00
Atgeirr Flø Rasmussen
f9efd72ecc Fix output in case of LAPACK error. 
Make copy of matrix before calling dgesv, since it will overwrite it.
 2012-10-17 12:40:43 +02:00
Atgeirr Flø Rasmussen
30797cae1d Implement setupFlux() method. 
Also fix bug related to face orientation in cartToBaryWachspress().
 2012-10-17 11:16:42 +02:00
Bård Skaflestad
beae475787 Don't compare floating point numbers for equality. 2012-10-16 21:48:38 +02:00
Atgeirr Flø Rasmussen
ab910f3778 Finished VelocityInterpolationECVI constructor. 
Untested so far.
 2012-10-16 20:19:17 +02:00
Bård Skaflestad
b400397389 Update documentation accompanying CompletionData structure. 
Specifically, the 'wdp' member is a scalar value at each well
connection.  Phase behaviour is incorporated through other means.
 2012-10-16 14:05:33 +02:00
Bård Skaflestad
1b63e27899 Rename CompletionData::gpot -> wdp . 
This is in preparation of implementing actual gravity support in
(compressible) well-pressure solution.
 2012-10-16 13:55:07 +02:00
Atgeirr Flø Rasmussen
7cf412340b Use new velocity interpolation interface. 
The class TransportModelTracerTofDiscGal now uses
VelocityInterpolationInterface, and acts as a factory
internally, choosing an interpolation method depending on
the parameter 'use_cvi'.
 2012-10-16 11:11:33 +02:00
Atgeirr Flø Rasmussen
121bb79f91 New abstract class VelocityInterpolationInterface. 
Also, two initial subclasses: VelocityInterpolationConstant
and VelocityInterpolationECVI. The latter is still a work in
progress.
 2012-10-16 11:07:05 +02:00
Bård Skaflestad
7b793f98c6 Document public interface of compr_source module. 
This is Doxygen-style reference documentation only.
 2012-10-15 19:49:23 +02:00
Bård Skaflestad
efb381a9a1 Reformat to add Doxygen markup where appropriate 2012-10-15 19:15:31 +02:00
Bård Skaflestad
c414ddad5d Document public interface of compr_quant_general module 
This is Doxygen-style reference documentation only.
 2012-10-15 16:08:17 +02:00
Bård Skaflestad
e2a7d65c94 Merge branch 'master' into gravity-in-wells 2012-10-15 15:22:13 +02:00
Bård Skaflestad
601d5f3999 Document public interface of cfs_tpfa_residual module 
This is Doxygen-style reference documentation only.
 2012-10-15 15:21:27 +02:00
Bård Skaflestad
db77953c39 Suppress warning about unused variable in !HAVE_ERT case. 2012-10-14 17:55:51 +02:00
Bård Skaflestad
3e95330e25 Merge branch 'ert' 2012-10-12 14:50:23 +02:00
Atgeirr Flø Rasmussen
863eae3368 Hook IMPORT keyword to function reading binary input. 
Make sure it compiles and links both with and without ert.
 2012-10-12 14:25:53 +02:00
Atgeirr Flø Rasmussen
89750d856a Merge remote-tracking branch 'bspj/master' into ertekrok 2012-10-12 13:05:31 +02:00
Bård Skaflestad
3a34c2a8dc Merge remote-tracking branch 'origin/ert' into ert 
Conflicts:
	Makefile.am
 2012-10-12 11:04:20 +02:00
Bård Skaflestad
1a0eeb47ba Merge remote-tracking branch 'upstream/ert' into ert 
Conflicts:
	Makefile.am
 2012-10-12 10:58:16 +02:00
Atgeirr Flø Rasmussen
27b8314521 Rename function argument and variable. 
rock_comp -> rock_comp_props
 2012-10-12 09:21:52 +02:00
Bård Skaflestad
31174cf727 Merge remote-tracking branch 'upstream/master' into ert 
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.
 2012-10-12 00:43:51 +02:00
Atgeirr Flø Rasmussen
6f4775df9c Improve comment. 2012-10-10 19:23:11 +02:00
Atgeirr Flø Rasmussen
38b62d23f5 Fix bug in GCONINJE input. 2012-10-10 14:16:11 +02:00
Atgeirr Flø Rasmussen
2ded7e7dfe Table interpolation for default values improved. 
If there were no non-defaulted elements in the table, we would crash.
Now, all defaulted elements get the value 0.0 instead.

The usage pattern was encountered for the capillary pressure column
of a SWOF table.
 2012-10-10 14:13:13 +02:00
Atgeirr Flø Rasmussen
0243aebcfa Fix comment. 2012-10-10 14:12:38 +02:00
Atgeirr Flø Rasmussen
f5359936e0 Bugfix: order of function arguments. 
Order of arguments for computePhaseFlowRatesPerWell() was wrong.
This fix was done previously for SimulatorCompressibleTwophase,
but the incompressible sim was ignored.

Also added an ASSERT that may help catch some misuse.
 2012-10-10 14:09:09 +02:00
Atgeirr Flø Rasmussen
d124a71ee6 Merge pull request #59 from kristinf/dev 
sign error in total_produced

Looks correct.
 2012-10-10 04:49:06 -07:00
kristinf
16dc071bca sign error in total_produced 2012-10-09 15:23:56 +02:00
Atgeirr Flø Rasmussen
ae04319fa3 Whitespace cleanup. 2012-10-09 12:21:17 +02:00
Atgeirr Flø Rasmussen
f761e73eae Improve docs and give more info on error. 2012-10-09 09:54:54 +02:00
Atgeirr Flø Rasmussen
d1be859828 Add timing of topological sort. 2012-10-09 09:54:26 +02:00
Atgeirr Flø Rasmussen
ca71fe5132 Merge branch 'master' into reorder_tof 2012-10-08 16:16:05 +02:00
Atgeirr Flø Rasmussen
9de3b03e69 Fix sign of production rate controls. 
In the Wells struct, production rate control targets must be negative
(and injection rate control targets are always positive).
In the WellsGroup classes, there are separate variables for injection
and production, and all rates are positive. Therefore, upon adding or
modification of a production rate control, the negated value must
be used.
 2012-10-08 14:27:56 +02:00
Atgeirr Flø Rasmussen
52d97cfc1c Fix order of arguments in function call. 
Rate and fractional flow were switched in call
to computePhaseFlowRatesPerWell().
 2012-10-08 14:26:46 +02:00
Atgeirr Flø Rasmussen
43335dfce3 Merge branch 'master' into reorder_tof 2012-10-08 13:52:59 +02:00
Bård Skaflestad
e6ab4ec4c8 Add debugging assertions to check input in several routines. 2012-10-05 10:17:12 +02:00
Bård Skaflestad
fde2d25c86 Clone wells object when constructing from existing. 
This installs a measure of safety on the part of the interface in that
the caller is free to dispose of the wells object upon returning from
the WellsManager constructor.
 2012-10-05 10:15:06 +02:00
Halvor Møll Nilsen
e913456fa6 Added constuctor to WellManager which used Wells struct. 2012-10-05 10:14:55 +02:00
Bård Skaflestad
47ab22fce0 New function clone_wells() 
Used to create a deep copy (clone) of an existing Wells object.

While here, add test case for common Wells object operations.
 2012-10-05 10:14:44 +02:00
Atgeirr Flø Rasmussen
5b6dd72cc2 Merge branch 'master' into reorder_tof 2012-10-05 09:20:37 +02:00
Atgeirr Flø Rasmussen
2c8b47b143 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
 2012-10-05 09:20:04 +02:00
Atgeirr Flø Rasmussen
b2ce32b329 Merge pull request #42 from bska/read-grid 
Grid Input Support
 2012-10-04 23:30:46 -07:00
Bård Skaflestad
811bfa7712 Remove MEX support. 
This has not been used in a long time, and actually prevents using the
module in MEX.
 2012-10-05 00:56:25 +02:00
Bård Skaflestad
5c9c9b9c59 Reference <grid.h> from canonical location. 
The header was removed from this directory upon import from the
preexisting "opmtransport" repository.
 2012-10-05 00:56:12 +02:00
Bård Skaflestad
6fd5c36cc9 Remove a derelict statement inherited from original implementation. 
Disabled by default, this statement attempted to pass a std::istream to
function std::fclose() which is meaningless and should not be enabled at
any time--even for a MATLAB-related build.
 2012-10-05 00:55:14 +02:00