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

3169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
df556f08f9 Make SimulatorIncompTwophase flexible w.r.t. transport solver. 
It can now use the reordering or the full Newton-Raphson solvers.
 2013-03-15 14:16:59 +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
Roland Kaufmann
9c1da9f5bf Bugfix don't search for module twice! 2013-03-15 13:48:43 +01:00
Roland Kaufmann
bafa781181 Search in dunecontrol build directories for other modules 2013-03-15 12:44:24 +01:00
Roland Kaufmann
88b0740480 Bugfix expand variable definition 2013-03-15 12:23:57 +01:00
Atgeirr Flø Rasmussen
aadae49b41 Removed unused rock compressibilty objects from interface. 2013-03-15 11:45:53 +01:00
Roland Kaufmann
89be4e145a Bugfix change from macro to function 
All variables we introduce which is not parameters are in fact global
variables that may be overwritten by recursive invocation!
 2013-03-15 11:40:30 +01:00
Roland Kaufmann
3f3ac283e8 Enable MPI support from DUNE with --enable-parallel 2013-03-15 11:40:30 +01:00
Roland Kaufmann
4fb05162cb Only use MPI if explicitly enabled 
Running with MPI on a regular workstation will probably not increase
performance, so this should be disabled as default.
 2013-03-15 11:38:45 +01:00
Roland Kaufmann
edd6b15497 Add MPI dependency for dune-common 
mpihelper.hh needs to know HAVE_MPI in the same way as the compiled
library in order to generate a consistent interface.
 2013-03-15 11:38:45 +01:00
Atgeirr Flø Rasmussen
d13fed6cab Remove unused well objects from TransportSolverTwophaseImplicit. 2013-03-15 11:38: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
7f1a06cfb3 Fixed implicit transport solver interface. 
There were significant lifetime issues, now handled by moving
objects inside the class. Work in progress.
 2013-03-15 11:15:17 +01:00
Atgeirr Flø Rasmussen
606d69fd38 Merge pull request #201 from rolk/201_transitive 
Allow variables from indirect dependencies to bubble up
 2013-03-15 03:05:00 -07:00
Roland Kaufmann
f42bf41e15 Use our own find routine recursively 
Don't use bare find_package in OpmPackage when we have already written
OpmFind to take out the worst warts.
 2013-03-15 10:57:53 +01:00
Roland Kaufmann
ce007fca7d Abstract into common version and parameterize 2013-03-15 10:57:53 +01:00
Roland Kaufmann
3d252ae8f4 Allow variables from indirect dependencies to bubble up 
The previous implementation was a function, which although OK from an
implementation standpoint -- the local variables doesn't pollute the
global namespace -- would not allow variables that were set in indirect
dependencies to bubble up to the main module. This is a problem for
modules which are dependent on configuration variables to be present.
 2013-03-15 10:45:05 +01:00
Atgeirr Flø Rasmussen
d11d84c418 Merge pull request #199 from rolk/199_uppercase 
Allow modules to use all-uppercase variables
 2013-03-15 01:38:08 -07:00
Atgeirr Flø Rasmussen
7019eb2c32 Modify solve() interface, fix source term bug in implicit solver. 2013-03-15 08:21:55 +01:00
Atgeirr Flø Rasmussen
aee974ef77 Minor adjustments. 2013-03-15 08:05:23 +01:00
Roland Kaufmann
ccbcb6f364 Enable debug tracing when finding modules 2013-03-15 01:24:06 +01:00
Roland Kaufmann
8dcca4cf9b Use camel-case in SuperLU's name 
Originally, I added FindSuperLU with uppercase since the variables it
returned had that case. Now the scripts should be patched so that it
searched for uppercase amongst the variables as well, so the module
name can retain its original case (and for compatibility with DUNE)
 2013-03-15 01:24:06 +01:00
Roland Kaufmann
97c2fabe8e Search for uppercase variants of the package vars as well 
For compatibility with packages that believes that every variable
should be in uppercase, we try this variant when adding relevant
variables to the project.
 2013-03-15 01:23:59 +01:00
