OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-28 20:13:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,719 Commits 24 Branches 101 Tags 75 MiB
662849637c
Commit Graph

840 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
af9a5992a3 Merge pull request #389 from andlaus/simplify_simulator 
Simplify simulator
 2015-05-29 15:46:38 +02:00
Atgeirr Flø Rasmussen
9b30e2e0d7 Use unique_ptr instead of shared and raw pointers. 2015-05-29 14:57:49 +02:00
Atgeirr Flø Rasmussen
2bec485184 Fix a few warnings. 2015-05-29 14:57:30 +02:00
Andreas Lauser
496c32d2a6 do not use std::shared_ptr where it is deemed inappropriate by the maintainers 
note that I don't agree with this change and will assume no
responsibility if something goes down the gutter.
 2015-05-29 14:34:47 +02:00
Andreas Lauser
5666df807b some stylistic changes 
in particular, where to put empty lines and spaces. Also added a
copyright statement for myself to a few files and added a comment. the
new comment was requested by [at]bska, the rest was requested by
[at]atgeirr.
 2015-05-29 12:35:56 +02:00
Atgeirr Flø Rasmussen
3c7a79c16a Fix unsigned/signed comparison warning. 2015-05-28 14:07:25 +02:00
Andreas Lauser
553f32e6cf SimulatorBase: move the new method bodies from the .hpp to the _impl.hpp file 2015-05-28 13:55:54 +02:00
Andreas Lauser
662cd9791e SimulatorBase: only care about the solver in the run() method 
this is necessary because some older simulations only provide the
full-fledged solver class but no physical model.

(also, this allows to use something else than the standard newton
solver.)
 2015-05-28 13:55:54 +02:00
Andreas Lauser
a154c8394d Simulator, Model: add everthing which is required by the polymer simulators 
basically, this adds some hooks to the SimulatorBase class and the
model and introduces a few types to the SimulatorTraits.
 2015-05-28 13:55:54 +02:00
Andreas Lauser
45fb80f547 SimulatorBase: remove the opaque pointer pattern 
because the class is (and will stay) a template and for templates the
benefits of the opaque pointer pattern go from "small" to "zero".
 2015-05-28 13:55:53 +02:00
Andreas Lauser
3eec9f3432 introduce a "SimulatorBase" class 
so, far it is just a copy of the old "SimulatorFullyImplicitBlackoil"
class (which became a simple forward to the base class). The intention
is to unify the common simulator code in this class to avoid excessive
copy-and-pasting.
 2015-05-28 13:55:53 +02:00
Atgeirr Flø Rasmussen
a991eb55e3 Merge pull request #385 from atgeirr/polymorphism-for-blackoilmodel 
Static polymorphism for black-oil model
 2015-05-28 13:28:43 +02:00
Atgeirr Flø Rasmussen
4a4039e448 Introduce parenthesis to preserve old evaluation order. 
While results would be equivalent, they would not be identical
to old results without this.
 2015-05-26 16:50:49 +02:00
Atgeirr Flø Rasmussen
3246fd479d Renamed rq_.head to rq_.dh, since it is used for head differences. 
Also moved multiplication with transmissibilities so that dh does not
include them (so it really is the head difference).
 2015-05-26 16:33:00 +02:00
Atgeirr Flø Rasmussen
153c091aef Clean up in computeMassFlux(). 2015-05-26 16:16:27 +02:00
Atgeirr Flø Rasmussen
d9c2a5bd5b Add members isSg_, isRs_ and isRv_. 
This replaces local variables that were used in more
than one place, and initialised locally in the exact
same way depending only on primalVariable_.

Now they are updated once when primalVariable_ has changed,
simplifying the code for variableState() and updateState().
 2015-05-26 14:38:25 +02:00
Atgeirr Flø Rasmussen
6e5fac16d1 Add extraAddWellEq() hook in addWellEq(). 
This allows extended models to add functionality to the well treatment.
 2015-05-26 14:07:08 +02:00
