Atgeirr Flø Rasmussen
f99b9b90a4
Merge pull request #101 from andlaus/sim_fibo_ad_use_new_wellmanager
...
sim_fibo_ad: convert to the new-style wells manager
2014-03-20 09:07:03 +01:00
Atgeirr Flø Rasmussen
d21e310d01
Merge pull request #98 from andlaus/reverse_increment_write_order_again
...
go back to incrementing the current simulation time first, then calling EclipseWriter::writeSolution()
2014-03-20 09:04:10 +01:00
Andreas Lauser
49a5b67137
sim_fibo_ad: fix writing
...
the initial condition was written multiple times. We now fix this by
not writing anything in the simulator and moving this logic to the
main loop..
2014-03-19 17:40:51 +01:00
Atgeirr Flø Rasmussen
295677c8c1
Use WellStateFullyImplicitBlackoil class instead of WellState.
2014-03-18 11:27:40 +01:00
Atgeirr Flø Rasmussen
e7f4637461
Add WellStateFullyImplicitBlackoil class.
...
This is intended to be used instead of the WellState class in the fully
implicit blackoil simulator. It contains a WellState to reuse the init()
method and to enable users to call functions requiring a WellState.
This is done with containment and an access member function,
basicWellState(), instead of with inheritance to minimize surprises.
2014-03-18 11:23:05 +01:00
Atgeirr Flø Rasmussen
e8ee805717
Work in progress: use WellDensitySegmented class.
...
This is work in progress since it is non-working: phaseRates() is
not used correctly, and changes must be made to WellState or equivalent.
2014-03-18 08:48:34 +01:00
Atgeirr Flø Rasmussen
737affb077
Minor whitespace adjustments.
2014-03-17 10:23:40 +01:00
Atgeirr Flø Rasmussen
d821afe11f
Whitespace fix.
2014-03-17 10:14:45 +01:00
Markus Blatt
c82778b3a9
Implemented VTK output for CpGrid using DUNE's VTKWriter and activated Matlab for CpGrid.
2014-03-13 16:33:36 +01:00
Markus Blatt
4e39c7dad1
[bugfix] Fixes elementAt of CentroidIterator.
2014-03-13 16:33:36 +01:00
Markus Blatt
340da4cd7f
Added function for querying the face area to the helpers.
2014-03-13 16:33:36 +01:00
Markus Blatt
f4812c21eb
Add an example program of FIBOS that uses CpGrid.
2014-03-13 16:33:36 +01:00
Markus Blatt
5112b8af26
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid.
...
With these changes it will be possible to use CpGrid with FIBOS except for the
output routines.
2014-03-13 16:33:36 +01:00
Markus Blatt
0a5262b7c3
Added implementation of free function interface grid interface for CpGrid.
...
This implements a superset of the interface as proposed in pull request
opm-core#496 for use with CpGrid.
It also adds some additional functionality needed in opm-autodiff.
2014-03-13 15:27:45 +01:00
Andreas Lauser
0ce6093b69
go back to incrementing the current simulation time first, then calling EclipseWriter::writeSolution()
...
for this not to trigger an assertation after the last time step, the
changes of OPM/opm-parser#141 are required.
2014-03-11 16:05:00 +01:00
Andreas Lauser
1383eadf8f
fix the fallout of the SimulatorTimer::currentTime() -> SimulatorTimer::simulationTimeElapsed() rename
2014-03-11 16:01:59 +01:00
Tor Harald Sandve
a19aff63e7
Adds new well formulation
...
Todo: incorporate WellDensitySegment. Currently values of the pressure
drop is hardcoded to make the rest of the code work
Todo: make it possible to shut perforation with crossflow.
2014-03-11 14:30:54 +01:00
Tor Harald Sandve
9cb7e8635e
Adds -= operator
...
An elementwise -= operator is added to the autodiff class.
2014-03-11 14:30:54 +01:00
Joakim Hove
0c36af631f
Using well_controls_well_is_open() function
2014-03-04 14:49:54 +01:00
Atgeirr Flø Rasmussen
5bcca58d31
Make BlackoilPropsAdInterface pure virtual again.
...
Done by adding (throwing) implementation to BlackoilPropsAd class.
2014-03-04 13:09:23 +01:00
Atgeirr Flø Rasmussen
3de050b19f
Merge pull request #87 from osae/hysteresis
...
Hysteresis.
2014-03-04 10:30:07 +01:00
Atgeirr Flø Rasmussen
3627d9ec02
Make spline interpolation possible.
...
This restores the logic for choosing monotone splines for dead oil/gas pvt
tables, but the option is inactive (samples set to zero at top).
2014-03-03 10:31:21 +01:00
Atgeirr Flø Rasmussen
2cc5f0b421
Bugfix: PVDCO->PVCDO.
2014-03-03 10:30:39 +01:00
Atgeirr Flø Rasmussen
b4fe41249a
Fix error output. Also very minor whitespace issues.
2014-03-03 10:29:13 +01:00
Joakim Hove
3208c61472
Merge pull request #89 from andlaus/parser-integrate_new_simulatortimer
...
Parser integrate new simulatortimer
2014-02-27 14:43:00 +01:00
Andreas Lauser
dd080c4515
first write out the result of a time step, then increment the timer
...
if done the other way round we would make an assertation in TimeMap
false and also the values returned by SimulationTimer would be for the
next time step and not the current one...
2014-02-21 16:06:26 +01:00
osae
305512cc21
Hysteresis.
...
SimulatorFullyImplicitBlackoil reports saturation values at each
completed time-step, allowing detection of hysteris behavior.
2014-02-18 14:50:29 +01:00
Andreas Lauser
f7541aa27a
BlackoilPropsAdFromDeck: Add support for PVTO
2014-02-14 17:56:20 +01:00
Andreas Lauser
198f805c2a
switch to the new parser's table utility classes
2014-02-14 17:56:08 +01:00
Andreas Lauser
2deeeef4e4
really use the new parser
...
in the previous commit this was #if 0'ed...
2014-02-14 17:56:08 +01:00
Andreas Lauser
7f485626a2
use the new parser to read the PVT and grid data from the deck
...
the old code has not yet been removed, but in the long term, this is
probably the way to go.
2014-02-14 17:56:07 +01:00
Andreas Lauser
627b1f3906
make the deck from opm-parser available to the black-oil PVT property classes
2014-02-14 17:56:07 +01:00
Atgeirr Flø Rasmussen
a14cff7834
Use new linear solver interface in fully implicit solver.
...
This includes:
- Using the class FullyImplicitBlackoilResidual instead of
in-class definition for the residual object.
- Changing residual field name mass_balance to material_balance_eq.
- Letting the simulator and solver classes accept a
FullyImplicitSystemSolverInterface instead of a LinearSolverInterface.
- In sim_fibo_ad and test_implicit_ad, instantiate class
FullyImplicitSystemSolverSimple, replicating existing behaviour.
2014-02-10 10:47:21 +01:00
Atgeirr Flø Rasmussen
8850868f50
Interface and simple implementation of fully implicit system solver.
...
This is done in preparation for adding a cpr-preconditioning solver
for the fully implicit black-oil system. The existing implementation
that concatenates the whole system and passes it to some linear solver
has been moved from a private function of FullyImplicitBlackoilSolver
to the class FullyImplicitSolverSimple.
To enable this decoupling, the residual struct has been copied out
of the FullyImplicitBlackoilSolver class and is now an independent
struct: FullyImplicitBlackoilResidual. The opportunity has been used
to replace the field mass_balance with material_balance_eq, which is
more precise.
2014-02-10 10:41:18 +01:00
Atgeirr Flø Rasmussen
615a88ad90
Made Residual struct definition public, and documented.
...
This is in anticipation of implementing CPR preconditioning.
2014-02-07 17:15:48 +01:00
Atgeirr Flø Rasmussen
f84b0a6a4d
Remove rs_or_sg_eq from the residual.
...
This has not been used since the introduction of live gas changed
the treatment of rs (and rv) values to make a more compact system.
2014-02-07 16:33:19 +01:00
Atgeirr Flø Rasmussen
0b14af943b
Forward declare PhaseUsage as struct, not class.
2014-02-07 14:38:57 +01:00
Markus Blatt
e05675bd41
Fixes warning about initialization order in FullyImpliciteBlackOilSolver.
2014-02-03 18:14:49 +01:00
Atgeirr Flø Rasmussen
614c3f35af
Removed dead code.
...
The code was partially kept as a reminder to implement
proper well reporting and mass balance reporting. Now
well reporting has been taken care of, so we remove
the code.
2014-01-31 09:07:53 +01:00
Atgeirr Flø Rasmussen
436624f662
Write initial values to eclipse format output.
...
This yields output files that have the same behaviour as
eclipse in terms of number of steps, and what the steps mean.
2014-01-30 14:57:58 +01:00
Atgeirr Flø Rasmussen
38a48dd149
Fix indexing error in if-test.
2014-01-27 10:42:17 +01:00
Atgeirr Flø Rasmussen
f9ea03fe67
Renamed SegmentedWellModel->WellDensitySegmented.
2014-01-24 15:54:01 +01:00
Atgeirr Flø Rasmussen
2f7697e00d
Merge branch 'master' into seg-well-model
2014-01-24 15:48:49 +01:00
Tor Harald Sandve
cdd312fa55
Comment out unused code
...
Part of the code that is no longer in use is commented out.
2014-01-24 13:35:04 +01:00
Tor Harald Sandve
825c9be0db
Fixed white spaces
2014-01-24 13:27:32 +01:00
Tor Harald Sandve
19f0a81db1
Fixed from bitwise to logical operator
...
The && is used instead of &
2014-01-24 13:15:29 +01:00
Tor Harald Sandve
b2ac4c7aac
Fixed missing documentation
2014-01-24 13:14:08 +01:00
Atgeirr Flø Rasmussen
5d386f2a49
Bugfixes in treatment of perforation depths and final accumulation.
2014-01-23 12:42:57 +01:00
Atgeirr Flø Rasmussen
98371f660f
Fix mixture calculation for volatile oil case.
2014-01-23 12:40:54 +01:00
Atgeirr Flø Rasmussen
ac6209640b
Documented interface for SegmentedWellModel.
2014-01-22 13:55:22 +01:00