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

416 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
9153c7f87b Merge branch 'master' into ert 2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen
d58314f624 Merge branch 'master' into reorder_tof 2012-09-05 14:21:47 +02:00
Atgeirr Flø Rasmussen
00bbfa06a8 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
 2012-09-05 13:36:19 +02:00
Xavier Raynaud
e1fbe4430d Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Atgeirr Flø Rasmussen
e942b10be3 Merge branch 'master' into reorder_tof 2012-09-05 12:32:38 +02:00
Xavier Raynaud
19c7f516b1 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Atgeirr Flø Rasmussen
a07d894500 Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
 2012-09-04 11:42:31 +02:00
Xavier Raynaud
eef234b59a Removed redundant header file include. 2012-09-03 12:55:10 +02:00
Atgeirr Flø Rasmussen
69cc72eec9 Merge branch 'master' into reorder_tof 2012-08-27 17:02:50 +02:00
Atgeirr Flø Rasmussen
547dc1648c Added class SinglePvtDead, add parameter 'props_use_spline' to simulators. 
Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
 2012-08-27 16:48:21 +02:00
Atgeirr Flø Rasmussen
cd1edde45d Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +02:00
Atgeirr Flø Rasmussen
dfef531fc8 Program compute_tof added. 2012-08-27 09:34:03 +02:00
Atgeirr Flø Rasmussen
26149c30a2 Fixed solveGravity(): now properly modifies surfacevolume. 
Also:
  - solveGravity() interface changed to take surface volume as a parameter,
  - gravity vector is now given in initGravity() instead of
    solveGravity(), for consistency with the incompressible solver.
 2012-08-23 14:45:23 +02:00
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
Joakim Hove
9e885dc705 Removed $(FLIBS) from linking. 2012-06-28 16:19:16 +02:00
Joakim Hove
bb066aa23b Added functionality to save results in ECLIPSE format from ERT libraries. 2012-06-27 20:20:05 +02:00
Joakim Hove
3e789272fd Added configure.ac + Makefile.am support for including ert 2012-06-27 08:06:22 +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
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
4245c97536 Update to match WellState::init() interface change. 2012-05-21 16:39:39 +02:00
Atgeirr Flø Rasmussen
5deeed1dac Added initBlackoilSurfvol() function. 2012-05-21 14:03:56 +02:00
Atgeirr Flø Rasmussen
9296e3056e Make proper calls to pressure solver. Work in progress. 2012-05-21 13:08:48 +02:00
Atgeirr Flø Rasmussen
521827c9d1 Added tolerance and maxiter arguments to CompressibleTpfa. 2012-05-21 11:24:12 +02:00
Atgeirr Flø Rasmussen
2bab1acdb6 Work in progress on CompressibleTpfa. 
- Changed contstruction, now takes property object.
 - Well potentials done.
 2012-05-18 11:10:31 +02:00
Atgeirr Flø Rasmussen
a1665d9902 Suppressed some warnings. 2012-05-16 15:56:04 +02:00
Atgeirr Flø Rasmussen
e57ef29fae Work in progress on compressible pressure solver. 2012-05-16 15:49:02 +02:00
Atgeirr Flø Rasmussen
9ad4272bc2 Start using WellState class. 2012-05-16 14:38:17 +02:00
Atgeirr Flø Rasmussen
3740242d7a Removed macro disabling initialization code. 2012-05-16 14:16:12 +02:00
Atgeirr Flø Rasmussen
79cdeaa5df Added initStateBasic() overload taking BlackoilPropertiesInterface props. 2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
4c37676338 Renamed initTwophaseStateBasic() -> initStateBasic(). 2012-05-16 12:33:42 +02:00
Atgeirr Flø Rasmussen
9379263646 Renamed initStateTwophaseFromDeck() -> initStateFromDeck(). 
- Made initStateFromDeck() into a template taking arbitrary properties.
Implementation detail:
  - initWaterOilContact() was also templatized on props.
  - initHydrostaticPressure() is now overloaded on prop interface types.
 2012-05-16 11:37:31 +02:00
Atgeirr Flø Rasmussen
0cba414782 First compiling version, large sections are disabled. 2012-05-15 12:53:04 +02:00
Atgeirr Flø Rasmussen
26fc6a335a Adapt to changed computePorevolume() interface. 2012-05-14 21:53:36 +02:00
Atgeirr Flø Rasmussen
cc2010c1d4 Merged. 2012-05-14 21:49:24 +02:00
Atgeirr Flø Rasmussen
67e3d38bec Now computePorevolume() takes a porosity array instead of a property object. 
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
 2012-05-14 21:47:10 +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