Atgeirr Flø Rasmussen
614afad74b Add Next enum member for later extension. 2015-05-26 11:41:54 +02:00
Atgeirr Flø Rasmussen
52d035940e Fix vector sizing bug. 2015-05-26 11:41:34 +02:00
Atgeirr Flø Rasmussen
143b213f53 Make method calls in variableState() polymorphic. 
Achieved by using asImpl().
 2015-05-26 11:19:52 +02:00
Atgeirr Flø Rasmussen
9aaf428f29 Refactor variableState(). 
Has been split into multiple methods to give more flexibility
to extended models.
 2015-05-26 11:16:21 +02:00
Atgeirr Flø Rasmussen
1cc4b28c05 Removed declaration of unused method. 2015-05-26 01:57:16 +02:00
Atgeirr Flø Rasmussen
eb962aafa9 Use asImpl() pattern for static polymorphism. 
Not yet applied to all method calls, but only ones needed for
polymer solver after initial refactoring.
 2015-05-26 01:48:45 +02:00
Atgeirr Flø Rasmussen
74784522ea Remove commented-out code. 2015-05-26 01:29:26 +02:00
Atgeirr Flø Rasmussen
7088304214 Remove unused overload of computePressures(). 2015-05-26 01:19:37 +02:00
Atgeirr Flø Rasmussen
85436c4890 Move mass balance equations to separate function. 
Note that well contributions are added on later in addWellEq() as before.
 2015-05-26 00:31:50 +02:00
Atgeirr Flø Rasmussen
c2f4397bcf Remove unused constantState() method. 2015-05-26 00:08:33 +02:00
Atgeirr Flø Rasmussen
0d7fa1a82c Using ReservoirState and WellState consistently. 
This means that for extended models the functions in BlackoilModelBase will
be compiled with the types used by those models and not BlackoilState and
WellStateFullyImplicitBlackoil (which are specified by BlackoilModel).
 2015-05-25 23:49:09 +02:00
Atgeirr Flø Rasmussen
1cc5643d14 Moved enums to a separate file. 2015-05-25 23:06:03 +02:00
Atgeirr Flø Rasmussen
940853f9e5 Moved SolutionState to ModelTraits. 
Also extracting existing private class and renamed it DefaultBlackoilSolutionState.
 2015-05-25 00:46:28 +02:00
Atgeirr Flø Rasmussen
8f198986fd Remove unneeded file. 2015-05-24 20:09:39 +02:00
Atgeirr Flø Rasmussen
05bb1e4f42 Use the Curiously Recurring Template Pattern for BlackoilModel. 2015-05-24 17:36:29 +02:00
Atgeirr Flø Rasmussen
92ab1d7974 Use separate files for model parameter struct. 2015-05-24 17:33:06 +02:00
Atgeirr Flø Rasmussen
620ef2a3dd Create BlackoilModelBase class. 
The class is identical to BlackoilModel class at this stage, but
since it was renamed from FullyImplicitBlackoilSolver it keeps the
commit history better.
 2015-05-24 09:59:40 +02:00
Markus Blatt
2180ccddbc Activates the parallelism in the adaptive time stepping schemes. 
It does this simply by passing the information about the
parallelization to the adaptive time stepper.
 2015-05-22 21:12:10 +02:00
Atgeirr Flø Rasmussen
d08c44c53b Follow changes to FullyImplicitBlackoilSolver 
Original patch by Markus Blatt (@blattms).
 2015-05-21 11:42:15 +02:00
Atgeirr Flø Rasmussen
5cebc1c047 Rename debugging macros to avoid potential collisions. 2015-05-21 10:43:04 +02:00
Atgeirr Flø Rasmussen
1e6ecb173f Rename terminalOutput() -> terminalOutputEnabled(). 2015-05-21 10:43:04 +02:00
Atgeirr Flø Rasmussen
cf3719d707 Add more iteration report methods to NewtonSolver. 2015-05-21 10:43:04 +02:00
Atgeirr Flø Rasmussen
603b9657a1 Use plural for parameter class names. 2015-05-21 10:43:04 +02:00
Atgeirr Flø Rasmussen
270a7c59fb Add afterStep() hook to NewtonSolver::step(). 
Also implement (noop) afterStep() for BlackoilModel, and
make the hooks take non-const versions of the state data.
 2015-05-21 10:43:04 +02:00