Atgeirr Flø Rasmussen
86b51c80b8 Modified TransportSolverTwophaseInterface::solve(), general cleanup. 
Move output arguments last in argument list.
 2013-03-14 22:51:44 +01:00
Atgeirr Flø Rasmussen
e532250867 Rename ImplicitTwoPhaseTransportSolver -> TransportSolverTwophaseImplicit. 2013-03-14 22:39:08 +01:00
Atgeirr Flø Rasmussen
d607849293 Rename TwoPhaseTransportSolver -> TransportSolverTwophaseInterface. 
To be more consistent with naming practices elsewhere in opm-core.
 2013-03-14 22:24:36 +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
94e5af16e7 Merge pull request #198 from joakim-hove/ert-add-ecl_file_open_flag 
Added integer flag to ecl_file_open: To allign with ert commit: bd542a45
 2013-03-14 10:32:17 -07: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
Joakim Hove
1781d1fb65 Added integer flag to ecl_file_open: To allign with ert commit: bd542a45c5e72 2013-03-14 16:15:28 +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
fa31f17885 Moved fluid -> props and subdirs. 
This is a non-compiling commit.
 2013-03-14 09:56:48 +01:00
Atgeirr Flø Rasmussen
b2a07a93d5 Merge pull request #191 from atgeirr/make-io-subdir 
Make io subdir
 2013-03-13 05:45:53 -07:00
Bård Skaflestad
fb9e09063c Merge pull request #193 from rolk/193_arch 
Don't search in architecture-irrelevant directories
 2013-03-13 03:41:29 -07:00
Bård Skaflestad
ee748e6e64 Merge pull request #194 from rolk/194_bugfix 
Test strings on length before content
 2013-03-13 03:30:20 -07:00
Roland Kaufmann
44a638dce3 Test strings on length before content 
A substring can of course not be longer that the full string. Also fixes
problems with CMake-versions that doesn't handle out-of-range parameters
to the SUBSTRING sub-command.
 2013-03-13 11:20:28 +01:00
Bård Skaflestad
ae4b033ee7 Merge pull request #192 from rolk/192_findlibs 
Probe for indirect library dependencies
 2013-03-13 02:44:48 -07:00
Roland Kaufmann
ac861580d7 Don't search in architecture-irrelevant directories 
If we are on a 64-bits machine, there is no point in searching lib32
and conversely. Quite the opposite, it can only end badly if a library
is actually found in the wrong architecture directory.
 2013-03-13 10:38:27 +01:00
Roland Kaufmann
38bcff4e12 Allow subdir builds with dunecontrol 
dunecontrol will check for a dune.module file to regard the directory
as containing the module. If we put this is a sub-dir of the source,
it will get confused, so we shouldn't. There shouldn't be any
conflicting use-cases, as one cannot have several modules in the sub-
directory of one source (!?).
 2013-03-13 01:20:44 +01:00
Roland Kaufmann
54c89146d7 Enable CMake < 2.8.5 clients to report Git version 2013-03-13 01:02:03 +01:00
Roland Kaufmann
52a6b00752 Add direct dependency on dune-common 
We need to link to the library provided by dune-common, but dune-istl
does not pull this one in transitively.
 2013-03-13 00:02:54 +01:00
Roland Kaufmann
58dd4fd7b4 Include standard math runtime library when linking numerics 2013-03-13 00:01:41 +01:00
Atgeirr Flø Rasmussen
c1700e663e Changed overlooked include path. 2013-03-12 13:36:29 +01:00
Roland Kaufmann
1e765a2f29 Don't probe for umfpack with cholmod unless latter is found 2013-03-12 12:22:57 +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
Arne Morten Kvarving
d0004fcd76 fixed: remove non-existent files from install list 
these were removed in dd43305748
 2013-03-11 14:20:42 +01:00
Bård Skaflestad
144c5b9b59 Merge pull request #188 from rolk/188_maint 
Add maintainer information
 2013-03-08 08:48:23 -08:00