OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 04:26:55 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,838 Commits 24 Branches 102 Tags 84 MiB
4f414b78ed
Commit Graph

5436 Commits

Author SHA1 Message Date
Kai Bao
2bf82b4262 adding getControlEq() to MultisegmentWell 
to handle the well control equation. THP control is not handled there
yet.
 2017-10-12 13:37:05 +02:00
Kai Bao
ae91296339 generating the pattern of the matrix of MultisegmentWell 
need to be verified.
 2017-10-12 13:37:05 +02:00
Kai Bao
b3a233eecc WIP in adding assembleWellEq for MultisegmentWell 2017-10-12 13:37:05 +02:00
Kai Bao
1ffa87561b adding computePerfRate() in MultisegmentWell 
not tested yet.
 2017-10-12 13:37:05 +02:00
Kai Bao
5d79a7f11b adding computeSegmentFluidProperties for MultisegmentWell 
only considering the fluid densities for now.
more fluid densities needs to be considered.
 2017-10-12 13:37:05 +02:00
Kai Bao
7b873d97c9 small improvements in StandardWell 
there is not functional change.
 2017-10-12 13:37:05 +02:00
Kai Bao
1e32b40837 adding function computeInitialComposition to MultisegmentWell 2017-10-12 13:37:05 +02:00
Kai Bao
eb119f245d adding a few functions to calculate the fractions in MultisegmentWell 2017-10-12 13:37:05 +02:00
Kai Bao
3e2a34239c removing two functions from WellInterface 
computeWellConnectionPressures() and computeAccumWell().
They belongs to the implementation details of well models now.
 2017-10-12 13:37:05 +02:00
Kai Bao
8922f3e041 adding a function calculateExplictQuantities to WellInterface 
to hide some implementation details.
 2017-10-12 13:37:05 +02:00
Kai Bao
47c7c54548 making the updateWellControl to WellInterface 
instead of having two of them in StandardWell and MultisegmentWell
 2017-10-12 13:37:05 +02:00
Kai Bao
553eeaaa82 adding updateWellControl to MultisegmentWell 
it turned out to be same with the one in StandardWell
considerng to make it in the WellInterface.
 2017-10-12 13:37:05 +02:00
Kai Bao
86c9115f1d adding function updateWellStateWithTarget for MultisegmentWell 2017-10-12 13:37:05 +02:00
Kai Bao
c26b5905a8 re-organizting the function prepareTimeStep() for StandardWellsDense 
for better readibility and organization.
 2017-10-12 13:37:05 +02:00
Kai Bao
1024ce31f6 adding function updatePrimaryVariables() to MultisegmentWell 
Basically, calculate the value of primary variables based on WellState.
 2017-10-12 13:37:05 +02:00
Kai Bao
16ecbddefb when encountering a multisegment well 
we create a multisegment well instead of treating all the wells as
StandardWell. Making it compile.
 2017-10-12 13:37:05 +02:00
Kai Bao
d694a72b53 adding initMSWell() to handle MS well related WellState. 2017-10-12 13:37:05 +02:00
Kai Bao
315c4a1659 more implementatin in WellStateMSWell 
very likely that we will not use it.
 2017-10-12 13:36:27 +02:00
Kai Bao
8c0af08056 adding comments for MultisegmentWell 2017-10-12 13:36:27 +02:00
Kai Bao
b5323b1b79 begin the class WellStateMSWell 
it will be for each individual MS well.
it is kind of the start of the refactoring of the WellState.
 2017-10-12 13:36:27 +02:00
Kai Bao
359de15f2b begining MultisegmentWell.hpp 2017-10-12 13:36:27 +02:00
Atgeirr Flø Rasmussen
bbfd5b6413 Merge pull request #1180 from blattms/cleanup-version-ifs 
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
 2017-10-12 13:28:50 +02:00
Atgeirr Flø Rasmussen
f30b95e0e7 Merge pull request #1298 from blattms/cleanup-version-ifs 
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
 2017-10-12 13:28:45 +02:00
Atgeirr Flø Rasmussen
91cac266b4 Merge pull request #1299 from andlaus/remove_SimulationParameter 
do not set the SimulationParameter property anymore
 2017-10-12 10:47:03 +02:00
Atgeirr Flø Rasmussen
9206909f75 Merge pull request #1297 from GitPaean/ratio_economic_well 
handling WELL workover over ratio economic limit.
 2017-10-12 06:52:33 +02:00
Atgeirr Flø Rasmussen
aba0b14907 Merge pull request #1301 from andlaus/update_banner2 
update flow startup message
 2017-10-12 06:49:06 +02:00
Andreas Lauser
d1ce08d654 update flow startup message 
The old message was not really accurate anymore because flow also
supports the polymer and solvent extensions. (Also, the parentheses
around the version were removed because they are not necessary.)

v2: use the message proposed by [at]atgeirr
v3: re-add accidentially removed website URL
 2017-10-11 23:33:47 +02:00
Atgeirr Flø Rasmussen
df59dbbabf Merge pull request #1177 from alfbr/master 
Removing redundant checks from Nexus
 2017-10-11 21:57:36 +02:00
Markus Blatt
2bdafdb602 [cleanup] Removes unnecessary if clauses for unsupported DUNE versions. 
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
 2017-10-11 21:25:18 +02:00