Atgeirr Flø Rasmussen
891696e333 Simplified data structure for extracted columns. 2012-05-11 09:37:12 +02:00
Xavier Raynaud
fd9a3318b0 normalized tabification in spu_2p. 2012-05-10 13:50:22 +02:00
Xavier Raynaud
1e7101a91b Make compressible pressure solver compatible with well management. 2012-05-10 12:38:29 +02:00
Xavier Raynaud
9dabbd349f Added Newton compressible pressure solver in spu_2p. 2012-05-09 15:19:37 +02:00
Kjetil Olsen Lye
f2b847bb2c Added explicit reinjection to spu_2p. 2012-05-09 13:15:02 +02:00
Kjetil Olsen Lye
832a2adb7f merge. 2012-05-09 10:22:18 +02:00
Kjetil Olsen Lye
8e49914bbd Added friendly printout 2012-05-09 10:17:58 +02:00
Kjetil Olsen Lye
338f5907a6 Added well controls in spu2p 2012-05-09 10:14:38 +02:00
Kjetil Olsen Lye
738ec64ac8 Added necessary input parameters for well checking in spu_2p 2012-05-09 09:48:49 +02:00
Atgeirr Flø Rasmussen
27d7b433e3 Merged. 2012-05-08 16:00:54 +02:00
Atgeirr Flø Rasmussen
1e61783cd3 Use proper transport source term to compute injected and produced fluid. 2012-05-08 15:52:07 +02:00
Kjetil Olsen Lye
339a652e5d Changed some minor bugs in the refactored code in wells_example 2012-05-08 12:23:58 +02:00
Kjetil Olsen Lye
be956f2a70 Refactored some computations into seperate methods in wells_example.cpp 2012-05-08 11:04:15 +02:00
Kjetil Olsen Lye
e522a8df83 removed an extra uneeded call to the pressure solver 2012-05-07 15:51:54 +02:00
Kjetil Olsen Lye
4e0b5dca65 Inserted rock_comp into wells_example. 2012-05-07 13:29:52 +02:00
Kjetil Olsen Lye
8b0c101824 Made a maximum number of iterations in wells_test 2012-05-03 15:35:44 +02:00
Kjetil Olsen Lye
de957caab5 Added calculation of fractional flows and per phase flows in wells_example 2012-05-03 12:29:18 +02:00
Kjetil Olsen Lye
e6df79e341 Final fixes for new well structure (to make it compile) 2012-05-02 13:02:59 +02:00
Kjetil Olsen Lye
c27f47dead Completly revamped the way group control is checked 2012-04-25 16:14:40 +02:00
Atgeirr Flø Rasmussen
27af4b339d Removed unused saturation argument from conditionsMet() methods. 2012-04-25 14:03:57 +02:00
Atgeirr Flø Rasmussen
20d1dec648 Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units. 2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
ce98195001 Include well flow in computeTransportSource(). 
Also minor fixes in spu_2p to handle no-wells case properly.
 2012-04-24 15:15:36 +02:00
