OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 18:21:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,846 Commits 24 Branches 102 Tags 84 MiB
bcb501e3d3
Commit Graph

2943 Commits

Author SHA1 Message Date
Andreas Lauser
ef76d0a8cc
Merge pull request #1335 from atgeirr/refactor-sim 
Removing unused code parts and minor refactoring
 2017-11-22 13:57:58 +01:00
Markus Blatt
9402f4bde1 Make CellOwnerHandle available without MPI 
and thus make compilation succeed in this case as using
it is perfectly find even if MPI is not there.
 2017-11-21 15:06:36 +01:00
Tor Harald Sandve
2a7d7b8ae5 Pass ref instead of shared pointer to initEquil 2017-11-21 14:29:08 +01:00
Tor Harald Sandve
31bfb22273 Adapt to the refactoring of the Equil initialization code 
Most noteably the blackoilState is not returned by the initialization
code anymore, instead the initialization class is returned.
 2017-11-21 13:52:07 +01:00
Markus Blatt
e7688a2ca0 Use MPI_RANK as ECL keyword (max length is 8) 
MPI_RANKS was one character to long and rose an exception with message
"Error: Program threw an exception: Keyword is too long."
 2017-11-21 11:17:40 +01:00
Tor Harald Sandve
c03dbc1693 Support TUNING in schdule section. 2017-11-21 11:12:16 +01:00
Markus Blatt
073f63ac4c Adapt writeInitial call to use integer vectors for printing ranks 
This adapts to the new function signature as of PR 216 in opm-output. It uses the
newly introduced map of integer vectors to print the MPI ranks in a parallel run.
 2017-11-20 15:30:50 +01:00
Atgeirr Flø Rasmussen
6e8adbbd7d Remove old "backup-restore" functionality. 
Was no longer working and would require some maintenance to work again.
 2017-11-20 14:31:13 +01:00
Atgeirr Flø Rasmussen
353f4a6265 Move creating local fipnum array to constructor. 2017-11-17 15:42:16 +01:00
Atgeirr Flø Rasmussen
33833eebe3 Align PRT message header. 2017-11-17 15:41:46 +01:00
Atgeirr Flø Rasmussen
ed263ba030 Remove unused function argument. 2017-11-17 15:41:23 +01:00
Atgeirr Flø Rasmussen
8bd441f431 Remove obsolete time and convergence output. 2017-11-17 15:28:52 +01:00
Alf B. Rustad
7dba2c4d70 Format fix-up 2017-11-17 08:25:22 +01:00
Alf B. Rustad
18419be734 Moving developer centric messages from PRT file to DEBUG file 2017-11-17 08:25:22 +01:00
Alf B. Rustad
ad68c05982 Change substep to time step in logging 2017-11-17 08:25:21 +01:00
Alf B. Rustad
2d2198a775 Change log output from Time step to Report step 2017-11-17 08:25:21 +01:00
Atgeirr Flø Rasmussen
68dab29aec
Merge pull request #1333 from GitPaean/avoid_use_BlackoilPhases 
replacing BlackoilPhases:: with Oil Water Gas in well model
 2017-11-16 21:49:30 +01:00
Kai Bao
8274fc9275 replacing BlackoilPhases:: with Oil Water Gas in well model 
and also WellStateFullyImplicitBlackoil.

There are more places to do so, while it might be easier to create a
header file for this.
 2017-11-16 12:08:58 +01:00
Atgeirr Flø Rasmussen
d8ad13c4b5 Move fip computation and unit conversion to separate method. 2017-11-15 16:31:06 +01:00
Atgeirr Flø Rasmussen
4256af6754 Move (local) fipnum creation to separate method. 2017-11-15 16:13:28 +01:00
Atgeirr Flø Rasmussen
0f210dcb6c Move FIP output to separate method. 2017-11-15 15:55:58 +01:00
Atgeirr Flø Rasmussen
3d0c6da513
Merge pull request #1320 from joakim-hove/missing-features 
Missing features
 2017-11-14 11:19:13 +01:00
