OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,171 Commits 9 Branches 35 Tags
7ccbf3597f88bfc1936fcd5805b96547c2e82335
Commit Graph

324 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
410a9b73e2 Changed #ifdef HAVE_... to #if HAVE_... 2013-03-19 13:33:07 +01:00
Atgeirr Flø Rasmussen
9a2f2c48fd Fixed conditional compilation issues with UMFPACK. 
This should fix the issue reported in #208 introduced in #203.
 2013-03-19 10:30:27 +01:00
Atgeirr Flø Rasmussen
b32674f3ea Moved ColumnExtract and initState. 
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
 2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen
d7353145c1 Update to follow previous moves and deletes. 2013-03-18 12:40:34 +01:00
Atgeirr Flø Rasmussen
2405758e2d Renamed newwells.h -> wells.h. 
Also moved implementation file to subdir.
 2013-03-18 10:33:34 +01: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
6cdcff0ae3 Removed unused example applications. 
Actually, the program spu_2p is the only place the class GravityColumnSolver
is currently used, and it is also the only program capable of doing an operator
splitting with gravity segregation being solved by full Newton-Raphson (not by
columns). These features should be made available by refactoring the transport
solvers: making the segregation solvers inherit TransportSolverTwophaseInterface
and creating a general composite solver.
 2013-03-15 15:13:01 +01:00
Atgeirr Flø Rasmussen
8c47ad970f Removed unneeded simulator class, renamed a simulator. 2013-03-15 14:22:26 +01:00
Atgeirr Flø Rasmussen
f6853b2c2b Use the flexible simulator class. 
No longer just the reordering one.
 2013-03-15 14:18:41 +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
c23898efa7 Merge remote-tracking branch 'hnil/hnil_class' into combined. 
Conflicts:
	CMakeLists.txt
	examples/sim_wateroil.cpp
	opm/core/grid/cpgpreprocess/geometry.c
	opm/core/transport/reorder/ReorderSolverInterface.hpp
	opm/core/transport/reorder/TofDiscGalReorder.cpp
	opm/core/transport/reorder/TofDiscGalReorder.hpp
	opm/core/transport/reorder/TofReorder.cpp
	opm/core/transport/reorder/TofReorder.hpp
	opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
	opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
 2013-03-14 16:18:39 +01:00
Atgeirr Flø Rasmussen
6e48999ede Removed unused SimpleFluid and SimpleFluid2pWrapper classes. 2013-03-14 13:33:26 +01:00
Atgeirr Flø Rasmussen
9667d9a730 Removed sim_wateroil example. 
This program is inferior to sim_2p_comp_reorder and has no features
unique to itself.
 2013-03-14 13:20:41 +01:00
Atgeirr Flø Rasmussen
34f523339d Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
c2a7ce9a45 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
25867007ed Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Roland Kaufmann
b53a6bf2df Remove Autotools 2013-02-12 00:18:24 +01:00
Bård Skaflestad
9d2191dd37 Catch up to changing location of ERT headers. 2013-02-05 15:20:12 +01:00
Atgeirr Flø Rasmussen
c3f9e64c9c Complete separation of basis func classes. 
Also:
 - Add use_tensorial_basis parameter allowing run-time choice of basis.
 - Remove degree argument from solveTof() method, degree is instead obtained
   from parameters in constructors. Modified compute_tof* programs to match.
 2013-01-16 15:13:45 +01:00
Atgeirr Flø Rasmussen
67fc1074de Change constructor to take ParameterGroup argument. 
Also make tof to limit against >= 0.0, for case when upstream cell values go
below zero.

Disabled some debug output.
 2013-01-08 13:14:26 +01:00
Atgeirr Flø Rasmussen
990a944711 Added parameter compute_tracer. Defaults to false. 
Triggers tracer computation and output, in addition to time-of-flight.
 2013-01-03 14:08:09 +01:00
Atgeirr Flø Rasmussen
668aba9942 Added limiter for DG1, parameter 'use_limiter'. 
The limiter is experimental and unfinished, untested work in progress.
Limiter is therefore inactive by default.

Also fixed a minor bug: use_cvi_ was not initialized.
 2012-12-18 14:15:31 +01:00
Atgeirr Flø Rasmussen
205f8c887b Changed interface of writeECLData(). 2012-11-26 10:51:20 +01:00
Halvor Møll Nilsen
b6301d37e0 Corrected include statements after renaming files. 2012-11-16 16:24:54 +01:00
Halvor Møll Nilsen
a30e42b962 Changes to try to make naming and classes more consistent. This is a start to make devide models and tranport solvers so that VE models is more easely handled 2012-11-15 13:20:49 +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
Joakim Hove
5c81635563 Minor fix to import_rewrite when rewrite is run in current directory. 2012-11-06 15:16:01 +01:00
Atgeirr Flø Rasmussen
386b4e4942 Add use_multidim_upwind parameter. 2012-10-30 10:32:29 +01:00
Atgeirr Flø Rasmussen
ca351e716d Change transport timer use to include construction time. 
Also minor mods to be more similar to compute_tof_from_files.cpp
 2012-10-30 10:31:30 +01:00
Atgeirr Flø Rasmussen
69832375d2 Merge branch 'tof_utilities' into multidim_upwind 2012-10-30 10:25:23 +01:00
Atgeirr Flø Rasmussen
020f452a28 Added parameters for controlling use of multidim upwinding. 
For now, you will simply get SPU even with use_multidim_upwind=true.
 2012-10-29 17:23:17 +01:00
Atgeirr Flø Rasmussen
20c1567eca Increased number of digits in output. 2012-10-29 08:27:59 +01:00
Atgeirr Flø Rasmussen
9152d78405 Added new tof computation utility. 
This program assumes that grid, porosity, flux field and sources are
available to read from files. It does not compute any flux field itself.
 2012-10-25 14:47:26 +02:00
Bård Skaflestad
f8a11ef7e1 Staticise a file-local function. 
It is not needed outside this function.  We should, arguably, be using
an anonymous namespace in this case.
 2012-10-23 14:36:13 +02:00
Bård Skaflestad
b334dbcdd8 Remove a shadowed variable. 
This variable (ecl_kw) was only needed in an inner scope and re-declared
there.
 2012-10-23 14:33:30 +02:00
Joakim Hove
0c0ee4b4a8 Added some comments + error checking 2012-10-23 13:02:48 +02:00
Joakim Hove
cab0872048 Added HAVE_ERT compile guard in examples/Makefile.am 2012-10-23 09:43:02 +02:00
Joakim Hove
9db7ce3647 examples/import_rewrite now recursively follows INCLUDE files 2012-10-23 09:42:28 +02:00
Joakim Hove
ac48c44712 Fixed name in examples/Makefile.am 2012-10-22 17:31:32 +02:00
Joakim Hove
00dc06f074 Added example/import_rewrite 2012-10-22 17:17:16 +02:00
Atgeirr Flø Rasmussen
7cf412340b Use new velocity interpolation interface. 
The class TransportModelTracerTofDiscGal now uses
VelocityInterpolationInterface, and acts as a factory
internally, choosing an interpolation method depending on
the parameter 'use_cvi'.
 2012-10-16 11:11:33 +02: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
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
Atgeirr Flø Rasmussen
22cb94415c Fix comment. 2012-10-09 10:02:47 +02:00
Atgeirr Flø Rasmussen
43335dfce3 Merge branch 'master' into reorder_tof 2012-10-08 13:52:59 +02: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