Commit Graph

75 Commits

Author SHA1 Message Date
babrodtk
1d6f12e870 Added OMP pragmas 2015-10-02 10:37:08 +02:00
Markus Blatt
d7e6886f4b Return 0 as hydrostatic correction for unperforated cells.
There might be wells without any perforations. It it happens
to be the last well will supscript over the bounds. In other
cases we actually return the correction for the next well.

Not sure whether returning 0 makes any sense, though.
2015-09-24 14:47:45 +02:00
Robert Kloefkorn
c32749b129 SolverFullyImpl: avoid multiple output of redundant information in parallel. 2015-09-16 14:36:28 +02:00
Kai Bao
49d6cfb188 renaming tempB to temp_b to adress the comment. 2015-09-08 10:57:19 +02:00
Kai Bao
b1b9c171b3 update scaling factors for mass balance equations. 2015-09-08 10:57:18 +02:00
babrodtk
466f1947a3 Fixed Eigen 3.3 compatibility 2015-09-07 13:01:31 +02:00
Atgeirr Flø Rasmussen
097542a527 Whitespace fixes.
It turns out I accidentally used tabs for a while, this commit
fixes that for all touched files.
2015-09-07 13:00:41 +02:00
Atgeirr Flø Rasmussen
c795113ce3 Changes to make flow compile with AutoDiffMatrix. 2015-09-07 13:00:02 +02:00
Markus Blatt
02120d14d1 Directly initialize variable with global value.
Previously we initialized a variable for a global
(i.e. sum over all processes) value with the local
value first and the overwrote it with the computed
global. This meant the name did not reflect the value
during the first initialization.

With this commit we fix this by using an additional
variable for the local value that is used to compute
the global one.
2015-09-07 09:50:36 +02:00
Markus Blatt
4cc87c28f6 Fixes parallel runs with solve_welleq_initially
If this option was set there were some branches in
the code that did depend on the local number of wells
but should depend on the number of wells in the reservoir
no matter on which process they are stored.

With this commit we introduce BlackOilModelBase::localWellsActive()
which only takes local wells into account. The function now
BlackOilModelBase::wellsActive() considers all active wells in the
reservoir.
2015-09-05 20:24:50 +02:00
babrodtk
5b287e0ea8 Fixed warnings 2015-09-02 13:02:27 +02:00
Joakim Hove
9bd8d73a26 Using TableManager to get tables. 2015-09-01 13:14:51 +02:00
babrodtk
6c590d4bdb Implemented proper targets for switching to/from THP control 2015-08-19 17:03:41 +02:00
Atgeirr Flø Rasmussen
3c1c3a30ab Merge pull request #430 from babrodtk/vfpprod
Vertical flow performance
2015-08-19 13:27:37 +02:00
babrodtk
62c2373a9d Minor refactoring 2015-08-19 11:46:29 +02:00
babrodtk
b2335ced24 Minor fixes for PR 2015-08-19 11:32:38 +02:00
babrodtk
6b3356e74d Minor fixes for comments in PR 2015-08-19 08:07:51 +02:00
babrodtk
b75baac8fc Fixed sign issue with vfpprod->bhp(flo) 2015-08-18 14:53:36 +02:00
babrodtk
139071d39e Minor performance improvement for non-VFP runs 2015-08-18 10:24:57 +02:00
Tor Harald Sandve
971e7e19cb Add simple solvent model
assumes:
- solvent is immiscible in the oil phase
- gas pvt and relperms are used for the solvent
- no initial solvent in the model

Solvent is injected using the WSOLVENT keyword
TODO: Make it possible to change WSOLVENT
2015-08-18 07:24:08 +02:00
babrodtk
3fddf86eef Initialized well connection pressures first
in assemble(...). This makes VFPINJ behave as expected, and
  VFPPROD for the "trivial table". For the nontrivial table,
  VFPPROD does not match expected behaviour.
2015-08-17 13:05:32 +02:00
babrodtk
657a7c58b8 Added hydrostatic correction for vfp table depth
Closer to reproducing proper results, but som oscillating
 behaviour in plots of actual BHP.