Joakim Hove
a6ef70cd91 Added keywords to list of unsupported. 2017-11-14 08:56:06 +01:00
Joakim Hove
d04c52cebf Reformatted list of unsupported keywords. 2017-11-14 08:55:52 +01:00
Atgeirr Flø Rasmussen
60ee67804b
Merge pull request #1330 from akva2/remove_simulators 
Remove duplicate EBOS based simulators and legacy simulators that has been replaced
 2017-11-13 15:56:33 +01:00
Arne Morten Kvarving
e0907ddc49 remove 'flow_solvent' and associated files 
use 'flow'
 2017-11-13 14:21:10 +01:00
Arne Morten Kvarving
ad23d98726 remove 'flow_multisegment' and associated files 
use 'flow' with use_multisegment_well=true
 2017-11-13 14:20:47 +01:00
Atgeirr Flø Rasmussen
098e229d2e
Merge pull request #1328 from totto82/fixShearVel 
Fix size of perf radius and length vectors.
 2017-11-13 14:00:07 +01:00
Tor Harald Sandve
614f75d9b9 Fix size of perf radius and length vectors. 2017-11-13 12:16:39 +01:00
Atgeirr Flø Rasmussen
29277489e1 Make calling wsolvent() and wpolymer() always ok. 
With the existing code, it was a bug to call wsolvent() when the well
was not a gas injector (and similar for wpolymer and water injectors).
Since such calls could happen, this minor fix removes the assertation
failure in those cases.
 2017-11-13 10:40:09 +01:00
Atgeirr Flø Rasmussen
6591ca89f6
Merge pull request #1324 from totto82/moveApplyWellToRes 
Apply the well residuals to cell residuals in SolveJacobianSystem
 2017-11-10 09:57:42 +01:00
Atgeirr Flø Rasmussen
e7a6e8f2c5
Merge pull request #1322 from totto82/fixResetSolution 
BUGFIX Update the solution variable in ebos
 2017-11-09 10:35:38 +01:00
Tor Harald Sandve
5647485daa Apply the well residuals to cell residuals in SolveJacobianSystem 
This was moved to assemble() some time ago but according to my logic it
belongs in the solve method since this is only a trick to solve the well
equations simultaneously with the reservoir equations.

A buggy side effect of the currect implementation was that the well
residual was considered in the convergence test. I.e. this move changes
the convergence behaviour of the simulator.
 2017-11-09 08:40:08 +01:00
Tor Harald Sandve
a73208f41c Address issues raised in the review of the PR 2017-11-08 15:48:30 +01:00
Tor Harald Sandve
4bb5213f37 BUGFIX Update the solution variable in ebos 
Updating the solution variable in updateState() was conceptually wrong
and lead to incorrect results if the linear solver failed before the
updateState() method was called. i.e. in the first iteration.
 2017-11-08 14:21:31 +01:00
Tor Harald Sandve
b9bc4b00cb Make the wellModel self-contained 
The wellModel is now persistent over the time steps,
with an update method called every reportStep/episode.

This allows the following simplifications:

    1. move the wellState to the WellModel
    2. add a ref to the ebosSimulator to the wellModel
    3. clean up the parameters passed to the wellModel methods
    4. move RESV handling to the WellModel and the rateConverter
    5. move the econLimit update to the WellModel
 2017-11-08 13:57:36 +01:00
Atgeirr Flø Rasmussen
c79dab27d5
Merge pull request #1319 from GitPaean/throw_when_no_umfpack 
removing more HAVE_UMFAPACK related in MultisegmentWell_impl
 2017-11-07 14:41:52 +01:00
Atgeirr Flø Rasmussen
f886a3f0ff
Merge pull request #1311 from blattms/use-MatrixBlock-dune-2.5.0 
Use MatrixBlock instead of FieldMatrix for DUNE 2.5.0
 2017-11-07 13:28:24 +01:00