Atgeirr Flø Rasmussen
d770e16abf Merge pull request #1289 from totto82/removeWellStateFullyImplicitBlackoilDense.hpp 
Remove WellStateFullyImplicitBlackoilDense
 2017-10-11 18:59:53 +02:00
Andreas Lauser
ae3842fa80 remove do not set the SimulationParameter property anymore 
this needs to merged before the SimulationParameter hack can be
removed from eWoms. the patch will cause spurious deprecation warnings
until then. (i.e., it is best to merge them together.)
 2017-10-11 16:01:55 +02:00
Markus Blatt
6a5dc78249 [cleanup] Removes unnecessary if clauses for unsupported DUNE versions. 
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
 2017-10-11 15:53:45 +02:00
Atgeirr Flø Rasmussen
67401d7d63 Merge pull request #1287 from andlaus/improve_polymorphic_flow 
Improve polymorphic flow
 2017-10-11 15:44:54 +02:00
Atgeirr Flø Rasmussen
0264a1f609 Merge pull request #1294 from akva2/there_there_mr_ocd 
quell signed/unsigned mismatch warning
 2017-10-11 14:07:03 +02:00
Kai Bao
5328de6361 handling WELL workover over ratio economic limit. 2017-10-11 13:35:07 +02:00
Tor Harald Sandve
dc8f811cbe Remove WellStateFullyImplicitBlackoilDense 
After the restructuring of of the well model, keeping an extra class for
the "Dense" model is not needed. The only thing still left in
WellStateFullyImplicitBlackoilDense was some solvent related stuff, this
PR moves this to WellStateFullyImplicitBlackoil and removes
WellStateFullyImplicitBlackoilDense.

In addition to a cleaning code this PR fixes missing solvent well output.
 2017-10-11 10:54:59 +02:00
Alf B. Rustad
fa886bc3aa Cosmetic change 2017-10-11 10:45:18 +02:00
Alf B. Rustad
7d32729a00 Cosmetic change 2017-10-11 10:45:18 +02:00
Alf B. Rustad
db7c47042c Remove remaining Nexus checks 2017-10-11 10:45:17 +02:00
Alf B. Rustad
520574513f Avoid false positives by introducing a tolerance 2017-10-11 10:45:17 +02:00
Alf B. Rustad
cc3ab456e9 Removing redundant checks from Nexus 2017-10-11 10:44:59 +02:00
Kai Bao
2458b45901 removing GEFAC and SSOL from MissingFeatures.cpp 2017-10-10 15:53:12 +02:00
Atgeirr Flø Rasmussen
de1be6b5ef Merge pull request #1273 from GitPaean/different_oscillation 
avoiding the oscillation treatment applied to well solution
 2017-10-10 14:29:04 +02:00
Andreas Lauser
ab93f58371 some minor cleanups 
this fixes a few warnings and removes now-unnecessary function arguments.
 2017-10-10 14:07:07 +02:00
Arne Morten Kvarving
a0b81a131a quell signed/unsigned mismatch warning 2017-10-09 14:45:08 +02:00
Atgeirr Flø Rasmussen
63b38cfe20 Merge pull request #1281 from totto82/fixRESV 
Use pore volume weighted averaged hydrocarbon state in rateConverted.
 2017-10-09 13:42:43 +02:00
dr-robertk
682424a7bf Merge pull request #1286 from blattms/communicate-ebos-solution-in-run 
Communicate the ebos solution at the beginning of the run method.
 2017-10-09 13:13:58 +02:00
Andreas Lauser
cede806bd5 flow: refactor the specializations 
The motivation for this PR is that currently the build fails on my
Ubuntu 17.10 laptop with two processes because that machine "only" has
8 GB of RAM (granted, the optimization options may have been a bit too
excessive). under the new scheme, each specialization of the simulator
is put into a separate compile unit which is part of
libopmsimulators. this has the advantages that the specialized
simulators and the main binary automatically stay consistent, the
compilation is faster (2m25s vs 4m16s on my machine) because all
compile units can be built in parallel and that compilation takes up
less RAM because there is no need to instantiate all specializations
in a single compile unit.

on the minus side, all specializations must now always be compiled,
the approach means slightly more work for the maintainers and the
flow_* startup code gets even more complicated.
 2017-10-06 15:35:00 +02:00
Andreas Lauser
0c92c24dcb flow_ebos*: make it build and (the sequential part) work if dune-fem is available 
in particular, this implied some changes to the MPI initialization
code. since dune-fem's GridPart class currently has issues with
CpGrid's implementation of loadBalance(), parallel computations still
do not work if dune-fem is around, but at least sequential ones now
do even if MPI is enabled.
 2017-10-06 15:35:00 +02:00
Andreas Lauser
64d7366de2 mark the non-template methods of the adaptive time stepper as inline 
this is needed to avoid linker errors if this class ought to be used
in multiple compile units. IMO the main problem here is the use of an
_impl.hpp file.
 2017-10-06 15:34:59 +02:00
Markus Blatt
9adc4d5d3c Communicate the ebos solution at the beginning of the run method. 
Currently, the ReservoirState passed to the method and converted
to the initial solution of the Ebos simulator might have wrong
values in the ghost layer (this is the case for SPE9, Norne, Model 2).
This commit uses the syncOverlap method to update these values once they
are converted to the Ebos solution. The  ReservoirState remains untouched.
This is enough to have consistent values throughout the simulation and only
introduces one additional communication step.
 2017-10-05 14:33:48 +02:00
