OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,158 Commits 9 Branches 35 Tags 15 MiB
2030c6a735
Commit Graph

250 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
Atgeirr Flø Rasmussen
51d4e04d36 Merge branch 'rock_comp_tpfa' 2012-08-22 11:13:16 +02:00
Xavier Raynaud
6fd14bd76a Update surface volume in transport solver. 2012-08-22 10:11:32 +02:00
Atgeirr Flø Rasmussen
81ca766b86 Fix pressure renormalization conditions. Some formatting fixes. 
Checking for both rock compressibility and pressure conditions
is necessary before we renormalize pressure.
 2012-08-21 14:52:43 +02:00
Atgeirr Flø Rasmussen
87ce47f70d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	examples/sim_2p_incomp_reorder.cpp
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-21 12:47:52 +02:00
Atgeirr Flø Rasmussen
d9444d0dfb Added well constraint checking to SimulatorIncompTwophase. 
- Changed Wells constructor arg for SimulatorIncompTwophase to WellsManager.
 - Insert checking code for well constrains (mostly copied from spu_2p.cpp).
Unrelated to the above changes.
 - Added pressure normalization for incompressible case (from spu_2p.cpp)
 2012-08-21 10:51:14 +02:00
Halvor Møll Nilsen
29c6be6752 Added writing of timings in param format 2012-08-21 09:57:36 +02:00
Atgeirr Flø Rasmussen
98c8e6a294 Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa 2012-08-20 16:09:20 +02:00
Atgeirr Flø Rasmussen
1678bcad7f Merge branch 'master' into rock_comp_tpfa 2012-08-20 16:08:15 +02:00
Atgeirr Flø Rasmussen
1170727f1e Renamed SimulatorTwophase -> SimulatorIncompTwophase. 2012-08-20 15:45:05 +02:00
Xavier Raynaud
9e480cd997 Fix initialization bug. 2012-08-20 15:18:24 +02:00
Atgeirr Flø Rasmussen
bbf2b4f369 Changed name of parameter output file to 'simulation.param'. 2012-08-20 14:46:51 +02:00
Atgeirr Flø Rasmussen
f3169d7dc5 Merge branch 'master' into rock_comp_tpfa 2012-08-17 12:55:41 +02:00
Atgeirr Flø Rasmussen
8fa0140e66 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorTwophase.cpp
 2012-08-17 11:31:59 +02:00
Atgeirr Flø Rasmussen
08e966eff1 Small improvements, outputs unused params at the correct time. 2012-08-17 11:20:42 +02:00
Halvor Møll Nilsen
bdad2c449c Changed header for boost. 2012-08-17 10:59:26 +02:00
Atgeirr Flø Rasmussen
48acb816ff Merge remote-tracking branch 'upstream/master' 2012-08-17 10:58:12 +02:00
Atgeirr Flø Rasmussen
dec8ed5760 Class CompressibleTpfa now handles rock compressibility. 2012-08-17 10:38:41 +02:00
Halvor Møll Nilsen
b0cbc3d7f4 Reintroduced writing of param. 2012-08-16 16:10:28 +02:00
Atgeirr Flø Rasmussen
a81df458e3 Gravity segregation column solver for compressible case implemented. 2012-08-14 11:25:59 +02:00
Atgeirr Flø Rasmussen
9a23b8db74 Constructors of *FromDeck classes now take an UnstructuredGrid. 
This is a change from taking a vector containing the mapping to
deck-consistent logical cartesian indices. The mapping is contained
in the UnstructuredGrid::global_cell member, and may be null. The
change therefore saves the overhead of constructing a vector as a
copy of the data in the grid or (if null) as an identity mapping.
 2012-08-10 10:12:45 +02:00
Atgeirr Flø Rasmussen
193d4d3921 Adapt to possibility for Cartesian grids from deck input. 
Now we may have a grid generated from deck input using the
keywords DXV, DYV, DZV, which will have a null pointer for
the global_cell mapping. We check if this pointer is null,
and create an identity mapping in this case. The mapping is
needed by the *PropertiesFromDeck classes (and helpers).
 2012-08-09 14:35:00 +02:00
Atgeirr Flø Rasmussen
59611a2d18 Transport solver partially complete (segregation solver remains). 2012-07-19 14:02:26 +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
Atgeirr Flø Rasmussen
dd83ac3b87 Update porosities before calling transport solver. 2012-06-14 21:51:44 +02:00
Atgeirr Flø Rasmussen
95bf53cc30 Moved SimulatorReport class into its own file, for reusability. 2012-06-14 14:13:03 +02:00
Atgeirr Flø Rasmussen
3f630b8d6b Moved SimulatorTimer class to opm/core/simulator directory. 2012-06-14 14:02:22 +02:00
Atgeirr Flø Rasmussen
136a2bf892 Removed unneeded code, improved reporting output. 2012-06-14 11:57:45 +02:00
Atgeirr Flø Rasmussen
9faf5e2d71 Removed unused code. 2012-06-13 14:52:28 +02:00
Atgeirr Flø Rasmussen
f2eff8837d Change default pressure residual tolerance to 0, to preserve behaviour. 2012-06-13 10:59:09 +02:00
Atgeirr Flø Rasmussen
92f1ce9b83 Examples and tutorials follow change to IncompTpfa interface. 2012-06-12 15:28:53 +02:00
Atgeirr Flø Rasmussen
8befffcbbb Changed interface of solve() and solveGravity() to accept full saturation (both phases) input. 2012-06-09 14:56:29 +02:00
Atgeirr Flø Rasmussen
2683d2f331 First simulator handling schedules. 2012-06-07 15:09:35 +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
899fd960be Trim an unused header. 2012-06-06 20:08:03 +02:00
Xavier Raynaud
187957397c merge. 2012-06-06 15:19:02 +02:00
Xavier Raynaud
eb3d9d6e63 Added renormalization of pressure in the incompressible case. 2012-06-06 15:18:40 +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
Atgeirr Flø Rasmussen
955b5ea068 Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
Atgeirr Flø Rasmussen
dddf68fe54 Account for interface change in TransportModelTwophase::solve(). 2012-05-30 14:39:48 +02:00
Atgeirr Flø Rasmussen
e0d38cfaf8 Initial version of compressible transport. Work in progress. 2012-05-28 09:12:09 +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