Commit Graph
3355 Commits
Author SHA1 Message Date
Bård Skaflestad 6afd914756 Merge pull request #262 from blattms/unify-amg-calls
Unify amg calls
2013-06-21 04:01:03 -07:00
Markus Blatt 4f41c2ac72 Fixed unused parameters and whitespace issues. 2013-06-21 12:49:35 +02:00
Markus Blatt b3f24972cc Fixed spelling 2013-06-20 17:01:35 +02:00
Markus Blatt c87b98abbb Unifies the way how AMG is called.
After this patch one can set the prolongation factor for all
AMG calls and the number of smoothing steps for all except
of FastAMG that currently only supports on step.
2013-06-20 16:55:07 +02:00
Markus Blatt 97b8203773 Merge remote-tracking branch 'upstream/master' 2013-06-20 16:07:58 +02:00
Bård Skaflestad 2b4298f366 Merge pull request #261 from rolk/261_parse
Sideport of OPM/opm-material@48f6d4d to opm-core
2013-06-20 04:55:27 -07:00
Bård Skaflestad e3577085c2 Add CMake backwards compatibility for version < 2.8.3
Add features that aren't available in early versions of the 2.8.x
release series, enabling use of 2.8.0 if needed (e.g. Ubuntu 10.04)
2013-06-20 13:30:57 +02:00
Bård Skaflestad 79b180976f Merge pull request #260 from rolk/260_auto
Sideport of OPM/opm-material@7298744 to opm-core
2013-06-20 04:27:49 -07:00
Andreas Lauser 8f6df1ebf9 Test if the auto keyword is supported 2013-06-20 13:22:02 +02:00
Andreas Lauser 20fcad55c5 Fixed spelling mistake 2013-06-20 13:20:58 +02:00
Markus Blatt 4c49da33ad Merge remote-tracking branch 'origin/master' 2013-06-19 14:56:34 +02:00
Markus Blatt 5072014198 Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/linalg/LinearSolverIstl.cpp
2013-06-19 14:55:50 +02:00
Markus Blatt a5313ec301 Merge remote-tracking branch 'upstream/master' 2013-06-18 10:48:28 +02:00
Bård Skaflestad 4273ce4dd3 Merge pull request #259 from rolk/259_withwarn
Recognize lib dirs that may be used later
2013-06-17 04:54:55 -07:00
Roland Kaufmann 4cd16438ea Recognize lib dirs that may be used later
This let you specify a bunch of directory names on the command line
to *all* packages, without getting annoying warnings that they are
defined but not used.
2013-06-15 22:11:14 +02:00
Bård Skaflestad 2c85189c6c Merge pull request #258 from rolk/258_nolto
Disable link-time, whole program optimization
2013-06-14 01:10:56 -07:00
Bård Skaflestad 28406d287d Include flag for enabling link-time optimizations
When LTO is disabled by default, we need a flag to re-enable it.
2013-06-14 08:54:32 +02:00
Roland Kaufmann bfeac75fa9 Disable link-time, whole program optimization
When using LTO, the linker calls back to the compiler to figure out
where a certain symbol is defined. However, in many versions there
is apparently a bug that is triggered if a template in inlined in
both a used library and in the main program, but with different
versions of the compiler. The Boost exception class is particular
prone for this.

Thus, we disable the -lto from the development builds by default;
if anyone wants to test of the behaviour of their own compiler, they
must now explicitly turn on this flag.
2013-06-13 23:19:27 +02:00
Bård Skaflestad 5cf50de0c5 Merge pull request #254 from totto82/newfluid2
A test for the blackoil fluid based on the [p,r] interface
2013-06-10 06:50:37 -07:00
Tor Harald Sandve e1e37c8b8c Merge pull request #1 from bska/totto82-newfluid2
Correct a few minor issues in PR OPM/opm-core#254
2013-06-10 06:45:41 -07:00
Bård Skaflestad 1b3670084f Merge pull request #255 from rolk/255_repo
Use science repo on SuSE, recommend ERT on Debian
2013-06-06 03:26:58 -07:00
Roland Kaufmann 0e814274d4 Provide instructions for installing ERT on SuSE
We just reuse the RedHat-repo containing precompiled libraries.
2013-06-06 10:03:50 +02:00
Roland Kaufmann 056e98716e Recommend ERT also on Debian
Using ERT will give a more full-featured toolkit, and we already
recommend adding the PPA repository.
2013-06-06 09:17:29 +02:00
Roland Kaufmann f853d8ad0a Get all SuSE packages from repo if necessary
For older OpenSuSE versions (12.1 comes to mind), the packages mentioned
here are only available in the repository and not the base distro, so we
should start out by adding it instead of doing it later in the process.
2013-06-06 09:06:10 +02:00
Bård Skaflestad f5d67fafc8 Favour std::vector<> over variably-sized arrays.
Variably-sized arrays of the form

   int n = 6;
   double a[n];

are an extension to the language that will illicit a suitably
persnickety diagnostic from GCC when invoked with "-pedantic".
2013-06-05 17:14:33 +02:00
Bård Skaflestad 61caec19d4 Merge pull request #248 from rolk/248_m4
Replace remnants of original autotools config with m4 that imports the CMake config
2013-06-05 07:43:13 -07:00
Bård Skaflestad f16b9f10e7 Mark deck as FIELD units.
The numbers in the deck are more indicative of FIELD unit conventions
than METRIC unit conventions, so allow the input parser to interpret
the data in that manner.
2013-06-05 12:24:23 +02:00
Bård Skaflestad fdf8a0ddcb Indent lists using <tab> rather than <space>.
This is the convention used throughout the .cmake files of OPM-Core.
2013-06-05 12:18:21 +02:00
Tor Harald Sandve a89b081ac0 A test that compares the blackoil fluid based on the [p,r] interface
with the blackoil fluid based on the [p,z] interface
2013-06-05 11:21:47 +02:00
Atgeirr Flø Rasmussen 4a3ba3f7d6 Merge pull request #252 from bska/dont-run-non-unit-tests
Dont run non unit tests
2013-06-03 08:19:28 -07:00
Bård Skaflestad 278a054019 Don't build/run "test_newfluidinterface.cpp" during "make test"
The executable is not written as a unit test (e.g., using Boost.Test)
and furthermore requires external data (in a very specific location).
This makes it inappropriate for use during "make test", but it could
(and should) be cleaned up and incorporated into the test portfolio at
a later time.
2013-06-03 17:07:53 +02:00
Bård Skaflestad f4588ff7b4 Merge remote-tracking branch 'upstream/master' 2013-06-03 17:05:04 +02:00
Bård Skaflestad 32091a5fc7 Merge pull request #251 from atgeirr/rockcomp
Add transMult(), poroMultDeriv() and transMultDeriv() to RockCompressibility.
2013-06-03 07:58:14 -07:00
Atgeirr Flø Rasmussen eac83e6fd2 Add transMult(), poroMultDeriv() and transMultDeriv(). 2013-06-03 14:33:18 +02:00
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
Roland Kaufmann 19780beef9 Compatibility module for dunecontrol-driven clients
If a client generated with duneproject/built with dunecontrol has a
dependency to opm-core, the macros defined in this file is expected
to exist and will be called to search for the opm-core library.

All that is done here is to use the pkg-config helper module and
import the configuration that was written by the CMake system (which
even may have been called earlier in the same dunecontrol "session")
2013-05-24 11:41:05 +02:00