Joakim Hove
e125334847
Merge pull request #1315 from joakim-hove/extract-schedule 
Use Schedule constructor.
 2017-11-06 17:06:49 +01:00
Joakim Hove
566f4fbb02 Use Schedule constructor. 2017-11-06 14:20:41 +01:00
Atgeirr Flø Rasmussen
dde9db92a6
Merge pull request #1316 from andlaus/fix_openmp 
flow_ebos: fix the OpenMP functionality
 2017-11-03 17:43:49 +01:00
Kai Bao
89416720cb removing more HAVE_UMFAPACK related in MultisegmentWell_impl 
which are left from the previous PR.
 2017-11-03 14:54:32 +01:00
Atgeirr Flø Rasmussen
1d0282c6fe
Merge pull request #1317 from GitPaean/throw_when_no_umfpack 
giving more information when umfpack is not available.
 2017-11-03 14:43:18 +01:00
Kai Bao
790db957f5 giving more information when umfpack is not available. 
when calling invDXDirect.
 2017-11-03 10:03:03 +01:00
Atgeirr Flø Rasmussen
63415ebd96
Merge pull request #1314 from andlaus/generic_maintainance 
Generic maintainance
 2017-11-03 09:38:19 +01:00
Andreas Lauser
36bd6a1681 flow_ebos: fix the OpenMP functionality 
the ThreadManager from ebos was not called which resulted in some
havoc when attempting multi-threaded runs.

v2: use opm_get_max_threads() directly. thanks to [at]akva2 for the heads-up.
 2017-11-02 12:47:04 +01:00
Arne Morten Kvarving
53942053af
Merge pull request #1309 from andlaus/fix_build_no_umfpack 
make the build work if UMFPACK is not available
 2017-10-30 11:05:19 +01:00
Andreas Lauser
e65790224e replace #if HAVE_CONFIG_H by #ifdef HAVE_CONFIG_H 
it seems like most build systems pass a -DHAVE_CONFIG_H flag to the
compiler which still causes `#if HAVE_CONFIG_H` to be false while it
clearly is supposed to be triggered.

That said, I do not really see a good reason why the inclusion of the
`config.h` file should be guarded in the first place: the file is
guaranteed to always available by proper build systems, and if it was
not included the build either breaks at the linking stage or -- at the
very least -- the runtime behavior of the resulting libraries will be
very awkward.
 2017-10-27 17:48:26 +02:00
Andreas Lauser
6e7189b518 fix a few Dune 2.5 deprecation warnings 2017-10-27 17:48:26 +02:00
Andreas Lauser
ceefb61c4a fix some unknown pragma warnings if OpenMP is not enabled 2017-10-27 17:48:26 +02:00
Markus Blatt
602f3962f3 Use MatrixBlock instead of FieldMatrix for DUNE 2.5.0 
3x3 matrix block inversion in FieldMatrix is numerically unstable
including version 2.5.0. Therefore the previous if clause was wrong
as it activated the use of FieldMatrix already for 2.5.0 (the version
in Debian stable). With this commit we use MatrixBlock for version 2.5.0.
 2017-10-25 16:32:48 +02:00
Andreas Lauser
720dc636e8 make the build work if UMFPACK is not available 
this was caused by the recent work on multisegmented wells. If UMFPack
is available, it compiled.
 2017-10-24 19:17:41 +02:00
Atgeirr Flø Rasmussen
32251461e5 Revert "Revert "Communicate the ebos solution at the beginning of the run method" 2017-10-23 12:40:29 +02:00
Atgeirr Flø Rasmussen
f66a270b7d Merge pull request #1305 from GitPaean/checking_use_multisegment 
checking use_multisegment_well_ first in BlackoilModelParameters
 2017-10-17 21:20:07 +02:00
Kai Bao
9fde417066 checking use_multisegment_well_ first in BlackoilModelParameters 2017-10-17 13:21:02 +02:00
Markus Blatt
15dfe31d80 Revert "Communicate the ebos solution at the beginning of the run method." 
This reverts commit 9adc4d5d3c.
 2017-10-17 08:26:39 +00:00