Arne Morten Kvarving
35fbe03ca7 remove unused variables 
quells warnings
 2017-10-05 12:02:10 +02:00
Arne Morten Kvarving
167147acc4 use std::remove_const instead of Dune::remove_const 2017-10-05 12:02:10 +02:00
Andreas Lauser
d95b622c75 mark initHydroCarbonState() as inline 
this allows it to be used in multiple compile units without the linker
running amok.
 2017-10-04 19:24:20 +02:00
Tor Harald Sandve
ebc2f46967 Use pore volume weighted averaged hydrocarbon state in rateConverted. 
- pressure, rs and rv is averaged using hydrocarbon pore volume weights.
- pvtRegions is used as input in the conversion factor calculations.
- the pvt cell of the first well cell is used as the pvt index.
(Completing a well in two different PVT regions sounds like a very bad
idea anyway)
- FIP region support is added to the rate converter also for the ebos
interface.
 2017-10-03 10:25:56 +02:00
Kai Bao
28a7167d61 avoiding the oscillation treatment applied to well solution 
it is a design to avoid some performance degeneration for parallel
running.
 2017-09-29 17:15:39 +02:00
Atgeirr Flø Rasmussen
f7529cf33e Merge pull request #1269 from GitPaean/fixing_well_efficiency 
correcting the way to use efficiency factor in assembleWelEq
 2017-09-25 10:26:55 +02:00
Atgeirr Flø Rasmussen
83ca6d41e3 Merge pull request #1263 from totto82/gasoil 
Make 2p gas oil compile and run
 2017-09-21 14:03:33 +02:00
Tor Harald Sandve
5839962e31 Some trivial cleaning 2017-09-21 12:16:46 +02:00
Atgeirr Flø Rasmussen
c1024ce2d1 Merge pull request #1268 from blattms/log-wells-debug-messages-only-on-master 
Log debug messages about wells only on master.
 2017-09-21 10:33:04 +02:00
Tor Harald Sandve
992ab84435 Remove support and tests for pseudo 2p model in flow ebos 2017-09-20 08:11:44 +02:00
Tor Harald Sandve
b452d16f46 Fix parallell run 2017-09-19 11:16:34 +02:00
Tor Harald Sandve
69c608829f Include RESV in the scaling factor 
- solvent + RESV is not correct. Make the simulator throw until this is
sorted out.

- remove unused parameter
 2017-09-18 11:28:13 +02:00
Tor Harald Sandve
352dccd5e9 Make 2p gas oil compile and runs 
-- use mapping from canonicalToActiveCompIdx from Ebos
-- add guards againts non-existing components
 2017-09-18 11:28:13 +02:00
Alf Birger Rustad
7b1e034a90 Merge pull request #1270 from atgeirr/fix-output-timestep 
Fix report step number associated with substeps.
 2017-09-17 20:25:33 +02:00
Atgeirr Flø Rasmussen
60fe6b2687 Fix report step number associated with substeps. 
It appears summary files by convention expect all substep data points to
be chunked together with the data point at the end of the report step.
 2017-09-15 12:04:30 +02:00
Kai Bao
fa03db07f8 correcting the way to use efficiency factor in assembleWelEq 2017-09-11 13:01:55 +02:00
Markus Blatt
a1f960b467 Reallow logging fatal errors for well convergence on all ranks 2017-09-07 14:45:00 +00:00
Markus Blatt
5d1eff5107 Log debug messages about wells only on master. 
Previously all ranks logged the message and did clutter the
output files quite a bit.
 2017-09-07 14:17:56 +00:00
Kai Bao
cd4d17bfa7 removing a few unused nw variable in StandardWell_impl. 2017-09-07 15:04:09 +02:00
Atgeirr Flø Rasmussen
77f3bdaeda Merge pull request #1257 from totto82/add_invert4x4 
Add invert4x4 specialization for invertMatrix()
 2017-09-04 09:08:32 +02:00
Tor Harald Sandve
210f1edf25 Add test for invert 4x4 matrix specialization 2017-08-29 11:01:20 +02:00
Kai Bao
b4538af164 not throwing when encountering multisegment wells. 2017-08-29 10:01:31 +02:00
Kai Bao
9accb56c86 adding a test for well model. 
It is just test for StandardWell.
 2017-08-25 14:09:26 +02:00
Kai Bao
355be6c26c collecting the NaN and too large well residuals 
make sure all the processes will throw if there is any of the processes
found abnormal residual values.
 2017-08-25 14:09:26 +02:00
Kai Bao
8abe48a693 making destructor of WellInterface virtual 
to avoid memory leaking.
 2017-08-25 14:09:26 +02:00
Kai Bao
a60a969257 fixing one memory-leaking for flow_ebos running 2p case. 2017-08-25 14:09:26 +02:00
Kai Bao
96340a23ff computePerfRate and crossFlowAllowed protected in StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
bc78553686 renaming well_solutions_ and well_variables 
to give slightly easier understanding.
 2017-08-25 14:09:26 +02:00
Kai Bao
25869026e5 renaming a few functions 
to reflect the functions better. No functional change.
 2017-08-25 14:09:26 +02:00
Kai Bao
9a4a9a2bcc using well name and allow_cf form well_ecl. 2017-08-25 14:09:26 +02:00
Kai Bao
a908bd7cf1 makding createWellContainer a static function. 2017-08-25 14:09:26 +02:00
Kai Bao
f9b7094075 fixing of some comments 
no functional change.
 2017-08-25 14:09:26 +02:00
