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

3147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
68b735c7ad Merge pull request #210 from rolk/210_ifdef 
SuiteSparse configuration returns zero instead of blank string when header not found
 2013-03-19 05:35:07 -07:00
Atgeirr Flø Rasmussen
a3e949dfc3 Merge pull request #209 from atgeirr/fix-umfpack-conditional 
Fixed conditional compilation issues with UMFPACK.
 2013-03-19 05:34:36 -07:00
Atgeirr Flø Rasmussen
410a9b73e2 Changed #ifdef HAVE_... to #if HAVE_... 2013-03-19 13:33:07 +01:00
Roland Kaufmann
ed4b62ae4b Indicate failure to find header with blank string 
Use empty string instead of zero, so it can be tested with #ifdef as
well as #if in the C++ source code.
 2013-03-19 13:28:30 +01:00
Roland Kaufmann
0eb46b567d Indicate failure to find header with blank string 
Use empty string instead of zero, so it can be tested with #ifdef as
well as #if in the C++ source code.
 2013-03-19 13:06:43 +01:00
Atgeirr Flø Rasmussen
19767d5d97 Fix syntax error. 2013-03-19 11:17:24 +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
Bård Skaflestad
36b3f46e93 Merge pull request #203 from atgeirr/combined 
Reorganisation and improvements in significant parts of opm-core
 2013-03-18 12:12:55 -07:00
Atgeirr Flø Rasmussen
e59db97128 Merge pull request #205 from rolk/205_tinyxml 
Dependent packages fail if opm-core uses embedded TinyXML
 2013-03-18 05:12:20 -07: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
987aa5b6fd Further reorganising of opm-core. 
Deleted some unused code (or moved to opm-porsol), moved all code dealing with
time-of-flight to opm/core/tof, moved code for implicit transport solver to
opm/core/transport/implicit, spu_[im|ex]plicit.[ch] to opm/core/transport/minimal.
 2013-03-18 12:38:04 +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
Roland Kaufmann
ce16450e43 Bugfix change from function to macro 
This change is similar to commit 89be4e14: After find_package_append_to
changed from function to macro to pick up the configuration not only
from the module itself but also from everything it pulled it, the
variable MODULE is overwritten (variable module in lower case is a
parameter, so it is replaced in the source body). Thus, the test in the
end is not whether *this* module was found, but if its last dependency
was! This made the build crash only in some projects but not in others.
 2013-03-18 10:32:53 +01:00
Atgeirr Flø Rasmussen
1e6e733bb7 Moved deprecated opm/core/well.h -> opm/core/pressure/legacy_well.h 
Still used by some pressure system assemblers.
 2013-03-18 10:23:51 +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
5fba4ca2b3 Merge remote-tracking branch 'upstream/release/2013.03' into combined 2013-03-18 08:28:36 +01:00
Atgeirr Flø Rasmussen
d86b4c09a4 Merge pull request #204 from rolk/204_precomp 
Allow precompiled headers to be enabled from command-line
 2013-03-17 13:10:37 -07:00
Roland Kaufmann
040b7adb4e Search for libraries in dunecontrol's default build dir 2013-03-17 21:03:19 +01:00
Roland Kaufmann
4d7752b980 Don't search for source in build directories 2013-03-17 21:03:09 +01:00
Roland Kaufmann
5401df41b5 Use find modules for libraries with extra processing 
Some libraries require more information than what is present in the
xxx-config.cmake file, e.g. the caller must know whether HAVE_TUPLE
is available and probably used when compiling dune-common, and put
this in its own config.h file.

Code to take care of these variables must therefore be in the client
configuration, and this is the same code which is used to handle the
autotools version, namely the find module, so a practical solution
is to just revert to that in both cases.
 2013-03-17 21:03:00 +01:00
Roland Kaufmann
6cfa13f136 Allow precompiled headers to be enabled from command-line 2013-03-15 20:06:40 +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
911a16e157 Reinstate correct porevolume usage. 
The porevolume at the start of the timestep should be provided to
the solver.
 2013-03-15 15:10:16 +01:00
Atgeirr Flø Rasmussen
af62639513 Bugfix: check for null ptr before use. 2013-03-15 15:02:42 +01:00
Atgeirr Flø Rasmussen
e2893a5696 Bugfix: order of arguments in function call. 2013-03-15 15:00:18 +01:00
Bård Skaflestad
520d97c63a Merge pull request #202 from rolk/202_mpi 
Allow MPI to be found and opm-core configured the same way as DUNE
 2013-03-15 06:52:17 -07: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
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