Kai Bao
6b00d912c3 fixing jenkins warning. 2017-10-16 19:08:12 +02:00
Kai Bao
ba8eb708d1 fixing reviewing comments from PR 1279. 2017-10-16 17:01:15 +02:00
Kai Bao
4efaf64cf7 adapting to the interface change in OPM-parser#1145. 2017-10-16 14:39:07 +02:00
Kai Bao
7054317d98 checking the results from the direct solver invDX 
since I has not figure out a way to detect/catch the singularity of the
matrix with UMFPack, currently, we only check the validity of the
results to make sure inf or nan not enter other part of the simulation.

It can easiliy results in assertion failure, and causes the running to
be terminated. After all, it mostly likely is a numerical issue
generated during the non-linear iteration process.
 2017-10-15 12:13:42 +02:00
Kai Bao
d407e516ce throw for unsupported situations and fix warnings 
for MultisegmentWell.
 2017-10-13 10:16:44 +02:00
Kai Bao
7a29c5098f changing the strategy of the updateWellState in MultisegmentWell 
only applying relaxation during the inner iteration.
 2017-10-12 16:46:25 +02:00
Kai Bao
86269e0de2 cleaning up. 
no functional change.
 2017-10-12 15:36:54 +02:00
Kai Bao
93b7cceaf3 removing WellStateFullyImplicitBlackoilDense as the master 
it caused some problem in rebasing.
 2017-10-12 15:05:45 +02:00
Kai Bao
6a4260c264 various improvement and bug fixing. 
fixed one invalid memory reading of perforation_segment_depth_diffs_
in computePerfRate, which caused different results for different
running.
 2017-10-12 14:10:36 +02:00
Kai Bao
1a7b5571b6 trying to add an inner well iteration to speed up convergence. 2017-10-12 14:10:24 +02:00
Kai Bao
8a19b719d6 when Reynolds number is zero, return zero friction factor 
which means there is not friction pressure loss. The formualtion has
problem in handling zero-value Reynolds number.
 2017-10-12 13:43:04 +02:00
Kai Bao
6366087efd using UMFPACK for the function invDX 
for better robustness.

The iterative solvers require more improvement.
 2017-10-12 13:43:04 +02:00
Kai Bao
78a28abf91 fixing a bug related to adding ms well during simulation. 
When there is not ms well involved, all the ms well related is not
initialized. It causes problem when we want to add ms well after some
time of running.

The bug fix the running with model 2.
 2017-10-12 13:43:04 +02:00
Kai Bao
c3a368e58e adding two more parameters related to ms wells 
to help to tune and improve the convergence.
 2017-10-12 13:43:04 +02:00
Kai Bao
fc64d34bc2 cleaning up some comments. 2017-10-12 13:43:04 +02:00
Kai Bao
6fb459a797 introducing tolerance_pressure_ms_wells for pressure equations 
for the multisegment wells. More detailedly, we should distinguish the
rate control equations, bhp control equations and ordinary pressure
equations.
 2017-10-12 13:43:04 +02:00
Kai Bao
92abdc4f23 correcting some bugs in frictional pressure loss. 2017-10-12 13:43:04 +02:00
Kai Bao
f6ad3669f8 considering the two pressure difference to MultisegmentWell 
while the sign of the pressure differences are not sure or well tested
yet.
 2017-10-12 13:43:04 +02:00
Kai Bao
aa8b1ae0f8 giving the friction pressure loss a direction. 2017-10-12 13:43:04 +02:00
Kai Bao
ccc21e9dcd removing WellStateMSWell.hpp 
what was designed to use as WellState for one single Multisegment well.
 2017-10-12 13:39:58 +02:00
Kai Bao
8c3f45f58e fixing a few of bugs. 2017-10-12 13:39:58 +02:00
Kai Bao
4c207eb1f5 implementing computePerfCellPressDiffs 
to calculate the pressure difference between perforation and perforated
grid cell.
 2017-10-12 13:39:58 +02:00