Kai Bao
52af70ad0e adding debugging output for solveWellEq 
to tell if the solveWellEq is successful.
 2017-08-25 14:09:26 +02:00
Kai Bao
a29be796e7 adding comments about function calculateBhpFromThp. 2017-08-25 14:09:26 +02:00
Kai Bao
277d26df8a cleaning up well residual related in BlackoilModelEbos 
TODO: how to output the information for debugging well iteration
process.
 2017-08-25 14:09:26 +02:00
Kai Bao
7a9fc2132e more cleaning up of StandardWellsDense. 
not functional change.
 2017-08-25 14:09:26 +02:00
Kai Bao
68edfd7235 removing several unused variables. 2017-08-25 14:09:26 +02:00
Kai Bao
fe3d2f91e0 adding functions to calcuate between thp and bhp 
to reduce some code duplication in StandardWell
 2017-08-25 14:09:26 +02:00
Kai Bao
8a12ec677f more cleaning up 
not funtional change.
 2017-08-25 14:09:26 +02:00
Kai Bao
66b5226039 removing some unused variables 
to reduce warnings.
 2017-08-25 14:09:26 +02:00
Kai Bao
f1c0e84878 cleaning up for StandardWellsDense. 2017-08-25 14:09:26 +02:00
Kai Bao
49df0c12f6 cleaing up and fixing the error from rebasing. 2017-08-25 14:09:26 +02:00
Kai Bao
af6155d15a updating the well group status before updating targets. 
This recovers the running with group control.
 2017-08-25 14:09:26 +02:00
Kai Bao
31ce880ba7 fixing the prallel running. 
It needs WellSwitchingLogger for all the processes even there are not
wells in some of the processes.
 2017-08-25 14:09:26 +02:00
Kai Bao
5cb0a5109e adding setWellSolutions to StandardWellsDense. 
the function will calculate the well_solutions_ based on well_state.
It will be used when we recover the well_state from a failed iteration,
then we should also update well_solutions_ for consistence.
 2017-08-25 14:09:26 +02:00
Kai Bao
5af15fa63f removing well_soltutions_ from WellStateFullyImplicitBlackoilDense 
adding function setWellSolutions() to StandardWell.

The class WellStateFullyImplicitBlackoilDense is ready to be removed
now, while the only thing can go wrong compred with the original version
is the group control, which is not tested yet.
 2017-08-25 14:09:26 +02:00
Kai Bao
8441eb77bd not using wellSolutions() from WellState 
while not sure whether we can remove it totally because of the comments
related to group control.
 2017-08-25 14:09:26 +02:00
Kai Bao
6dcb0dfba1 fixing the vfp running with flow_ebos. 2017-08-25 14:09:26 +02:00
Kai Bao
78dd9d1d16 more cleaning up of the interface of WellInterface and StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
1550fb7600 WIP in cleaning up the interfaces of WellInterface and StandardWell 
commiting now to save some changes.
 2017-08-25 14:09:26 +02:00
Kai Bao
d4f26ad47a recovering the running of flow_ebos for 2p + dummy phase. 2017-08-25 14:09:26 +02:00
Kai Bao
c43505d007 cleaning up some interface in WellInterface. 2017-08-25 14:09:26 +02:00
Kai Bao
6bbbe5061d adding the copyright information. 2017-08-25 14:09:26 +02:00
Kai Bao
3e26a8b467 using different size of block size of well and reservoir 2017-08-25 14:09:26 +02:00
Kai Bao
894529be57 small cleaning up. 2017-08-25 14:09:26 +02:00
Kai Bao
f19dd03387 using Base to represent WellInterface<TypeTag> 
for better readability.
 2017-08-25 14:09:26 +02:00
Kai Bao
bd84e3c9f3 making a trival way to reduce the covergence of the wells. 
to be improved later.
 2017-08-25 14:09:26 +02:00
Kai Bao
4f716a633d using legacyDepth_ for the perfoation depth 
for StandardWell. It turns out that it can be different with the
grid.getCellDepth() from the parser.
 2017-08-25 14:09:26 +02:00
Kai Bao
6e0da756dc fixing the running of flow_ebos_2p. 
by not adding the dummy phase.
 2017-08-25 14:09:26 +02:00
Kai Bao
c1ee941195 adding shear calculation to the polymer simulation. 2017-08-25 14:09:26 +02:00
Kai Bao
d4fa8c06f1 adding computeRepRadiusPerfLength() to WellInterface. 2017-08-25 14:09:26 +02:00
Kai Bao
d1727d0183 correcting the injectivity with polymer injection. 2017-08-25 14:09:26 +02:00
Kai Bao
d470edfb0b correct an assertion error in getWellConvergence in StandardWell 
and adding comments why it is the case for polymer case.
 2017-08-25 14:09:26 +02:00
Kai Bao
5ed9f4d497 incorporting polymer except the parts related to PLYSHLOG 2017-08-25 14:09:26 +02:00
Kai Bao
b3428a8bf9 incorporating the solvent related to StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
72ca91d59b more cleaning up for StandardWellsDense and StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
0acd0ef387 small adjustment of member functions of WellInterface 2017-08-25 14:09:26 +02:00
Kai Bao
af254a8f4d removing some of the using of Wells in StandardWellsDense 2017-08-25 14:09:26 +02:00
Kai Bao
8ddd197dcf cleaning up StandardWellsDense 
removing more unused stuff.
 2017-08-25 14:09:26 +02:00
