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

2457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fde3565f63 Merge pull request #70 from rolk/expl-blas 
Make it harder to select wrong BLAS/LAPACK libraries
 2012-10-14 14:25:16 -07:00
Roland Kaufmann
1689074d4f Abort build process if BLAS or LAPACK not found 2012-10-14 21:58:28 +02:00
Roland Kaufmann
c8a52177bf Honor explicit specification of BLAS/LAPACK libraries 
Only probe for libraries on system if no library is specified. If there
is an error with the library that is specified as an argument, then
raise an error instead of continuing to look for other libraries with a
simple warning buried deep in the configuration log.
 2012-10-14 21:58:27 +02:00
Atgeirr Flø Rasmussen
279fbb8267 Merge pull request #68 from rolk/am-fix 
Very minor nitpicks in the build system
 2012-10-14 03:40:55 -07:00
Atgeirr Flø Rasmussen
efcec7aae5 Merge pull request #69 from alfbr/master 
Minor clean-up of README
 2012-10-14 03:40:39 -07:00
rustad
143da5a929 Added dependency for server edition and reference to ppa in build instructions. 2012-10-14 12:04:57 +02:00
Roland Kaufmann
3521a0bdc6 Use round parenthesis for Make variables 2012-10-14 10:19:35 +02:00
Roland Kaufmann
97e176f021 Add missing line continuation character 
When this is missing, any macros later defined for the SuperLU library
will "fall off" the list.
 2012-10-14 10:18:52 +02:00
Atgeirr Flø Rasmussen
81f8a9895d Merge pull request #67 from bska/master 
Merge ERT Branch
 2012-10-12 10:38:51 -07:00
Bård Skaflestad
3e95330e25 Merge branch 'ert' 2012-10-12 14:50:23 +02:00
Bård Skaflestad
b348a21833 Merge pull request #66 from atgeirr/implement_import 
Implement IMPORT keyword in EclipseGridParser
 2012-10-12 05:38:15 -07: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
0f549358a9 Squash warnings. 2012-10-12 14:23:55 +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
d6d7714747 Merge pull request #65 from atgeirr/rename_variable 
Rename function argument and variable.

Thanks.  This brings welcome clarity.
 2012-10-12 02:13:10 -07:00
Bård Skaflestad
2e937103dc Merge pull request #64 from bska/ert 
Bring ERT branch up-to-date with recent changes in master

Fix merge conflicts in the process.
 2012-10-12 02:09:56 -07:00
Bård Skaflestad
ce3b1d5e49 Merge branch 'master' into ert 2012-10-12 11:07:42 +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
5f4aac1da7 Merge pull request #63 from alfbr/master 
Dependency update for Ubuntu 12.04
 2012-10-11 15:54:53 -07: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
rustad
70aa2465d3 Added dune-grid as dependency since it is needed by several opm modules. 
Changed libxml0-dev to libxml2-dev since the former does not exist.
 2012-10-11 23:47:07 +02:00
Bård Skaflestad
09b2ecc5de Merge pull request #62 from rolk/master 
Add needed/remove unneeded linker dependencies
 2012-10-11 04:48:54 -07:00
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