Atgeirr Flø Rasmussen
f89297255f Rename FullyImplicitSolver -> NewtonSolver. 2015-05-21 10:43:04 +02:00
Atgeirr Flø Rasmussen
82827f56c0 Doc fixes and improvements. 2015-05-21 10:43:03 +02:00
Atgeirr Flø Rasmussen
5c3e79da38 Improve comments in step(). 2015-05-21 10:43:03 +02:00
Atgeirr Flø Rasmussen
2a967a321c Cleanup FullyImplicitSolver. 2015-05-21 10:43:03 +02:00
Atgeirr Flø Rasmussen
2e7e6c6344 Split functionality between model and solver. 
The step() method and everything to do with relaxation and oscillation
detection is now in the FullyImplicitSolver class.
 2015-05-21 10:43:03 +02:00
Atgeirr Flø Rasmussen
24ab95122d Made BlackoilModel contain all of the old solver class, now the 
idea is to make the FullyImplicitSolver class grow instead.
 2015-05-21 10:43:03 +02:00
Atgeirr Flø Rasmussen
7829addb99 Use new solver and model class instead of old solver class. 2015-05-21 10:43:03 +02:00
Atgeirr Flø Rasmussen
f8ef6d389a Added new solver and model classes. 
Solver is initially a copy of the blackoil solver class, and the
class BlackoilModel is empty.
 2015-05-21 10:43:03 +02:00
Markus Blatt
f6e3be5381 Adds space around some binary operators. 2015-05-20 17:54:43 +02:00
Markus Blatt
f0f38d7ac2 Fix seting of parallel_run_ member. 
We are having a parallel only if there are more than one processes,
and not already with only one.

Kudos to @atgeirr for finding this in the review.
 2015-05-20 17:53:54 +02:00
Markus Blatt
11211ca7d2 Update copyright notices 2015-05-20 09:26:25 +02:00
Markus Blatt
764e1e26c1 Used the correct parallel information for the whole system. 
The whole system consists out of three equations per cell. Using
the parallel index set of the grid cells for it is wrong. Therefore
we use PR OPM/opm-core#803 to set up an  additional parallel index set
for the whole system and use this for the communication that is needed e.g.
by the ILU preconditioner.
 2015-05-19 19:41:32 +02:00
Markus Blatt
cb4970c9a6 Prevent unused paramerter warning for RedistributeDatahandle. 2015-05-19 19:40:59 +02:00
Markus Blatt
d987e75b6d Rename createPreconditioner to the more accurate name createEllipticPreconditioner. 2015-05-19 19:40:11 +02:00
Markus Blatt
523ba001f6 Correctly compute the infinity norms of the well equations in parallel. 
Here we assume that a complete well can be represented on one process.
Thus we only need to compute the local norms followed by a global reduction.
 2015-05-15 15:57:50 +02:00
Markus Blatt
bf13922ff9 Correctly compute the infinity norm in parallel. 
For this we need to use ParallelIstlInformation for the reduction operation.
 2015-05-15 15:57:50 +02:00
Markus Blatt
48ce90fcc7 Compute scaled well residuals correctly for parallel runs. 
This commit adapts the PR #375 for parallel runs. That is, the norms are
calculated over all wells, not just the ones that perforate the local grid
cells.
As this is a reduction, too, we move the computation to convergenceReduction
method.
 2015-05-15 15:57:50 +02:00
Markus Blatt
9e0b2fed4f Notify well manager whether this is a parallel run. 
In a parallel the well handling needs to be slightly
adapted, see PR OPM/opm-core#799. Therefore, we need to
pass a boolean flag to the well manager indicating whether
this is a parallel run or not.

With this commit we do this.
 2015-05-15 15:57:50 +02:00
Atgeirr Flø Rasmussen
052cf09495 Merge pull request #378 from blattms/less-verbose-parallel-runs 
Prevent printing stats on more than 1 process for CPR.
 2015-05-15 15:38:55 +02:00