Kai Bao
63c418c02f adding fucntion updateListEconLimited() to WellInterface 2017-08-25 14:09:26 +02:00
Kai Bao
5986295975 adding checkRatioEconLimits to WellInterface 2017-08-25 14:09:26 +02:00
Kai Bao
1a4bd6ffb2 adding checkMaxWaterCutLimit and checkRateEconLimits to WellInterface 2017-08-25 14:09:26 +02:00
Kai Bao
369ccfef52 handling well_efficiency_factor_ in WellInterface. 2017-08-25 14:09:26 +02:00
Kai Bao
358d4c2a00 cleaning up more things from StandardWellsDense 2017-08-25 14:09:26 +02:00
Kai Bao
7e9eee4ee4 moving wsolvent and wpolymer to WellInterface 
to do this, adding well_ecl_ and current_step_ to WelInterface.
 2017-08-25 14:09:26 +02:00
Kai Bao
a02a0d8599 removing updateWellStateWithTarget from StandardWellsDense 
and also fixing the assertion error related to disabling the residual()
    function of StandardWellsDense.
 2017-08-25 14:09:26 +02:00
Kai Bao
8130b32791 cleaning up some functions from StandardWellsDense. 2017-08-25 14:09:26 +02:00
Kai Bao
e6d2b8550b adding function computeWellPotentials to StandardWell 
for some similar reasons, this function stays in StandardWell for now.
Eventually, it should go to WellInterface with some refactoring work.
 2017-08-25 14:09:26 +02:00
Kai Bao
1d34c9dc6e adding computeWellPotentialWithTHP() to StandardWell 
it is not clear at the moment how all the well potentials related will
work with MS wells. For the moment, keep the well poentials related only
in StandardWell.

By theory, they should be very similar, while some dependence on certain
member variables makes some small refactoring work necessary.
 2017-08-25 14:09:26 +02:00
Kai Bao
c3cc4021fa adding computeWellRatesWithBhp() to StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
dfc532a713 cleaning up some more stuff unused in StandardWellsDense 2017-08-25 14:09:26 +02:00
Kai Bao
e695a3c418 cleaning up some unused stuff from StandardWellsDense 2017-08-25 14:09:26 +02:00
Kai Bao
f1677015fe using getWellConvergence in BlackoilModelEbos 
Tested with SPE1.

TODO: with the current way, we are not outputting any well residual
information. We need to address what kind of residual information we
want to output with the new well model.
 2017-08-25 14:09:26 +02:00
Kai Bao
ab67635134 adding applySolutionWellState to apply solution from reservoir 
to update well state.

With this way, the BlackoilModelEbos does not need to know the data type
assocated with different well type.

It is not well tested yet.
 2017-08-25 14:09:26 +02:00
Kai Bao
07f563a1e1 implementing two apply() function in StandardWell_impl 
The two functions will be essentially the same even for different types
of wells. Maybe later we should try to put them in WellInterface.
 2017-08-25 14:09:26 +02:00
Kai Bao
f1123acdf0 also switching B and C in StandardWell_impl 2017-08-25 14:09:26 +02:00
Kai Bao
e7a2e52763 making matrix C and B same with the reference paper. 
Really no good point to make C and B different from the paper
formulation except introducing more confusion.
 2017-08-25 14:09:26 +02:00
Kai Bao
51226af445 refactoring solveJacobianSystem() not to handle xw. 
which is one step to avoid to access the type of xw, which is related to
the implementation of the well model.
 2017-08-25 14:09:26 +02:00
Kai Bao
b080874b89 adding the offset of perf for each well 
when accessing perforation rate and perforation pressure from the
well_state.
 2017-08-25 14:09:26 +02:00
Kai Bao
168205a993 checking magnitude of the residual for convergence 
in StandardWell_impl.
 2017-08-25 14:09:26 +02:00
Kai Bao
ddb21e1f2c correcting the indexing of xvar_well_old in updateWellState 
in StandardWell_impl.
 2017-08-25 14:09:26 +02:00
Kai Bao
1c2353fab8 making the ref_depth_ to be double in WellInterface 
which is a mistake.
 2017-08-25 14:09:26 +02:00
Kai Bao
4624ecc63d correcting the dFLimit and dBHPLimit in StandardWell_impl 2017-08-25 14:09:26 +02:00
Kai Bao
eca28a8ade adding a function outputWellState for StandardWellsDense 
to output the well state for debugging purpose.
 2017-08-25 14:09:26 +02:00
Kai Bao
3ceea76616 adding function computeAccumWell and computeWellConnectionPressures 
to StandardWell and removing a few not needed function from StandardWellsDense
 2017-08-25 14:09:26 +02:00
Kai Bao
033fe70620 making init() function for WellInterface virtual. 2017-08-25 14:09:26 +02:00
Kai Bao
4e4e383107 slightly changing createWellContainer() in StandardWellsDense 
no functional change.
 2017-08-25 14:09:26 +02:00
Kai Bao
9c215faade removing function allow_cross_flow() from StandardWellsDense 2017-08-25 14:09:26 +02:00
Kai Bao
229244142f adding updateGroupControls() to StandardWellsDense 
which separates the group control related operations. The group control
has to be handled in the level of all wells, which makes more functions
of the well class to be visible outside.
 2017-08-25 14:09:26 +02:00
