OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,369 Commits 9 Branches 35 Tags
057b5071c992c3b3657d215b0738f026519e69f5
Commit Graph
2369 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Kaufmann 057b5071c9 Ignore binaries from new examples and tests 2012-10-11 13:25:25 +02:00
Roland Kaufmann 45c21f4fe0 Remove superfluous dependencies to SuperLU and BLAS 2012-10-11 13:25:10 +02:00
Roland Kaufmann 12f9bc5dbd Link compute_tof example to boost::filesystem 2012-10-10 23:57:36 +02:00
Bård Skaflestad cde0e93a33 Merge pull request #60 from atgeirr/master 
A small collection of bugfixes
 2012-10-10 11:03:03 -07: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
Bård Skaflestad a62715d36b Merge pull request #57 from atgeirr/reorder_tof 
Initial versions of time-of-flight solvers

A welcome addition to OPM-Core
 2012-10-09 11:02:59 -07:00
kristinf 16dc071bca sign error in total_produced 2012-10-09 15:23:56 +02:00
Atgeirr Flø Rasmussen 643d54ef33 Merge pull request #56 from blattms/superlu-support 
Superlu support with fix for issue OPM/opm-core#54
 2012-10-09 03:25:22 -07:00
Atgeirr Flø Rasmussen ae04319fa3 Whitespace cleanup. 2012-10-09 12:21:17 +02:00
Atgeirr Flø Rasmussen 22cb94415c Fix comment. 2012-10-09 10:02:47 +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
Markus Blatt 434acc444b Merge remote-tracking branch 'upstream/master' into superlu-support 
to get the latest changes.
 2012-10-09 09:53:24 +02:00
Markus Blatt b0d2bfa560 Added missing files that should be ignored (*.mod files generated by gfortran and two test executable). 2012-10-09 09:53:03 +02:00
Markus Blatt 33ce431875 renamed DUNE_PATH_SUPERLU to OPM_PATH_SUPERLU such that the test within DUNE is not overwritten in other DUNE modules. 2012-10-09 09:48:14 +02:00
Atgeirr Flø Rasmussen ca71fe5132 Merge branch 'master' into reorder_tof 2012-10-08 16:16:05 +02:00
Markus Blatt 85194789aa Pipe to /dev/null to prevent error message from appearing in include path. 2012-10-08 15:34:25 +02:00
Atgeirr Flø Rasmussen 7de73782bf Merge pull request #53 from atgeirr/well-bugfix 
Well bugfix
 2012-10-08 05:40:31 -07: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
Alf Birger Rustad 6014eb347e Merge pull request #51 from atgeirr/master 
Update README with info about building opm-core as a dune module

Thanks, it clarifies the build options. I can try to improve further on it if I find time. However, I am afraid contract work will consume me in the coming weeks.
 2012-10-08 03:12:09 -07:00
Atgeirr Flø Rasmussen 927f33349d Add info about building as a dune module. 2012-10-08 11:35:32 +02:00
Atgeirr Flø Rasmussen cdffe6cf35 Merge pull request #48 from blattms/superlu-support 
Superlu support
 2012-10-08 02:19:01 -07:00
Markus Blatt a953a47fbb Removed DUNE artefacts. 
Now uses AX_BLAS instead of ACX_BLAS.
 2012-10-08 10:55:53 +02:00
Atgeirr Flø Rasmussen d799898aec Merge pull request #50 from bska/link-boost-explicitly-where-needed 
Link Boost.Filesystem Explicitly Where Needed.
 2012-10-08 00:53:39 -07:00
Atgeirr Flø Rasmussen 4b70a08cac Merge pull request #47 from bska/expand-well-treatment 
Expand Well Treatment
 2012-10-08 00:18:37 -07:00
Markus Blatt 4529673c76 Adapted my changes to the changes Bard made, to make opm-core link on Debian. 2012-10-05 15:01:30 +02:00
Markus Blatt 35c657d9a0 Merge remote-tracking branch 'bard/link-boost-explicitly-where-needed' into superlu-support 
This fixes the errors on Debian when linking the examples.
 2012-10-05 14:14:52 +02:00
Markus Blatt 9d0f385e02 Make opm-core compile with boost on my Debian system 2012-10-05 12:28:13 +02:00
Bård Skaflestad 5e8f87d4fa Link Boost.Filesystem explicitly where needed. 
While libopmcore, following commit 37e14f, depends on (and references)
Boost.Filesystem (through the $(BOOST_FILESYSTEM_LIB) macro) this
indirect dependency is not sufficient to satisfy the requirements of
targets that use the indirect libraries directly.

Additional details at
   https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
 2012-10-05 12:07:13 +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
Markus Blatt 0db6439b9b Merged latest changes from upstream branch 2012-10-05 10:11:31 +02:00
Atgeirr Flø Rasmussen 5b6dd72cc2 Merge branch 'master' into reorder_tof 2012-10-05 09:20:37 +02:00
Atgeirr Flø Rasmussen e79dba2714 Merge pull request #43 from bska/revamp-build-system-for-boost 
Revamp Build System for Boost
 2012-10-04 23:38:09 -07:00
Atgeirr Flø Rasmussen b2ce32b329 Merge pull request #42 from bska/read-grid 
Grid Input Support
 2012-10-04 23:30:46 -07:00
Atgeirr Flø Rasmussen f852ddba53 Merge pull request #44 from bska/tighten-lapack-and-mex 
Tighten LAPACK and MEX Support

Good! I will make similar changes to LAPACK usage in opm-polymer.
 2012-10-04 23:22:35 -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
Bård Skaflestad 203728109f Honour exact interfaces of LAPACK routines. 
The size type, MAT_SIZE_T, is not necessarily equivalent to 'int'.
 2012-10-05 00:54:33 +02:00
Bård Skaflestad 8a3593c372 Unequivocally exclude MATLAB timing printing. 
It is not actually needed and prevents building when symbol
MATLAB_MEX_FILE is defined.
 2012-10-05 00:53:59 +02:00