Atgeirr Flø Rasmussen
3375e1d312 Merge pull request #376 from blattms/debug-parallel-amg-cpr 
Fixes convergence issues with the parallel CPR
 2015-05-15 15:38:38 +02:00
Markus Blatt
c37cf08ee0 Removes unused residualNorm method. 
This method seems to be some leftover from refactoring.
In flow we now use computeResidualNorms() instead and
residualNorm() is not used anywhere. Therefore this commit
removes it to prevent confusion.
 2015-05-12 17:30:27 +02:00
Markus Blatt
f0691504af Prevent printing stats on more than 1 process for CPR. 2015-05-08 13:15:59 +02:00
Markus Blatt
1fbe8e3b6d Distribute the geology information. 
As it turns out initializing the Geology on a distributed grid
result in wrong values for e.g. saturation. Therefore with this
commit we resort to initializing the global geology and distribute
it using communication.
 2015-05-07 12:21:06 +02:00
Markus Blatt
a31aa46744 Send all phases for surface volume and saturation. 
Previously, we only did send the information for the
first phase which led to computing wrong values in
a simulation. With this patch we now send all the data
for all the phases.
 2015-05-07 12:21:06 +02:00
Tor Harald Sandve
d7c67f10de Change default tolerance for well residuals 2015-05-06 08:55:49 +02:00
Tor Harald Sandve
43b8f9851e Change to maximum norm for the well residuals 2015-05-06 08:55:49 +02:00
Tor Harald Sandve
b4369cade8 Check well_flow tolerance pr phase 
The phase rate residuals are scaled by the average volume factor to
avoid too large weight on the gas phase rates.
This also makes the well convergence criteria more consistent with the
mass-balance residuals for the cells.
 2015-05-06 08:55:49 +02:00
Atgeirr Flø Rasmussen
862abf6ac7 Merge pull request #371 from totto82/modify_welleq 
Modify welleq
 2015-05-05 11:54:15 +02:00
Tor Harald Sandve
f1d7e0c7ea Only add contribution from positive phase rates to the wellbore mixture 
Instead of adding contribution from all wells with positive total rates,
each phase in each well are checked seperatly.
 2015-05-04 10:22:43 +02:00
Atgeirr Flø Rasmussen
208b227ea8 Merge pull request #370 from blattms/fixes-comparison-warning 
Prevent unsigned vs. signed int comparison warning
 2015-04-30 16:54:19 +02:00
Markus Blatt
0329b0138d Prevent unsigned vs. signed int comparison warning 2015-04-30 15:47:09 +02:00
Markus Blatt
80056b8ef2 [bugfix] Pass parallel information to AMG preconditioner within CPR. 
Previously only passed the parallel information to the ILU preconditioner,
but of course needs this information to set up the communication, too.
With this commit we pass the parallel information object to AMG's constructor.
 2015-04-30 14:09:24 +02:00
Tor Harald Sandve
a860361217 Cleaning addWellEq 
1) Comments are added
2) Variable names are made more descriptive
3) Unecessary usage of subset are removed by extracting needed
quantities for the perforation cells once in advance
 2015-04-29 09:22:23 +02:00
Tor Harald Sandve
1cec10ce05 Clean updateWellControls 
The function is simplified by removing the update of the primal
variables (the ADBs). As a consequence updateWellControls must be
called prior to the creation of the primal variables.
 2015-04-29 09:22:23 +02:00
Tor Harald Sandve
302bc71d2c Use target values as initial conditions for BHP and SURFACE_RATE 
BHP and SURFACE_RATE values are updated every step and not only when the
well controll has switched.
 2015-04-29 09:22:23 +02:00
Tor Harald Sandve
b3f9997f6a BUGFIX Wellbore mixture calculations for multiphase injectors 
Add phase rates and not total rates when calculating the wellbore rates.
 2015-04-29 09:22:23 +02:00
