Commit Graph

339 Commits

Author SHA1 Message Date
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