Commit Graph

76 Commits

Author SHA1 Message Date
Tor Harald Sandve
a8261b62da Add sat table id to well struct 2017-04-06 13:52:27 +02:00
Kai Bao
a0e1fcf89d function for accumulative efficiency factor for WellNode
This is the final efficiency factor that goes to the source/sink terms
in the material balance equations.
2016-11-10 16:28:40 +01:00
Andreas Lauser
07707ecc30 consolidate the unit system to opm-parser
since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.

unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
2016-10-10 17:50:26 +02:00
Kjell W. Kongsvik
77a6c4229a Replace comment with "ifdef DISABLE_OUTPUT" 2016-03-29 14:57:58 +02:00
Kjell W. Kongsvik
9febba59a4 Commented out usage of OutputWriter in tutorials 2016-03-29 14:56:24 +02:00
Joakim Hove
c360079926 Replaced SimulatorState -> SimulationDatacontainer
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
2016-03-29 10:44:49 +02:00
Joakim Hove
6c5fae2f9d Added free function initSaturation().
The state argument is of type SimulatorState& - and no longer a template
parameter.
2016-02-22 22:03:41 +01:00
Joakim Hove
a214c10595 Changes in SimulatorState:
1. Added method setCellDataComponent()
 2. Removed setFirstSat()

Implemented saturation initialisation using setCellDataComponent()
instead of setFirstSat(). This way the template<class Props> has been
removed from the SimulatorState class.
2016-02-22 08:42:04 +01:00
Joakim Hove
ba1c06d415 Removed SimulatorState::init( UnstructureGrid& ) 2016-01-25 07:30:03 +01:00
Tor Harald Sandve
80cdb6bbf0 Add boolean flag to determine whether crossflow is allowed in a well
This PR adds allow_cf to the wells structure that determine whether
crossflow is allowed or not. An extra argument is added to addWell(..)
to specify the allow_cf flag.
2015-10-06 15:54:20 +02:00
Arne Morten Kvarving
d2b47b2ec2 added: build system for tutorials 2014-06-23 10:48:32 +02:00
Arne Morten Kvarving
e137eb3d16 fixed: tutorials should include config.h conditionally 2014-06-23 09:53:52 +02:00
Andreas Lauser
5d435d396c catch all exceptions in all tutorials and examples 2013-09-05 13:04:38 +02:00
Andreas Lauser
19e5d5cea2 convert THROW to OPM_THROW 2013-09-05 13:04:37 +02:00
Andreas Lauser
70949c6edb use std::shared_ptr instead of boost::shared_ptr
our policy is that we only use boost if necessary, i.e., if the oldest
supported compiler does not support a given feature but boost
does. since we recently switched to GCC 4.4 or newer, std::shared_ptr
is available unconditionally.
2013-08-08 13:25:58 +02:00
Júlio Hoffimann
8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Júlio Hoffimann
e45313e918 Purge unused variable in tutorial 4 2013-07-26 11:42:24 -03:00
Bård Skaflestad
d332129676 Merge pull request #274 from blattms/non-tr1
Changed std::tr1 occurences to boost.
2013-07-04 12:01:51 -07:00
Markus Blatt
68eb3fbcb1 Changed std::tr1 occurences to boost.
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
2013-07-04 16:04:35 +02:00
Roland Kaufmann
1998e98a00 Use natural names instead of mathematical notation 2013-06-28 13:44:15 +02:00
Roland Kaufmann
405a6b021c Sink should match source
Although it already does numerically, this make is more explicitly
clear.
2013-06-28 13:40:22 +02:00
Roland Kaufmann
0e456909e6 Use a more realistic injection rate
In addition, this also shows how to use the units to specify the
measure.
2013-06-28 13:20:09 +02:00
Roland Kaufmann
6a7a9541f4 Give a name to the porosity
Mostly one would assume that this would be the porosity since that's the
only non-named argument, but stating this explicitly saves us from one
trip to the manual.
2013-06-28 13:08:16 +02:00
Andreas Lauser
7ed3fe69c0 Fix a few doxygen issues with the tutorials 2013-04-15 18:59:55 +02:00
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