Atgeirr Flø Rasmussen
e934e7fdc6 Adding well support (work in progress). 2012-04-24 13:49:02 +02:00
Atgeirr Flø Rasmussen
eefcc69b3c Minor change to computeWDP() interface. 2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
6670f5de17 Added default oil handling 2012-04-23 13:49:53 +02:00
Kjetil Olsen Lye
fbf898b756 Added a (small) hack to wellmanager (defaulting injected_phase to water) 2012-04-23 13:24:47 +02:00
Atgeirr Flø Rasmussen
1f9fea92fa Catch exceptions from boost::create_directories() to give useful error message. 2012-04-23 11:10:55 +02:00
Kjetil Olsen Lye
f4e40578f5 Passed around a WellControlResult argument to the different wellcontrol functions 2012-04-17 16:36:49 +02:00
Kjetil Olsen Lye
11f0a14e61 Made use of the new LinearSolverFactory in wells_example 2012-04-16 12:18:37 +02:00
Kjetil Olsen Lye
99ff586dcc merge 2012-04-16 09:00:38 +02:00
Atgeirr Flø Rasmussen
b64db1027b Using LinearSolverFactory in spu_2p.cpp to gain linear solver flexibility. 2012-04-14 10:19:35 +02:00
Kjetil Olsen Lye
b1c5fa5aca modified the group control interface slightly 2012-04-13 20:41:09 +02:00
Kjetil Olsen Lye
c9a866fce0 Added computations for total flow for each well 2012-04-13 14:22:44 +02:00
Kjetil Olsen Lye
affbb08795 Added checks for BHP and fluid_volume_rate for group control. Also added error tolerance for group control 2012-04-13 12:57:47 +02:00
Kjetil Olsen Lye
8bc9e862d4 Made a (possibly wrong) adjustment to well_controls_append. Each control now has its current index set to 0, as there's only supposed to be one control per well. 2012-04-12 18:47:06 +02:00
Kjetil Olsen Lye
bc275a4755 Made a computeWDP-function 2012-04-12 17:50:51 +02:00
Kjetil Olsen Lye
1a524b0a14 Changed input arguments for group checking 2012-04-12 16:56:58 +02:00
Kjetil Olsen Lye
4aa0567fd4 Made IncompTpfa receive wells-output-arguments 2012-04-12 16:36:08 +02:00
Kjetil Olsen Lye
34460f1711 merge. 2012-04-12 15:48:59 +02:00
Kjetil Olsen Lye
49b18b2d96 Made queries upwards from wells to group to group 2012-04-12 15:48:24 +02:00
Atgeirr Flø Rasmussen
68a2d7fe26 Added and implemented parameter num_transport_substeps. 2012-04-12 14:43:05 +02:00
Atgeirr Flø Rasmussen
9121a81165 Removed unnecessary guard against using rock compressibility with segregation. 2012-04-12 14:25:53 +02:00
Kjetil Olsen Lye
77dc0991cf Made the WellNode be aware of their own index 2012-04-12 14:25:39 +02:00
Atgeirr Flø Rasmussen
8f7939ca10 Added #include <numeric> for std::accumulate(). 2012-04-12 14:14:24 +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
Kjetil Olsen Lye
7f36232ba0 merge 2012-04-11 15:31:10 +02:00
Kjetil Olsen Lye
e70a6bbbd3 Made linear solving of first timestep 2012-04-11 15:29:58 +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
b39d5c823f merge 2012-04-10 14:48:35 +02:00
Kjetil Olsen Lye
84b5041487 Fixed namespacing issue 2012-04-10 14:47:29 +02:00
Atgeirr Flø Rasmussen
b5c8b21bee Minor edit. 2012-04-02 15:42:28 +02:00
Atgeirr Flø Rasmussen
196ec80785 Corrected keyword for turning off gravity in deck input (NOGRAV). 2012-04-02 11:21:56 +02:00
Atgeirr Flø Rasmussen
c53fb7eb15 New parameter 'injected_porevolumes_per_day' implemented. 
- Only used if no wells present.
 - Defaults to 0.0 if gravity is present.
 - Otherwise defaults to 0.1.
These defaults are intended to preserve behaviour from before the
initialisation code changed away from using the 'scenario' parameter.
 2012-03-29 21:16:45 +02:00
Atgeirr Flø Rasmussen
06d5755c29 Multiple changes dealing with initialization. Work in progress. 
- Moved simulator state class into its own file.
 - Using new initState...() methods in spu_2p.cpp
 - No longer controlled by 'scenario' parameter.
 2012-03-29 13:05:59 +02:00
Atgeirr Flø Rasmussen
6370906f8c Suppressed multiple warnings. 2012-03-28 16:39:04 +02:00
Kjetil Olsen Lye
432f7c08a3 Added exmaple file 2012-03-27 10:56:32 +02:00
Kjetil Olsen Lye
bbfad835c9 merge 2012-03-27 09:23:32 +02:00
Kjetil Olsen Lye
4773318b28 added initial input reading for group control (GRUP-keyword) 2012-03-27 09:23:24 +02:00
Atgeirr Flø Rasmussen
bb953a5fba Added controls to nonlinear pressure iteration. Fixed segregation scenario init. 2012-03-26 16:08:57 +02:00
Kjetil Olsen Lye
dd2d474643 Added opm-parallelization to column solver for gravity. Did a (minor) interface change on extractColumn 2012-03-23 12:32:25 +01:00
Atgeirr Flø Rasmussen
20697bd8fb Implemented (primitive) fixed point iterations for pressure in the compressible rock case. 2012-03-20 21:37:58 +01:00
Atgeirr Flø Rasmussen
1d63d6246a Now running with rock compressibility (testing in progress). Multiple changes. 
- TransportModelTwophase no longer takes pore volume in constructor, but in
   the solve() and solveGravity() calls.
 - Residual function uses compressibility term (not yet for gravity residual).
 - spu_2p now takes a new parameter "init_p_bar", and ReservoirState class
   accepts initial pressure as a constructor argument.
 - Moved parts of initialization around, since pore volume now depends on
   state (pressure).
 2012-03-20 12:11:08 +01:00
