Commit Graph

55 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
c2a7ce9a45 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
25867007ed Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Bård Skaflestad
a93532e1ce Opm::WellState::init(): Handle shut wells
This is a minor bugfix to account for the presence of shut wells
(characterised by "ctrls[w]->current < 0").  The existing code would
lead to indexing outside the "ctrls" array in the context of a shut
well.
2013-01-18 13:23:37 +01:00
Atgeirr Flø Rasmussen
0526657355 Document function currentDateTime(). 2012-11-26 10:49:15 +01:00
Joakim Hove
43adfaeda5 Added start_date_ property to the SimulatorTimer class 2012-11-07 14:53:26 +01:00
Atgeirr Flø Rasmussen
27b8314521 Rename function argument and variable.
rock_comp -> rock_comp_props
2012-10-12 09:21:52 +02:00
Atgeirr Flø Rasmussen
f5359936e0 Bugfix: order of function arguments.
Order of arguments for computePhaseFlowRatesPerWell() was wrong.
This fix was done previously for SimulatorCompressibleTwophase,
but the incompressible sim was ignored.

Also added an ASSERT that may help catch some misuse.
2012-10-10 14:09:09 +02:00
Atgeirr Flø Rasmussen
52d97cfc1c Fix order of arguments in function call.
Rate and fractional flow were switched in call
to computePhaseFlowRatesPerWell().
2012-10-08 14:26:46 +02:00
Atgeirr Flø Rasmussen
64aab3cc49 Fix mass balance reporting.
Multiple issues:
  - now reporting surface volumes, not reservoir volumes,
  - fixed reporting for the case of multiple transport steps.
2012-10-02 15:47:47 +02:00
Atgeirr Flø Rasmussen
66fe242280 Fix volume reporting with multiple transport substeps. 2012-10-02 15:47:21 +02:00
Atgeirr Flø Rasmussen
594d2a68da Increase output precision for ascii dumps. 2012-10-02 14:39:12 +02:00
Atgeirr Flø Rasmussen
490b8c01d1 Change interface for (blackoil) computeInjectedProduced().
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
2012-10-02 11:12:23 +02:00
Atgeirr Flø Rasmussen
7f9ea9041a Added perfPress() to WellState. 2012-10-01 16:39:35 +02:00
Atgeirr Flø Rasmussen
b90b803b80 Changed well initialization and property calculation.
Bhp is now initialized to bhp target for bhp-controlled wells.
Mobilities and pvt properties are now calculated from
well perforation pressure and injection specifications for
injectors, producers still use cell properties as before.
2012-09-14 09:53:11 +02:00
Atgeirr Flø Rasmussen
373f628095 Add output of surface volume. 2012-09-14 09:51:28 +02:00
Xavier Raynaud
19c7f516b1 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud
b53c983fc4 Fixed order of arguments in function call. 2012-09-04 11:39:17 +02:00
Xavier Raynaud
5aeb24433d Added missing initialization of gravity in constructor. 2012-09-03 14:55:19 +02:00
Atgeirr Flø Rasmussen
86962d6230 Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
fd0d060ed8 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Halvor Møll Nilsen
bf082c57b6 Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 12:26:27 +02:00
Atgeirr Flø Rasmussen
af5cc531ef Use the start-of-timestep pore volume in transport solver.
This is to improve consistency with other solvers, and relates
to the expression that is converted into a finite difference when
discretising:
  (phi s) - (phi s)^0 = phi^0(s - s^0) + (phi - phi^0)s
                        ^^^^^
The above marks the spot where we now use phi^0 instead of phi.
2012-08-23 14:58:32 +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
bab4f8cb57 Fixed renormalization conditions. 2012-08-23 14:05:28 +02:00
Atgeirr Flø Rasmussen
f7dafe6c85 Chase changes to some interfaces after merging. 2012-08-22 11:16:51 +02:00
Atgeirr Flø Rasmussen
51d4e04d36 Merge branch 'rock_comp_tpfa' 2012-08-22 11:13:16 +02:00
Atgeirr Flø Rasmussen
ae66fe74e3 New class SimulatorCompressibleTwophase. 2012-08-22 10:37:52 +02:00
Atgeirr Flø Rasmussen
d3641baf75 Minor comment fix. 2012-08-22 09:05:54 +02:00
Halvor Møll Nilsen
66dea391a8 added writing of reorder iterations for each cell 2012-08-21 15:23:46 +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
1170727f1e Renamed SimulatorTwophase -> SimulatorIncompTwophase. 2012-08-20 15:45:05 +02:00
Xavier Raynaud
f15a6e03f0 Added common root name for vtk file names. 2012-08-20 15:14:01 +02:00
Atgeirr Flø Rasmussen
a23f8d1706 Added parameter output_vtk.
Defaults to true, if false do not write .vtu output.
2012-08-17 13:54:19 +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
2da6650b97 Moved output of quantities to separate directoirs inside the outdir.
This is done to get a cleaner putput.
2012-08-16 15:29:57 +02:00
Andreas Lauser
2a79bb2fe2 opm-core: make it work nicely with clang 2012-07-02 18:52:30 +02:00
Atgeirr Flø Rasmussen
8cd85b0438 Fix output from SimulatorReport. 2012-06-15 10:51:34 +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
f0aec74997 SimulatorTwophase::run() returns a timing report. Refined output. 2012-06-14 11:57:03 +02:00
Atgeirr Flø Rasmussen
3ccd149fbd Remove unused code. 2012-06-13 14:55:54 +02:00
Atgeirr Flø Rasmussen
4564068da6 Update documentation. 2012-06-13 14:55:44 +02:00
Atgeirr Flø Rasmussen
d8580716de Removed some unused variables. 2012-06-12 11:16:26 +02:00
Atgeirr Flø Rasmussen
a558878917 Major simplification of IncompTpfa interface.
Most significant changes:
     - Single solve() call used for all cases (with or without gravity,
       with or without rock compressibility). This is intentionally
       similar to CompressibleTpfa::solve().
     - Constructor take a property object and computation of necessary total
       mobilities etc. moved inside class.
     - Optional constructor args for rock compressibility, gravity, wells,
       boundary conditions (null pointer accepted) and source terms (empty
       vector accepted).
     - Nonlinear iterations for the compressible rock case now handled inside
       IncompTpfa. This part intentionally made similar to CompressibleTpfa.
2012-06-12 10:27:48 +02:00
Atgeirr Flø Rasmussen
e798cc179e Bugfix: forgotten Wells argument. 2012-06-07 13:32:04 +02:00