Robert Kloefkorn
c846418446 BlackoilOutputWriter: fix restore when last step is selected. 2015-04-24 10:53:23 +02:00
Robert Kloefkorn
654c847b72 FullyImplicitBlockOil: increase max_allowed_residual to 1e7 to make SPE3 run through without adaptive time stepping. 2015-04-23 15:13:18 +02:00
Atgeirr Flø Rasmussen
f007bf561c Modify default solver parameters. 
These should work well for both Norne and the SPE cases.
 2015-04-21 12:40:21 +02:00
Robert Kloefkorn
2badc765a6 std::runtime_error --> LinearSolverProblem when linear solver was not converged. 
Since LinearSolverProblem is derived from std::runtime_error everything should work as
before.
 2015-04-16 11:41:28 +02:00
Arne Morten Kvarving
39e1d29176 fixed: use size_t and not unsigned long 
fixes builds on i386
 2015-04-14 10:25:21 +02:00
Atgeirr Flø Rasmussen
f82df94d2e Use generic function instead of UnstructuredGrid interface. 2015-04-13 10:37:23 +02:00
Atgeirr Flø Rasmussen
e2a920b1fe Merge pull request #335 from totto82/minpv-fill 
Use average NTG values for merged cells due to MINPV algorithm
 2015-04-13 10:20:36 +02:00
Robert Kloefkorn
a73c725b9d CPRPreconditioner: make compile with DUNE 2.2. 2015-04-08 14:23:35 +02:00
Atgeirr Flø Rasmussen
78ea73fa0a Fix convergence table labels (water, oil swapped). 2015-04-08 13:33:42 +02:00
Robert Kloefkorn
1ccf74eb4e NewtonIterationBlackoilCPR: fix uninitialized parameter and make the parameters const. 2015-04-08 11:48:16 +02:00
Atgeirr Flø Rasmussen
62d3f37b1d Merge pull request #342 from dr-robertk/PR/some-improvemnts-on-solvers 
More parameter for solvers.
 2015-03-31 18:00:40 +02:00
Robert Kloefkorn
1b23de0b1c CPR: add verbosity as a parameter. 2015-03-31 12:54:26 +02:00
Robert Kloefkorn
632bc7a809 CPR: FastAMG seems not to be faster, so use regular AMG. 2015-03-31 12:42:58 +02:00
Robert Kloefkorn
adac4a7995 CPRPreconditioner: added tolerance and max iter as a parmeter. 
Parameters are now a separate class to avoid long constructor parameter list.
 2015-03-31 12:15:54 +02:00
Andreas Lauser
ba4fca5a77 Revert "also pass the deck to the output writer" 
This reverts commit 88730e855f.
 2015-03-31 12:11:45 +02:00
Robert Kloefkorn
90a7faf1a8 FullyIBOS: added parameter for minimal number of newton iterations, default stays at 0. 
Also, don't throw an exception when the solver did not converge, just return -1
indicating that there was a problem.
 2015-03-31 11:16:44 +02:00
Robert Kloefkorn
20316e0a8e NewtonBOCPR: allow to use either GMRes or BiCGStab. This will be revised once the new 
linear solver interface is in place.
 2015-03-31 11:04:31 +02:00
Atgeirr Flø Rasmussen
05bee313d3 Merge pull request #339 from andlaus/use_deck_units_for_summary_output 
also pass the deck to the output writer
 2015-03-27 12:30:20 +01:00
Andreas Lauser
88730e855f also pass the deck to the output writer 2015-03-26 17:33:13 +01:00
Atgeirr Flø Rasmussen
061e1bcbd7 Merge pull request #324 from andlaus/implement_temperature_dependent_density 
Implement temperature dependent density
 2015-03-26 15:10:28 +01:00
Atgeirr Flø Rasmussen
eb9b62697e Make vertcatCollapseJacs() handle constants properly. 
With this, any or all of the input vector element may have
an empty jacobian vector. Any element with a non-empty
jacobian vector must still have the same block pattern.
 2015-03-24 09:48:31 +01:00
Atgeirr Flø Rasmussen
085c279a0a Use vertcatCollapseJacs() for improved performance. 2015-03-20 11:19:42 +01:00
Atgeirr Flø Rasmussen
07258f0249 Add function vertcatCollapsJacs(). 2015-03-20 11:19:42 +01:00