Commit Graph

52 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
0a935774d2 Move GridManager to grid subdir.
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
2013-03-18 10:16:46 +01:00
Atgeirr Flø Rasmussen
b304105b4f Make initGravity() to private, call from constructor.
Also modify interface of solveGravity() to be minimal,
construcing columns for segregations solver at construction time.
2013-03-15 13:53:37 +01:00
Atgeirr Flø Rasmussen
e2afd671f0 Make TransportSolverTwophaseReorder inherit TransportSolverTwophaseInterface.
This changes the solve() interface, which requires clients to change.
2013-03-15 11:31:31 +01:00
Atgeirr Flø Rasmussen
4ef30e694d Modified for added files and changed class names. 2013-03-14 21:43:21 +01:00
Atgeirr Flø Rasmussen
34f523339d Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
2f99316d01 Merge remote-tracking branch 'upstream/release/2013.03' into make-io-subdir 2013-03-12 10:46:58 +01:00
Andreas Lauser
9e418e1779 tutorial: make the copyright notice disappear in the HTML
IMHO it is not useful there.
2013-03-08 12:26:42 +01:00
Atgeirr Flø Rasmussen
c2a7ce9a45 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Tor Harald Sandve
c2506c9fb2 code is now included using \snippet. Apparently this looks better with the new Doxygen version. The HTML_EXTRA_STYLESHEET is now used rather then the HTML_STYLESHEET in order to include used-defined styles for the same reason 2013-03-06 10:17:27 +01:00
Roland Kaufmann
b53a6bf2df Remove Autotools 2013-02-12 00:18:24 +01:00
Roland Kaufmann
52e0c6ceba Put figure generation program with number generation programs
Since the data files are generated by the tutorials, it is natural to
have the figure generation program also together with this source code;
otherwise people may think that it have to be used for *all* figures
2013-02-11 22:37:59 +01:00
Bård Skaflestad
55263da177 Fix build if ERT is installed in non-default location
The existing description did not properly account for ERT (or, more
appropriately, the "libecl" part of ERT) being installed in a
non-default location (e.g., somewhere below ${HOME}).