Atgeirr Flø Rasmussen
82079418db Changed tot_porevol -> tot_porevol_init. Initialise rock_comp object. 2012-03-20 10:33:37 +01:00
Atgeirr Flø Rasmussen
a103933e2b Fixed bugs and changed interface for Gauss-Seidel segregation solver. 2012-03-16 13:41:10 +01:00
Atgeirr Flø Rasmussen
dd0cd85bf6 Added experimental Gauss-Seidel segregation solver. Not yet functioning. 2012-03-16 08:33:00 +01:00
Atgeirr Flø Rasmussen
fc3357e98a Production must be computed with the correct saturation. 
The bug was the following: the reordering transport solvers accounts for
sources and sinks, and modifies saturation accordingly. This saturation is
the one we must use for computing sink outflow (= fracflow(s)*outflux).
If we wait until after segregation, saturation is changed, and we
compute fracflow(s')*outflux instead.
 2012-03-15 14:15:57 +01:00
Atgeirr Flø Rasmussen
eccf52af0c Minor comment changed. 2012-03-14 12:51:51 +01:00
Atgeirr Flø Rasmussen
06d72587cc Moved Watercut class to miscUtilities.hpp. 2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
86284d06c1 Reformatting only. 2012-03-14 11:16:48 +01:00
Atgeirr Flø Rasmussen
de1c0e8874 Untabify. 2012-03-14 10:40:41 +01:00
Atgeirr Flø Rasmussen
b56c397fa2 Use wellsToSrc() from utility, minor reordering of #includes. 2012-03-14 09:52:05 +01:00
Atgeirr Flø Rasmussen
df3592473a Minor additions to output, comments. 2012-03-14 09:38:43 +01:00
Bård Skaflestad
ba3cf61c2e Adjust white-space for previous commit. 
No functional change.
 2012-03-14 00:03:17 +01:00
Bård Skaflestad
1130baf6d7 Staticise several functions to suppress warnings about missing prior declarations. 2012-03-14 00:01:45 +01:00
Atgeirr Flø Rasmussen
f72bac2432 Printing volume balance report, although somewhat messy. Writing watercut curve to file. 2012-03-13 15:58:09 +01:00
Atgeirr Flø Rasmussen
c8f542fc3f Added water-oil contact init (scenario 4), controllable from param or deck. 2012-03-13 11:41:11 +01:00
Atgeirr Flø Rasmussen
bf142b7eda Added warning for segregation scenario. 2012-03-12 17:29:42 +01:00
Atgeirr Flø Rasmussen
e2f00b66a4 Now using SimulatorTimer class (therefore supporting TSTEP). 2012-03-12 16:20:13 +01:00
Atgeirr Flø Rasmussen
f5ad161409 Changed some function signatures to take const UnstructuredGrid& instead of ptr. 2012-03-12 13:44:05 +01:00
Atgeirr Flø Rasmussen
dd85dc522c Added computeTransportSource() function. Handling bdy fluxes in spu_2p. 2012-03-12 13:00:48 +01:00
Atgeirr Flø Rasmussen
9c226c1b24 Simple well handling done (only simple rates -> src terms). 2012-03-09 15:51:17 +01:00
Atgeirr Flø Rasmussen
bac0b16c77 Initialising wells (unused for the moment). 2012-03-09 14:39:31 +01:00
Atgeirr Flø Rasmussen
33fbc02490 Fixed s_min/s_max bug in ad hoc fluid, improved saturation init, print average sat. 2012-03-09 11:47:32 +01:00
Atgeirr Flø Rasmussen
f919da439b Improved saturation initialization, new parameter 'init_sat'. 2012-03-08 15:54:24 +01:00
Atgeirr Flø Rasmussen
be892f5059 Follow change to IncompTpfa (adding BCs). 2012-03-07 09:33:28 +01:00
Atgeirr Flø Rasmussen
e33c204832 Pass tol and maxit to column solver, clean up a scenario message and reindent. 2012-03-06 22:33:19 +01:00
Kjetil Olsen Lye
f6e26672fc Added 3rd scenario to spu_2p: Top heavy, bottom light 2012-03-06 16:37:49 +01:00
Atgeirr Flø Rasmussen
e5802e0532 Added optional column segregation solver (parameter "use_column_solver"). 2012-03-02 13:55:54 +01:00
Atgeirr Flø Rasmussen
c2a18bc7ca Added parameter "use_segregation_split", implemented using ImplicitTransport. 2012-03-01 10:32:58 +01:00
Bård Skaflestad
8a2aff536f Start solver messages on new line following "Scenario" output. 2012-02-28 09:42:21 +01:00
Bård Skaflestad
9c00ad8fe9 Support non-integral Cartesian cell sizes. 2012-02-27 23:43:58 +01:00
Bård Skaflestad
3ea1a823c8 Inspect global Cartesian cell when determining scenario 2 "left" reservoir half. 
Assume that c_grid()->global_cell==0 signifies identity mapping (i.e.,
global_cell[cell]==cell).
 2012-02-27 20:04:16 +01:00
Bård Skaflestad
84aad52d81 Fix logic error in defining "left" reservoir half in scenario 2. 
Specifically, we must map into 0..cd[0]-1 and not some other
interval.  Moreover, as the "i" index cycles the most rapidly in
lexicographical ordering, a simple first dimension modulus operator is
sufficient.

On the other hand, this code does assume lexicographical ordering of
the cells which may or may not be guaranteed by the grid constructor.
The Cartesian constructors observe this behaviour, but other
constructors may not...
 2012-02-27 19:59:01 +01:00
Bård Skaflestad
363c6564d9 Fully initialise the transport model gravity contributions when using gravity. 
This initialisation used to be a part of the model construction, but
was refactored out in change-set 86c734a0ba48 and must thus be called
separately.
 2012-02-27 17:34:57 +01:00
Atgeirr Flø Rasmussen
8a0d5728a8 Moved simulator utility functions to opm/core/utility/miscUtilities.hpp. 
We want to avoid having hundreds of files with a single function, therefore
these functions have been lumped together. With time, a more sophisticated
organization of such free functions may be in order.
 2012-02-26 21:05:19 +01:00
Atgeirr Flø Rasmussen
0e1107f195 Output estimated cell velocities. 2012-02-25 22:29:35 +01:00
Atgeirr Flø Rasmussen
65bd117d6b Bugfix, make vector of sufficient size to hold expected data. 2012-02-21 22:45:01 +01:00
Atgeirr Flø Rasmussen
1a62734e98 Added EXPERIMENT_ISTL-guarded code for testing Istl linear solver. 2012-02-21 22:14:01 +01:00
Atgeirr Flø Rasmussen
8d74253c64 IncompTpfa now takes a linear solver as a constructor argument. 2012-02-21 21:45:04 +01:00
Atgeirr Flø Rasmussen
a61bd0cf6d Added #if HAVE_CONFIG_H guards around #include "config.h". 2012-02-21 14:46:28 +01:00
Atgeirr Flø Rasmussen
03c995e4c0 Added parameters "dx", "dy", "dz" controlling cell size in the cartesian case. 2012-02-20 17:06:13 +01:00
Atgeirr Flø Rasmussen
452be898dc Made s_min() and s_max() behave properly, using underlying props' satRange(). 2012-02-20 13:50:45 +01:00
Atgeirr Flø Rasmussen
5633f9398b Using IncompTpfa instead of ad hoc class. 2012-02-20 13:42:42 +01:00
Atgeirr Flø Rasmussen
18d2b226de Using GridManager class instead of ad-hoc grid class. 2012-02-20 11:34:51 +01:00
Atgeirr Flø Rasmussen
d0d4ba7fce Now using writeVtkData() from the writeVtkData.hpp header. 2012-02-19 21:32:35 +01:00
Atgeirr Flø Rasmussen
b5270c2c5a Added "nl_tolerance" and "nl_maxiter" parameters. 2012-02-17 14:18:03 +01:00
Atgeirr Flø Rasmussen
f7b4762472 Added gravity (no segregation). Added "scenario" parameter. 2012-02-15 22:43:56 +01:00
Atgeirr Flø Rasmussen
a48b261a3c TransportModel* classes are now expected to have a custom solve() method. More: 
- Using new solve() method in spu_2p.
 - solve() implemented in terms of protected superclass method reorderAndTransport().
 - Removed unused code being replaced by solve().
 2012-02-10 10:48:18 +01:00
Atgeirr Flø Rasmussen
2061e7fcd8 Added timers. 2012-02-09 23:15:14 +01:00
Atgeirr Flø Rasmussen
660a45440d Using new reorderTransportTwophase() function. 2012-02-09 16:09:24 +01:00
Atgeirr Flø Rasmussen
bdd7bcb50f Fixed saturation initialization and updating of total mobilities. 2012-02-02 14:24:49 +01:00
Atgeirr Flø Rasmussen
a3eb09032b Catch up with unified grid construction/destruction, simplifying grid management. 2012-02-01 15:58:32 +01:00