Commit Graph

36 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
2030c6a735 Added compressible 2-phase simulator, to replace sim_wateroil.cpp. 2012-08-23 14:07:11 +02:00
Bård Skaflestad
31788277f9 Don't link in Fortran support libraries
This is an experiment, not strictly sanctioned by the AX_LAPACK macro
documentation, to avoid linker errors related to missing symbol MAIN__
in the (GFortran) run-time support libraries.  Strictly speaking, we
should be using the method outlined in the Autoconf manual, but we'll
try the easier way for now.

This commit is more or less equivalent to forward-porting commits
dd6e0fd3, c437eba2, and 9e885dc7 from the "ert" branch.
2012-07-10 13:38:33 +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
8edbd2c296 Restore additional link-time flags to restore build on Ubuntu 11.10.
This does probably paper over some underlying issue, but I don't have
the time right now to investigate the problem further.
2012-06-07 12:41:31 +02:00
Bård Skaflestad
15494cd88a Remove extended "LDADD" variable. Links inferred from libopmcore.la . 2012-06-06 14:42:36 +02:00
Bård Skaflestad
a097fde7c5 Visually split description into sections. Add comments in the process.
No functional changes.
2012-06-06 14:20:12 +02:00
Bård Skaflestad
1817d55698 Sort list of examples and PSVs. 2012-06-06 14:08:44 +02:00
Bård Skaflestad
49641f935d Refactor full "LDADD" statement out to single make variable.
Use where appropriate.
2012-06-06 14:07:03 +02:00
Atgeirr Flø Rasmussen
3d05430627 First version of SimulatorTwophase class done. Added test sim using it. 2012-06-06 13:54:53 +02:00
Bård Skaflestad
7cea714a2e Revert to building "spu_2p" only if UMFPACK is available.
The program explicitly invokes the CSRMatrixUmfpackSolver and is
consequently dependent upon a working installation of UMFPACK.

Noticed by: Kari B. Skjerve.
2012-05-24 12:58:26 +02:00
Bård Skaflestad
854e098dad Sort source lists according to order of example programs. 2012-05-24 10:57:01 +02:00
Bård Skaflestad
2ff5f084f4 Remove an instance of EOL whitespace. 2012-05-24 10:54:24 +02:00
Bård Skaflestad
05c9b7f45c Split a few long lines. 2012-05-24 10:54:00 +02:00
Bård Skaflestad
b638677ad1 Sort list of example programs. 2012-05-24 10:51:46 +02:00
Atgeirr Flø Rasmussen
60ed946835 Added program refine_wells. 2012-05-24 09:18:37 +02:00
Atgeirr Flø Rasmussen
3c3ce52850 Added (non-compiling) test program for compressible fluid case. 2012-05-14 10:55:09 +02:00
Atgeirr Flø Rasmussen
1709ca9da4 All programs unconditional, since linear solver deps are now in LinearSolverFactory. 2012-05-14 10:29:14 +02:00
Kjetil Olsen Lye
9511d8dce2 Cleaned up examples/Makefile.am somewhat [made linking more clear] 2012-04-12 12:17:27 +02:00
Kjetil Olsen Lye
c65dff9f2d Added necessary libraries to the examples 2012-04-11 16:35:45 +02:00
Bård Skaflestad
b156a5e41b Don't build the 'wells_example' unless UMFPACK is available.
While here, clean up the link-time dependency information.  This
information is inferred from the libopmcore.la Libtool library.
2012-04-11 09:06:07 +02:00
Kjetil Olsen Lye
4773318b28 added initial input reading for group control (GRUP-keyword) 2012-03-27 09:23:24 +02:00
Kjetil Olsen Lye
f6e26672fc Added 3rd scenario to spu_2p: Top heavy, bottom light 2012-03-06 16:37:49 +01:00
Bård Skaflestad
1b7a2fa9ac Add appropriate Boost libraries needed in specific executables. 2012-01-26 21:34:16 +01:00
Atgeirr Flø Rasmussen
63942cbd1d Now reorder code requires new property object, not using it yet (work in progress). 2012-01-24 16:17:05 +01:00
Atgeirr Flø Rasmussen
3424e0211b C++ified reordering transport solver facade. 2012-01-24 13:47:00 +01:00
Jostein R. Natvig
5d058ca8da Add demonstration for bare-bones reordering implementation. 2012-01-17 14:41:00 +01:00
Atgeirr Flø Rasmussen
9729768794 Now the libtool library will reference its dependencies. 2011-12-23 12:49:06 +01:00
Bård Skaflestad
6eb6054290 Make $(LIBS) and $(FLIBS) the final libraries on link line. 2011-12-19 18:31:57 +01:00
Halvor M. Nilsen
81d804ca31 Fixed makefiles. 2011-12-19 17:18:57 +01:00
Atgeirr Flø Rasmussen
14dad62014 Moved umfpack-dependent programs into conditional block. 2011-12-12 10:30:40 +01:00
Bård Skaflestad
953507907e Update include paths and link to OPM core library. 2011-12-08 16:17:13 +01:00
Bård Skaflestad
e4fa3dbc4f Catch up to changing location of 'scaneclipsedeck' example.
While here, remove MEX related grid processing from core library.
2011-12-08 15:08:04 +01:00
Bård Skaflestad
66b82865d4 Complete cset ad3d926031e7. 2011-12-08 14:49:09 +01:00
Bård Skaflestad
16780b8312 Remove remnants of previous Autotools build system. 2011-12-08 13:58:10 +01:00
Bård Skaflestad
72953ac126 Add an example program demonstrating the use of the ImplicitTransport solver.
Building contingent upon availability of both OPMPressure *and* UMFPACK.
2011-10-05 20:06:03 +02:00