2015-08-14 14:48:15 +02:00
babrodtk
748440eea6 Fixed bug with VFPPROD tables 2015-08-12 15:15:33 +02:00
babrodtk
c513ed4a17 Implemented support for VFPINJ tables. Runs through synthetic non-trivial example 2015-08-11 16:31:43 +02:00
babrodtk
2994d1d932 Refactoring 2015-08-11 12:21:06 +02:00
babrodtk
5af128bcb6 Refactoring 2015-08-11 09:47:06 +02:00
babrodtk
bc2fb23af9 Minor beatuifications of code 2015-08-10 15:04:21 +02:00
babrodtk
d45543b8fb Proper integration of derivatives for THP 2015-08-10 08:55:06 +02:00
babrodtk
22b94b75e6 VFP table which maps THP==BHP gives identical results 2015-08-10 08:55:06 +02:00
babrodtk
7eb94caeba Updated integration of VFP tables. Produces almost identical results to bhp control 2015-08-10 08:55:05 +02:00
babrodtk
34edf3a5b8 Changed API of VFPProperties to take ADBs 2015-08-10 08:55:05 +02:00
babrodtk
79410685ca Refactoring and updated tests 2015-08-10 08:54:34 +02:00
babrodtk
0467af953c Added function to compute THP from BHP using VFP tables 2015-08-10 08:54:34 +02:00
babrodtk
d27403b427 Initial integration of VFPProdTables 2015-08-10 08:54:34 +02:00
babrodtk
15d3171ae1 Partial integration of VFPProperties into BlackoilModel 2015-08-10 08:53:42 +02:00
André R. Brodtkorb
0e3b951cd0 Added skeleton of interpolation using ADBs as input 2015-08-10 08:50:25 +02:00
Tor Harald Sandve
065b2f595c Add support for NNC in the simulator
1) NNC are added the grad, div and average operators
2) NNC are added the upwindSelector
3) NNC transmissibilities are added to the face transmissibilities
2015-07-09 12:15:59 +02:00
Atgeirr Flø Rasmussen
98dfe892f5 Undo the order changes in commit 1524a1.
This is done to eliminate changes in simulation results.
2015-06-29 16:44:10 +02:00
Atgeirr Flø Rasmussen
4cb8556f42 Simplify fluid interfaces, reuse formation volume factor.
The simplifications are:
 - Do not pass cell indices to fluidViscosity(), fluidReciprocFVF().
 - Pass b (reciprocal f.v.f.) to fluidDensity() instead of pressure etc.

This saves one call to fluidReciprocFVF(), that is removed from
fluidDensity(). Instead the previously stored quantity is passed
to fluidDensity() as an argument.
2015-06-24 10:22:23 +02:00
Atgeirr Flø Rasmussen
1524a10e31 Change order of computation to reduce overhead. 2015-06-24 10:06:40 +02:00
Atgeirr Flø Rasmussen
c96a33124c Refactor addWellEq().
The method has been split in three parts:
        computeWellFlux(const SolutionState& state,
                        const std::vector<ADB>& mob_perfcells,
                        const std::vector<ADB>& b_perfcells,
                        V& aliveWells,
                        std::vector<ADB>& cq_s);

        void
        updatePerfPhaseRatesAndPressures(const std::vector<ADB>& cq_s,
                                         const SolutionState& state,
                                         WellState& xw);

        void
        addWellFluxEq(const std::vector<ADB>& cq_s,
                      const SolutionState& state);

This reduces the function length, although most of the content of addWellEq()
now is in computeWellFlux(), so that function is still quite long. It also
allows us to use smaller sets of function arguments, which makes methods easier
to understand.

Finally, it makes it easier to create derived models with custom behaviour.
2015-06-22 11:34:10 +02:00
Atgeirr Flø Rasmussen
dd945a5d5e Add more parameters to addWellContributionToMassBalanceEq.
Also: - call using asImpl(),
      - remove extraAddWellEq().
2015-06-18 14:25:53 +02:00
Kai Bao
0366037fca cleaning up to remove 'unused' warnings 2015-06-17 09:49:11 +02:00
Kai Bao
20746f65dc assert the number of the well equations. 2015-06-16 17:03:53 +02:00
Kai Bao
f2089f5a1b avoiding creating dx_V unnecessarily
by using dx.array() in function solveWellEq().
2015-06-16 17:03:53 +02:00
Kai Bao
919286d700 removing repeated code by using do_while
in function solveWellEq().
2015-06-16 17:03:53 +02:00
Kai Bao
f8e35535fc using lower case for solve_wellEq_initially_ 2015-06-16 17:03:53 +02:00
Kai Bao
0f123a8890 correcting typo in 'to large' 2015-06-16 17:03:53 +02:00
Kai Bao
6f388f5b6d correcting the indentation in updateWellState() 2015-06-16 17:03:53 +02:00
Kai Bao
7e9014f155 changing dx to dwells in defination of updateWellState 2015-06-16 17:03:53 +02:00