Kai Bao
df593cf1d2 adding the calculation of depth differences 
between the perforations and their segments, and also the perforations
and perforated grid blocks.
 2017-10-12 13:39:58 +02:00
Kai Bao
2b4a99edf9 handling the acceleration pressure drop 
not tested yet.
 2017-10-12 13:39:58 +02:00
Kai Bao
4893334567 adding function getFrictionPressureLoss() 
it should be related to the flow direction, which needs some tests.
 2017-10-12 13:39:58 +02:00
Kai Bao
aa8ffe9386 removing the unit conversion factors in frictional formular. 
since we are using the SI unit internally, they should not be needed.
 2017-10-12 13:39:58 +02:00
Kai Bao
7ae5bd5187 adding the code to calculate the segment viscosities. 
not tested yet.
 2017-10-12 13:39:58 +02:00
Kai Bao
391abcec7f adding helper fuction to calculate frictional pressure loss 
not tested yet.
 2017-10-12 13:39:58 +02:00
Kai Bao
f4f26395f6 fixing two compilation warning. 2017-10-12 13:39:58 +02:00
Kai Bao
ad964210e5 move invDX to MSWellHelpers.hpp. 2017-10-12 13:39:58 +02:00
Kai Bao
20c21a6cb2 removing a few variables related to matrix opertaion 2017-10-12 13:39:58 +02:00
Kai Bao
fc06923c50 changing StandardWellsDense to BlackoilModelEbos 
for a better naming.
 2017-10-12 13:39:58 +02:00
Kai Bao
6ef0c5010c adapting the change of PR 1263 2017-10-12 13:37:05 +02:00
Kai Bao
dd9ad42a28 correcting the size of seg_comp_initial_ based on num_comp 
for standards wells, all the three equations are mass balance
equatiions, it is safe to use numWellEq.

for MS wells, there is one extra pressure equation, it should be the
number of mass balance equations. If we do not put the polymer equation
inside the well equations, we will face dilemma soon.
 2017-10-12 13:37:05 +02:00
Kai Bao
282d678622 removing flowToEbosPvIdx from MultisegmentWell 
as a result from rebase.
 2017-10-12 13:37:05 +02:00
Kai Bao
0dc041d46a adding a use_multisegment_well_ 
to determine whether we will treat mutlisegment wells with
MultisegmentWell well model. Currently, it will be faulse by default.
It might be changed to be true by default when considering the
multisegment well model is well tested.
 2017-10-12 13:37:05 +02:00
Kai Bao
3255626b2e scaling the gas rates a little bit for MS well. 
It can possibly benefit the StandardWell, while it is something needs a
little bit more investigation before using it.
 2017-10-12 13:37:05 +02:00
Kai Bao
f7e1623b7a only clearing matrix B and C when only_wells false. 
to save a little calculation.
 2017-10-12 13:37:05 +02:00
Kai Bao
c6be20c5cb copying the segment rates and segment pressure from old well state. 
It can be something rather tricky. It looks like with simple trival
initization, it is difficutl to converge. But when there is change to
the well, direct copying will not work anymore. Will we also facing
convergence problem?
 2017-10-12 13:37:05 +02:00
Kai Bao
5dee45dc0a various small improvements. 2017-10-12 13:37:05 +02:00
Kai Bao
a03a67c85e not checking getWellConvergence more than one times 
which is a bug. Not it is moved out of the for loop.
 2017-10-12 13:37:05 +02:00
Kai Bao
bafe292af0 adding some comments for later implementation. 2017-10-12 13:37:05 +02:00
Kai Bao
b6d324c95e implement recoverWellSolutionAndUpdateWellState 
for MultisegmentWell_impl.
 2017-10-12 13:37:05 +02:00
Kai Bao
596814943c bug fixing to make the hydroPrssureLoss correct. 2017-10-12 13:37:05 +02:00