Kai Bao
d535157b1a cleaning up a few fucntions in StandardWellsDense 
to remove the implementation implemented in StandardWell already.
 2017-08-25 14:09:26 +02:00
Kai Bao
fb5fa836c0 removing some repeated contents in getWellConvergence in StandardWellsDense 
which results from the rebasing process.
 2017-08-25 14:09:26 +02:00
Kai Bao
48dee6bd7a renaming function allCrossFlow() in StandardWell 
to avoid confusion. and the detail of the function needs to be
justified.
 2017-08-25 14:09:26 +02:00
Kai Bao
e5b5e250fe incoporating more content from PR 1220 
while the parts related to polymer are not incoporated fully yet, since
it has been considered in the new well model refactoring.
 2017-08-25 14:09:26 +02:00
Kai Bao
e3399ca203 fixing some compilation error after rebase. 
while a lot of new stuff have not entered, since many of the essential
parts are in different files now. Rebasing will not incoporate the new
stuff automatically.
 2017-08-25 14:09:26 +02:00
Kai Bao
07d24b9d8d solveWellEq in StandardWellsDense calls 
solveWellEq from each individual well.
 2017-08-25 14:09:26 +02:00
Kai Bao
9dace225de adding wellEqIteration() to StandardWell 
the involvement of the group control in updateWellControls() makes the
solution of well equations for each well individually more troublesome.
As a result, we will still makes the solveWellEq in all the wells level.
 2017-08-25 14:09:26 +02:00
Kai Bao
d99fe876dd adding getWellConvergence for StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
e01e8c352a adding function computeWellConnectionDensitesPressures to StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
0f997a537a adding computeConnectionPressureDelta to StandardWell 
it is also copied from WellDensitySegmented while only handle one
Standard Well.
 2017-08-25 14:09:26 +02:00
Kai Bao
9514e44d13 adding function computeConnectionDensities to StandardWell 
which is copied from WellDensitySegmented, while avoid using of the
Wells struct.

TODO: find a better place to put these long functions.
 2017-08-25 14:09:26 +02:00
Kai Bao
20c36d19c1 adding computePropertiesForWellConnectionPressures to StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
d3378ab403 adding function computeAverageFormationFactor to StandardWellsDense 
which is seperated from getWellConvergence for better flexiblity later.
 2017-08-25 14:09:26 +02:00
Kai Bao
9c65684bf0 adding updateWellControl to StandardWell 
TODO: check whehter it should go to WellInterface.
 2017-08-25 14:09:26 +02:00
Kai Bao
f293e81336 adding function updateWellStateWithTarget to StandardWell 
without dealing with wsolvent function. It can be just a member variable
since we are handling well one by one individually.
 2017-08-25 14:09:26 +02:00
Kai Bao
1d9d70ee02 adding the updateWellState to StandardWell 
this function is very long and need to debug very carefully and it
should be split for better readability for sure.
 2017-08-25 14:09:26 +02:00
Kai Bao
1174d2de54 adding assembleWellEq to StandardWell 
F0_ is not initialized yet.
 2017-08-25 14:09:26 +02:00
Kai Bao
1942853337 adding function computePerfRate to StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
7223163155 handing the numComponents in WellInterface 2017-08-25 14:09:26 +02:00
Kai Bao
266442b0bd adding extendEval() to StandardWell 
For this type of functions that related to Evaluation should be
implemented within individual well model.
 2017-08-25 14:09:26 +02:00
Kai Bao
ff2ada66bc adding the three swapping functions to WellInterface 
They should only be used to change the order related to the reservoir
variables, so they should be same for all the well models and should be
put in the WelInterface.
 2017-08-25 14:09:26 +02:00
Kai Bao
1a4ceeec66 makding the StandardWell and WellInterface templated 
with the template parameter TypeTag.
 2017-08-25 14:09:26 +02:00
Kai Bao
182bf315f3 implementing getQs() and getBhp() within StandardWell. 
It does not compile. Now it is pretty clear that anything related to
Evalulation should go to each individual well model (StandardWell or MS
well ) and not stay with the Wells.
 2017-08-25 14:09:26 +02:00
Kai Bao
2d02503091 more or less getting the old implementation in 
and compile now.
 2017-08-25 14:09:26 +02:00
Kai Bao
0cf6699591 adding StandardWell class 
copied from the old implementation, which is the starting point for the
new refactoring
 2017-08-25 14:09:26 +02:00
Kai Bao
910fe0318c adding the WellInteface 
will be the base class for different well models.
 2017-08-25 14:09:26 +02:00
Robert Kloefkorn
07e0d71906 [feature][flow] Add a common executable for all flow variants, i.e. 
flow_ebos, flow_ebos_polymer, flow_ebos_solvent, flow_ebos_2p.
 2017-08-23 16:21:15 +02:00
Tor Harald Sandve
6716ca63c9 Force solvent saturation between [0,1] 2017-08-23 09:50:40 +02:00
Tor Harald Sandve
55fc987af8 Add 4x4 invertMatrix specialization in FMatrix 
The specialization is added in the ISTLSolver, not in fmatrix.h in dune-
common since 1) we need it now 2) the special treatment of singular and
near singular matrices may be specifiy to the solvent model.
 2017-08-23 09:50:19 +02:00
Atgeirr Flø Rasmussen
58eea94460 Merge pull request #1247 from totto82/removeState-PR 
Remove reservoirState from BlackoilModelEbos
 2017-08-22 20:47:16 +02:00