As EclipseGridParser.hpp declares various ERT-dependent types and
functions if a build configuration supports ERT (activated by the
`--with-ert' configure option), we need a proper include path to
reference the ERT headers.  The fix is simple--just insert the
$(ERT_CPPFLAGS) into the already existing $(AM_CPPFLAGS).
2012-11-08 13:59:19 +01:00
Roland Kaufmann
45c21f4fe0 Remove superfluous dependencies to SuperLU and BLAS 2012-10-11 13:25:10 +02:00
Markus Blatt
ae52de0426 Added test for SuperLU and adapted the Makefile.am to support it 2012-10-04 11:37:28 +02:00
Bård Skaflestad
6c35b9679b Don't clobber LDFLAGS user variable
Fix a misunderstanding that's been present since the inception.  The
LDFLAGS variable is entirely at the builder's disposal.  Flags needed
for system-internal settings must go in the AM_* equivalents.
2012-07-10 13:46:30 +02:00
Bård Skaflestad
6b57a00b17 Avoid Clobbering Dune's Boost Support.
When OPM-Core is used as a Dune module (e.g., as enabled by commit
789bc5ca7), we stand the risk of creating multiple, conflicting
defintions of crucial <config.h> symbols (e.g. `HAVE_BOOST') and
build variables (e.g., `BOOST_CPPFLAGS' and `BOOST_LDFLAG').

Avoid this situation by prefixing these symbols with an `OPM_'
string such that Dune's `ENABLE_BOOST' solution works as intendend
in modules that are derived in the OPM context.
2012-07-09 17:42:56 +02:00
Bård Skaflestad
9005e4353c Build the library in a lib/ sub-directory of $(builddir)
Suggested by: Andreas Lauser
2012-07-03 16:44:03 +02:00
Bård Skaflestad
0156c2d4f9 Dispose of "Wells" object at end of simulation.
Discovered by valgrind.
2012-06-18 10:16:28 +02:00
Bård Skaflestad
b8a6a14747 Add support for storing well names in "Wells" structure.
The well name must be passed as a parameter to add_well(), so update
callers accordingly.
2012-06-18 10:15:53 +02:00
Atgeirr Flø Rasmussen
5fa9b9e110 Initialise state variables. 2012-06-13 10:34:45 +02:00
Atgeirr Flø Rasmussen
92f1ce9b83 Examples and tutorials follow change to IncompTpfa interface. 2012-06-12 15:28:53 +02:00
Kjetil Olsen Lye
f554d478c6 Updated tutorial4 to use the reorder solver. 2012-06-11 13:13:19 +02:00
Atgeirr Flø Rasmussen
0551401bc6 Removed default null argument for wells in IncompTpfa constructor. 2012-06-07 13:34:05 +02:00
Xavier Raynaud
187957397c merge. 2012-06-06 15:19:02 +02:00
Xavier Raynaud
3881406d41 Corrected typo. 2012-06-06 15:16:07 +02:00
Atgeirr Flø Rasmussen
955b5ea068 Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
Atgeirr Flø Rasmussen
516ff3752c Remove superfluous tag. 2012-05-30 14:42:58 +02:00
Atgeirr Flø Rasmussen
99c5d4d267 Simplified and cleaned up tutorial. 2012-05-30 14:40:17 +02:00
Bård Skaflestad
637d10105b Coalesce all tutorials requiring UMPACK under single conditional. 2012-05-24 11:01:58 +02:00
Kjetil Olsen Lye
bfcc856d4b merge. 2012-05-16 17:00:09 +02:00
Kjetil Olsen Lye
415c6b650f created first draft of well tutorial 2012-05-16 16:58:05 +02:00
Atgeirr Flø Rasmussen
3d44427065 Follow changes to TwophaseState class and initState*() functions. 2012-05-16 12:54:12 +02:00
Kjetil Olsen Lye
4f7924bdb2 Created base for new wells tutorial 2012-05-15 10:53:13 +02:00
Atgeirr Flø Rasmussen
67e3d38bec Now computePorevolume() takes a porosity array instead of a property object.
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
2012-05-14 21:47:10 +02:00
Atgeirr Flø Rasmussen
41536d517b Small improvements to tutorial2. 2012-04-24 10:17:57 +02:00
Atgeirr Flø Rasmussen
c37bd27237 Improve a little on tutorial 1. 2012-04-23 16:43:31 +02:00
Xavier Raynaud
5da5b2e325 Removed warnings from compiler. 2012-04-18 14:33:44 +02:00
Xavier Raynaud
9bb4b2c51d Corrected typos. 2012-04-18 14:32:20 +02:00
Xavier Raynaud
156e88a7e2 Updated tutorials. 2012-04-17 17:24:19 +02:00
Xavier Raynaud
f9675df450 Added Doxygen comments in tutorials. 2012-04-16 17:54:42 +02:00
Xavier Raynaud
6b37e011ae Added Multiphase tutorial. 2012-04-16 17:50:29 +02:00
Kjetil Olsen Lye
f8b3a8c3f9 Fixed a warning, adjusted the tutorial to reflect the new solver interfacd 2012-04-13 13:41:23 +02:00
Bård Skaflestad
ca633d3323 Use correct syntax for Automake conditionals. 2012-04-12 21:13:57 +02:00
Bård Skaflestad
2065259764 Build the 'tutorial2' programme only if UMFPACK is present. 2012-04-12 18:39:51 +02:00
Bård Skaflestad
8002de23e4 Catch up to interface change of IncompTPFA::solve().
Revision 13e1ab7e1093 introduced well solution vectors (accessed only when
wells are present).  Update the method call accordingly to restore build.
2012-04-12 18:39:19 +02:00
Xavier Raynaud
5f43e97cc0 Added tutorial2 in Makefile. 2012-04-12 18:12:03 +02:00
Xavier Raynaud
bd2757670c Added second tutorial. 2012-04-12 18:09:06 +02:00
Xavier Raynaud
1143943b7f Minor changes. 2012-04-12 18:08:46 +02:00
Bård Skaflestad
ad36e05f8c Don't add per-target LDADD that are already implied by global LDADD. 2012-04-10 19:40:00 +02:00
Bård Skaflestad
6d7959869c M-x whitespace-cleanup . 2012-04-10 19:38:41 +02:00