OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,010 Commits 9 Branches 35 Tags
35353befb22a0fea755a244ecfd3daa738c2c3c6
Commit Graph

140 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
205f8c887b Changed interface of writeECLData(). 2012-11-26 10:51:20 +01: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
Halvor Møll Nilsen
29c6be6752 Added writing of timings in param format 2012-08-21 09:57:36 +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
Joakim Hove
bb066aa23b Added functionality to save results in ECLIPSE format from ERT libraries. 2012-06-27 20:20:05 +02:00
Atgeirr Flø Rasmussen
dd83ac3b87 Update porosities before calling transport solver. 2012-06-14 21:51:44 +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
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
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
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
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
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
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
1e61783cd3 Use proper transport source term to compute injected and produced fluid. 2012-05-08 15:52:07 +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
1f9fea92fa Catch exceptions from boost::create_directories() to give useful error message. 2012-04-23 11:10:55 +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
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
4aa0567fd4 Made IncompTpfa receive wells-output-arguments 2012-04-12 16:36:08 +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
Atgeirr Flø Rasmussen
8f7939ca10 Added #include <numeric> for std::accumulate(). 2012-04-12 14:14:24 +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
bbfad835c9 merge 2012-03-27 09:23:32 +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