Tor Harald Sandve
d643476ea5 Fix fallout if no group controll (NONE) is specified for a group 2017-08-18 08:56:26 +02:00
Tor Harald Sandve
6146190844 Fixes comments from PR 
Don't sum ghost cells in the RateConverter
Some cleaning and comments.
 2017-08-18 08:46:44 +02:00
Atgeirr Flø Rasmussen
8998207d7e Merge pull request #1253 from blattms/print-bubble-dew-point-problems-only-on-0 
Output bubble/dew point computation problems only on rank 0.
 2017-08-17 22:25:53 +02:00
Tor Harald Sandve
6bca2ea69c Fix rebase 2017-08-17 11:34:33 +02:00
Tor Harald Sandve
2bf8d48272 Remove redundant local state in ParallelDebugOutput 2017-08-17 11:13:00 +02:00
Tor Harald Sandve
593546da4b Fix 2p case in relativeChange(...) in BlackoilModelEbos 2017-08-17 11:13:00 +02:00
Tor Harald Sandve
ce84a59b29 Remove reservoirState from BlackoilModelEbos 
1) Use the solution variable directly in RelativeChange(...)
2) Add a method in the RateConverter that takes the simulator instead of the state.
3) Pass the reservoir pressure directly to the well initialization.
4) Move convertInput(...) to SimulatorFullyImplicitBlackoilEbos.hpp.
This code is only used to convert the initial reservoir state.
5) Modify  updateState(...). The solution variable is updated directly and adaptPrimaryVariable(...)
from ewoms is used to switch primary variables. An epsilon is passed to adaptPrimaryVarible(...) after a switch
of primary variables to make it harder to immediately switch back.

The following code used by flow_ebos still uses the reservoirState
1) the initialization
2) restart
3) output of the initial state
4) the step methods in AdaptiveTimeStepping and NonlinearSolver.
The reservoirState is not used by this methods, so after the initial step, an empty reservoirState is passed around in the code.
 2017-08-17 11:13:00 +02:00
Atgeirr Flø Rasmussen
e3ceecdfa4 Silence unused variable warnings. 2017-08-15 11:17:30 +02:00
Markus Blatt
7b3b99f692 Output bubble/dew point computation problems only on rank 0. 
We do this by switching to output the global index of the cells.
In a first step the problematic cell indices are gather on process 0.
Then they are logged there.

This should prevent spurious ouput at the end of PRT and DEBUG files after the
simulation time is printed. This happened previously for some parallel
runs of model 2. Unfortunately, it seems these problems do not appear any
more for the current master. At least I could not reproduce them.
 2017-08-14 21:34:54 +02:00
Atgeirr Flø Rasmussen
c6e729b1bf Merge pull request #1252 from atgeirr/debug-reordering-solver 
Fixing bugs and improving the reordering solver
 2017-08-10 14:09:58 +02:00
Atgeirr Flø Rasmussen
67823c5893 Disable debugging output of detailed cell data. 2017-08-10 13:09:22 +02:00
Atgeirr Flø Rasmussen
784bcf6892 Experiment with relaxing single cell iterations. 2017-08-10 12:31:04 +02:00
Atgeirr Flø Rasmussen
9cf6832140 Ignore limits to rs and rv changes. 
As implemented with a relative limit, even with 1e9 default limit it
would still be impossible to get away from a zero value. It is
possible that the limits may return later, implemented in a less
buggy way, however for now they do not seem necessary.
 2017-08-10 11:25:47 +02:00
Kai Bao
c59aa9127e making rate_converter to be reference to the one in Simulator 
keeping the const property in the Well Model.
 2017-08-10 11:20:09 +02:00
Kai Bao
cf902e1a8b Simulator Blackoil and StandardWellsDense uses same rate_converter 
fixing the running of group control.
 2017-08-10 10:25:39 +02:00
Atgeirr Flø Rasmussen
0a440d98ce Merge pull request #1238 from totto82/removeConvertResults2 
Ask ebos to formulate the equation by surface volumes directly
 2017-08-10 10:01:32 +02:00
Atgeirr Flø Rasmussen
1e0facec4a Fix updateState() saturation update. 2017-08-09 15:47:39 +02:00
Atgeirr Flø Rasmussen
608a674858 Make dh_sat behave like in coupled transport solver. 2017-08-07 16:17:57 +02:00
Kai Bao
338828fdce fixing the running of the vfp related for flow_ebos 
the output of the THP is still not yet correct.
 2017-08-07 11:39:11 +02:00
Atgeirr Flø Rasmussen
c39341006d Bugfix: follow opm-material convention for capillary pressure 2017-08-04 11:39:51 +02:00
Atgeirr Flø Rasmussen
e9e4416428 Make computeCellState() a const method. 2017-08-04 11:39:09 +02:00
Tor Harald Sandve
6b55b8316b Add interface for passing cell pressures directly in wellState.init(...) 2017-08-03 10:31:10 +02:00
Atgeirr Flø Rasmussen
12bd67e248 Create oil-in-place data if overall efficiency is requested by output. 2017-08-01 16:40:34 +02:00
Atgeirr Flø Rasmussen
babf06eade Merge pull request #1243 from blattms/write-initial-oip 
Write the initial OIP values if requested.
 2017-08-01 16:15:46 +02:00
