OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,618 Commits 9 Branches 35 Tags 15 MiB
59205f2e65
Commit Graph

347 Commits

Author SHA1 Message Date
osae
89137e8cd0 Make use of EclipseState for EQLNUM and SWATINIT. 2014-06-26 14:46:57 +02:00
Andreas Lauser
0c47d27827 Glue in support for the grid property modifier keywords 
this basically means using Opm::EclipseState instead of the raw deck
for these keywords.

with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.

no ctest regressions have been observed with this patch on my machine.
 2014-06-11 13:48:49 +02:00
Andreas Lauser
f96417e81c rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2014-05-21 11:22:43 +02:00
Andreas Lauser
1d7ed18419 convert the examples and the tests to opm-parser 2014-04-25 14:25:54 +02:00
Andreas Lauser
3b2aa175d5 remove the import_rewrite example 
that one was quite specific to the old parser and would thus require
more work to convert to the opm-parser than what it is worth the
effort. If you _really_ want to keep this tool, ping me and I'll port
it...
 2014-04-25 14:25:54 +02:00
osae
d6a2696cbd New parser included. 2014-03-28 17:35:43 +01:00
osae
5df819d509 Merge branch 'master' of git://github.com/OPM/opm-core 
Conflicts:
	CMakeLists_files.cmake
 2014-03-26 14:51:06 +01:00
Joakim Hove
20468d1987 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2014-03-25 18:57:58 +01:00
Atgeirr Flø Rasmussen
a58faea9ab Added simple program example for initialisation. 2014-02-27 13:55:15 +01:00
Atgeirr Flø Rasmussen
9d0dd9c961 Removed unused argument from buildTracerHeadsFromWells(). 2014-02-05 15:03:35 +01:00
Bård Skaflestad
794673d7b4 Fix null-pointer dereference during well construction 
The three-argument WellsManager constructor needs access to the real
permeability field lest a null-pointer dereference result when the
problem actually contains any wells.
 2013-09-25 15:11:14 +02:00
Roland Kaufmann
13705d0394 Issue warning if unknown parameters are given 2013-09-19 13:10:16 +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
d11db08084 include iostream in the files which use std::cerr or std::cout 
for some of these files this is needed to make to keep it compiling
after the next patch because the new ErrorMacros.hpp file will no
longer implicitly includes <iostream>. for the remaining files it is
just good style.

While at it, the includes for most of these files have been ordered in
order of decreasing abstraction level.
 2013-09-05 13:04:37 +02:00
Andreas Lauser
bd094b2e11 replace boost::scoped_ptr by std::unique_ptr 
thanks to Bård Skaflestad, Atgeirr Rasmusen and Roland Kaufmann for
the hint.
 2013-08-08 15:21:38 +02:00
Júlio Hoffimann
8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Atgeirr Flø Rasmussen
da5ea0ccae Add call to DG tracer computations if user requests. 
Used to throw with an 'unimplemented' message.
 2013-04-24 10:40:56 +02:00
Atgeirr Flø Rasmussen
fd4ac88334 Minor fix: do not read tracer heads unless compute_tracer is true. 2013-04-23 09:54:52 +02:00
Atgeirr Flø Rasmussen
8b6faffe00 Work in progress on tracers. 
- Changed interface.
 - Read tracerheads (tracer start locations) from file in compute_tof_from_files.
 - Initialize tracerheads from wells in compute_tof.
 2013-04-22 14:02:45 +02:00
Atgeirr Flø Rasmussen
cf38c91f74 Removed experimental multi-cell solver code. 
Since the Gauss-Seidel approach seems to be both simplest and
fastest, all parts dealing with assembling multicell systems
have been removed.
 2013-04-22 11:22:23 +02:00
Atgeirr Flø Rasmussen
b7acc70ab7 Implement solveMultiCell() properly. 
Interface change: solver now requires a linear solver (for the multi-cell blocks only).

Implementation uses new private method assembleSingleCell(), that is a modified copy
of solveSingleCell(). Should refactor.
 2013-04-17 12:58:15 +02:00
Andreas Lauser
884c5ab027 make config.h the first header to be included in any compile unit 
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
 2013-04-10 12:56:14 +02:00
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