Kai Bao
ab1b57b994 fixing the if condition for 2p + dummy phase 
from if (numComp < numEq) to if (numComp < numWellEq)
 2017-07-31 12:43:50 +02:00
Markus Blatt
900fec427d Cleaned up bogus documentation and whitespace 2017-07-20 12:37:01 +02:00
Markus Blatt
c06e5b7cf8 Removed boolean parameter indicating initial write to writeTimeStep. 
Instead we use the timer to determine whether this is the initial write.
 2017-07-20 12:12:41 +02:00
Markus Blatt
b89aa1fa4a Added initialStep to SimulatorTimerInterface 2017-07-20 12:11:11 +02:00
Markus Blatt
1939453adb Write the initial OIP values if requested. 
This is when writing the first time step as is this is
the first step when OIP is available.
 2017-07-19 22:06:08 +02:00
Markus Blatt
542f181f7e Narrow down the possible Matrix types for ParallelOverlappingILU0 
It now has to be a BCRSMatrix, but the block type is flexible and
needs to this way. flow_legacy uses MatrixBlock, and flow_ebos uses
FieldMatrix.
 2017-07-03 13:50:21 +02:00
Markus Blatt
1bb0968283 Work around unstable matrix inversion in DUNE 2.[34] 
The versions are missing the specialized code for inverting
a 3x3 matrix that makes the algorithms quite a bit more stable.
With this patch we fall back to using our own MatrixBlock that does
not suffer from this deficiency.
 2017-07-03 10:20:23 +02:00
Tor Harald Sandve
082e00d4ec Ask ebos to formulate the equation by surface volumes directly 2017-06-29 13:58:20 +02:00
Robert Kloefkorn
ce7f3f46a1 [feature] Added two-phase executable for numEq = 2. 2017-06-29 12:56:37 +02:00
Atgeirr Flø Rasmussen
a980993289 Make reordering solver work with iterated implicit. 
Also tighten tolerances. They were too slack, giving significant
differences from non-reordering implementation towards the end of
SPE1CASE2 for example.
 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen
9b2d696b86 Tweak tolerance. 
Note that a more proper dimensionless residual check is still a good idea.
 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen
c40ef4d9d0 Modifications to catch up with master branch. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen
4f9a9359ee Refine convergence check, retain max change info. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen
6167fff62a WIP: change what is logged, keep track of max change. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen
ab735b33e1 WIP: add sequential model for debugging. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen
0f8cd2c212 Bugfix: use correct sign for z gradient. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen
e653067951 Adapt new interface with timers. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
b5b8fa14de Bugfix: use correct pv multiplier for initial and current state. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
fb6dd3adf8 Add well flux terms. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
2c20bb6cde Bugfix: take absolute value of residuals for comparison. 
Also tighten hardcoded tolerance for testing, and update a comment.
 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
87477f7a44 Bugfix: update output reservoir state. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
79fed93b76 Fix saturation bug. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
f12c781f3e Fix bugs. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
e83b8cd0ac Finished updateState(). 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
0a3c65707d More work in progress... 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
56853a0272 Avoid derivative pollution. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
5b21cdf54f Still working on reordering solver. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
fae4922482 More work in progress for reordering solver. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen
1a8e28bd7e More work in progress on reordering solver. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen
ad6b5ec812 Work in progress (still) on reordering solver. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen
ad3e8b591b Add pvtRegions() accessor. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen
edeeb3e0ad Work in progress on reordering solver. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen
5e34ba33a2 Add access to low-level functionality. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen
803b40b82f Work in progress on BlackoilReorderingTransportModel. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen
293a7abfa2 Add skeleton of reordering transport solver. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen
0d6bf85f96 Merge pull request #1189 from blattms/fix-amg-support 
Fix the PR that said it activated AMG.
 2017-06-27 22:40:14 +02:00
Atgeirr Flø Rasmussen
fa4c4ccee6 Remove 'auto' from one more parameter list. 2017-06-27 20:06:44 +02:00
Robert Kloefkorn
936d035dc2 [bugfix][StandardWellsDense] remove auto from method parameter list. 2017-06-27 16:51:11 +02:00
Markus Blatt
8759c3a89a Set defines in *.cpp files. 
That way we can keep the old order of includes which seems to be needed for compilation.
 2017-06-27 10:00:31 +00:00
Markus Blatt
e8d89bcf48 Fix lookup of std::cerr by including iostream 2017-06-27 10:00:31 +00:00
Markus Blatt
f913baa66e Make use of template argument deduction for createAMGPreconditionerPointer 2017-06-27 10:00:31 +00:00
Markus Blatt
59ca0b4424 Fix the PR that said it activated AMG. 
Actually, it did not as it did set the define eith wrong
or the wrong locations. This commit fixes this and finally
makes AMG available.
 2017-06-27 10:00:31 +00:00
Atgeirr Flø Rasmussen
bf0937fae1 Merge pull request #1220 from totto82/impl_polymer_simpleWellModel 
Add flow_ebos_polymer and flow_ebos_solvent
 2017-06-27 10:51:42 +02:00
Atgeirr Flø Rasmussen
730ab5526c Merge pull request #1233 from nairr/term_output_mod 
Multiple problem logging for linear solver failure
 2017-06-26 13:58:21 +02:00
Rohith Nair
7500d3eb0c edit 2017-06-26 12:46:09 +02:00
Rohith Nair
84ca3cd9b9 Removes multiple problem logging for linear solver convergence failure 2017-06-26 12:21:44 +02:00