OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-24 14:47:44 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,667 Commits 31 Branches 117 Tags
cf35ecbb059b794bc6bb20fdf83389eefdf1c561
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen a0e50d2a21 Merge pull request #887 from osae/equil-water-zone 
Support for equil-initialisation for datum depth outside oil zone.
 2015-10-03 19:04:34 +02:00
Atgeirr Flø Rasmussen 3d27454c6b Make grid in deck have larger number of cells. 
This makes some tests succeed that use this deck only
for its properties and not its grid: if the grid in the
deck has fewer cells than the grid that is used for the
test we will fail in the SATNUM mapping.
 2015-10-01 15:20:08 +02:00
Atgeirr Flø Rasmussen 061b283a03 Merge pull request #888 from totto82/avoid_throw_wellManager 
WARN instead of THROW if completion is not found in the grid
 2015-09-28 10:02:06 +02:00
Atgeirr Flø Rasmussen 99d3ca24bb Use compressedToCartesian() to avoid possible null reference. 2015-09-15 14:23:10 +02:00
Atgeirr Flø Rasmussen 827da9baa3 Moved compressedToCartesian() to its own file. 2015-09-15 14:13:58 +02:00
Atgeirr Flø Rasmussen d0285c3eb1 Cleanup SaturationPropsFromDeck interface. 
Unused methods and arguments have been removed,
and we avoid including the EclMaterialLawManager
in the header. Clients IncompPropertiesFromDeck
and BlackoilPropertiesFromDeck have been updated.
 2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen 530df90a42 Remove unused args from constructor. 
Also from init() function. This means the methods are no longer templates,
and have been moved to the cpp file.
 2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen 830fd552f4 Merge pull request #873 from blattms/fix-parallel-wellsmanager-for-partly-shut-wells 
[bugfix] Account for shut completions when checking well in parallel
 2015-09-08 11:01:44 +02:00
Atgeirr Flø Rasmussen 2dc9d78286 Merge pull request #867 from babrodtk/fix_warnings 
Fixed several warnings
 2015-09-04 14:13:34 +02:00
Atgeirr Flø Rasmussen 68428ad856 Do thp init() differently. 2015-08-19 13:12:15 +02:00
Atgeirr Flø Rasmussen 3db9d9062e Fix bug in test program. 2015-08-19 13:12:14 +02:00
Atgeirr Flø Rasmussen 24f91aa248 Use the correct (new) method from the Group class for group RESV. 
Production controls now are no longer initialised from injection control data.
 2015-08-13 10:21:24 +02:00
Atgeirr Flø Rasmussen 84acbc4601 Make saturation functions work with two phases again. 
Note that this changes ExplicitArraysFluidState to take
a run-time argument for the number of phases.
 2015-08-12 13:38:32 +02:00
Atgeirr Flø Rasmussen 23fd80d0b2 Bugfix: add forgotten setIndex() call. 2015-08-12 13:38:10 +02:00
Atgeirr Flø Rasmussen 5216550cdf Suppress warnings. 2015-08-10 16:07:45 +02:00
Atgeirr Flø Rasmussen cb512ef10d Merge pull request #839 from atgeirr/handle-new-umfpack 
Define the UF_long type if necessary.
 2015-08-07 11:11:23 +02:00
Atgeirr Flø Rasmussen b80a202287 Define the UF_long type if necessary. 
The UF_long type is deprecated in UMFPack, and actually seems
to be removed from the latest versions.
 2015-08-06 09:54:05 +02:00
Atgeirr Flø Rasmussen 7b9bdb6017 Do not use pressure() until after init() in BlackoilState. 2015-07-08 17:58:38 +02:00
Atgeirr Flø Rasmussen 131bbd5846 Fix unused argument warnings. 2015-07-08 12:37:11 +02:00
Atgeirr Flø Rasmussen e8dc0a7148 Add missing include statement. 2015-06-22 13:04:14 +02:00
Atgeirr Flø Rasmussen a5da86a9ec Silence multiple warnings. 
Also add more warnings to the disabling list of disable_warnings.h.
 2015-05-28 14:05:09 +02:00
Atgeirr Flø Rasmussen f24b9a1dc2 Merge pull request #800 from blattms/parallel-verbose-only-on-master 
Allow to prevent printing to std::cout.
 2015-05-13 14:42:37 +02:00
Atgeirr Flø Rasmussen 928660ec0f New method SimulatorReport::reportFullyImplicit(). 
It does not make sense to report transport and pressure separately
for fully implicit solvers. It still makes sense to separate solver
from init and output though.
 2015-04-21 10:48:02 +02:00
Atgeirr Flø Rasmussen 378f5d7319 Make some programs stricter about parameter parsing. 
This applies to programs which always require at least one parameter.
 2015-04-14 15:32:19 +02:00
Atgeirr Flø Rasmussen d0820dcb3f Suppress sign-comparison warnings. 2015-03-27 15:38:21 +01:00
Atgeirr Flø Rasmussen aa7dcf91d3 Merge pull request #765 from andlaus/implement_temperature_dependent_density 
Implement temperature dependent density
 2015-03-26 15:10:13 +01:00
Atgeirr Flø Rasmussen 2d534f0536 Fix property method calls. 
Cell argument can not be null for BlackoilPropertiesFromDeck class.
 2015-03-23 16:19:40 +01:00
Atgeirr Flø Rasmussen 8a1b35d4f6 Fix unneeded-internal-declaration warning. 
Again related to anonymous namespace function only being used
in template functions.
 2015-03-02 10:28:55 +01:00
Atgeirr Flø Rasmussen 529662ca1a Complete function argument cleanup. 2015-02-17 13:56:02 +01:00
Atgeirr Flø Rasmussen a38bdaf4c3 Remove unused argument from several functions. 2015-02-17 10:28:11 +01:00
Atgeirr Flø Rasmussen 2f7a87aa4b Merge pull request #755 from blattms/istl-consistent-rhs 
Makes right hand side passed to linear solver consistent.
 2015-02-16 12:48:28 +01:00
Atgeirr Flø Rasmussen 28597d18ee Added computeWellPairs() function. 2015-02-11 14:03:47 +01:00
Atgeirr Flø Rasmussen fb983a44b1 Add default producer BHP control when not given in deck. 
Default limit is 1 atm.
 2015-02-04 10:30:15 +01:00
Atgeirr Flø Rasmussen 9cb9ec50b1 Rename directory opm/core/tof -> opm/core/flowdiagnostics. 2015-02-03 21:44:24 +01:00
Atgeirr Flø Rasmussen 4f327a5329 Merge pull request #738 from blattms/constify-parallelinformatio-workaround-eigen 
Constify parallelinformation and workaround Eigen's weirdness
 2015-01-30 20:35:33 +01:00
Atgeirr Flø Rasmussen 3e69d72fbd Reformat header for readability. 2015-01-23 09:13:43 +01:00
Atgeirr Flø Rasmussen fb0bccc625 Fix whitespace issues. 2015-01-23 09:12:15 +01:00
Atgeirr Flø Rasmussen 3b1aa47830 Add missing #include <algorithm>. 2015-01-22 13:02:16 +01:00
Atgeirr Flø Rasmussen 73a310725e Fixed size of zero vector passed as gpress. 2015-01-21 21:14:32 +01:00
Atgeirr Flø Rasmussen 77ae151be9 Added calculation of flow diagnostics quantities. 
New functions:
 - computeFandPhi()
 - computeLorenz()
 - computeSweep()

Also a unit test has been added for the new features.
 2015-01-21 14:58:44 +01:00
Atgeirr Flø Rasmussen 998d5f9d5a Added IncompTpfaSinglePhase class. 2015-01-20 15:47:50 +01:00
Atgeirr Flø Rasmussen fa16d8f616 Add IncompPropertiesSinglePhase class. 2015-01-20 15:47:50 +01:00
Atgeirr Flø Rasmussen 10d4d228d1 Use dummy test if anisotropic eikonal solver unavailable. 2015-01-07 10:20:49 +01:00
Atgeirr Flø Rasmussen 45a2631b7f Put reformatted error message in anonymous namespace. 2015-01-07 10:16:13 +01:00
Atgeirr Flø Rasmussen dfebd46acf Make compilation of class depend on Boost.Heap availablility. 
If boost version is too old, the API is still the same and the
class will build, but throws upon construction.
 2015-01-07 09:49:47 +01:00
Atgeirr Flø Rasmussen 1e39010ba4 Fix anisotropy closeness test. 
The old test was simply wrong: it computed the M-distance and compared
to the grid radius, which becomes dependent on the scaling of the
metric M. The corrected test in isClose() depends on the anisotropy
ratio of M and the grid radius.
 2015-01-02 15:22:02 +01:00
Atgeirr Flø Rasmussen 8491d186d4 Make isClose() use actual grid and metric data. 
Note that current implementation is somewhat ad-hoc, and not
in line with the algorithm of the paper.
 2014-12-29 12:28:30 +01:00
Atgeirr Flø Rasmussen b54f4f0e2a Add a utility for actually running the eikonal solver. 2014-12-29 12:28:30 +01:00
Atgeirr Flø Rasmussen 4c12bf485d Modify test to succeed. 
No longer test for (unattainable) exact values. Use actual
computed value instead. This makes the test a regression
test rather than a truth test.
 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 2eab160761 Whitespace fix. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 451bca1753 Add computeValueUpdate() to avoid recomputing. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen e3a0eac260 Uncomment second test. 
Test fails, it requires exact match which is too strict.
 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen cb7be97ee5 Change order of steps in algorithm to avoid rework. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 5233d37e63 Follow renaming of function. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 8b99d6394d Fix bug in test. 
Also add (inactive) second test.
 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen c5a19b250b Fix bug in distance derivative function. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 654e06de00 Work in progress. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 5d81306007 Initial versions of compute functions done. 
Still has bugs.
 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 22cbcc8bf5 Solver logic finished. 
Methods isClose(), computeFromTri() and computeFromLine() are still dummies.
 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen ee4d2be67e Work in progress on AnisotropicEikonal. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 84da6a28f3 Added simple test, work in progress. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen 3001768632 Add skeleton of AnisotropicEikonal class and test. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen dea6e8c044 Merge pull request #702 from jorgekva/linsolver_petsc 
PETSc support in OPM
 2014-12-19 11:25:58 +01:00
Atgeirr Flø Rasmussen 06382498d2 Silence unused argument warning. 2014-12-02 09:17:11 +01:00
Atgeirr Flø Rasmussen bce2d6ad1a Avoid using VLAs (C99 feature). 
Regular C fixed-size arrays are sufficient here, although in general
std::vector is the preferred replacement (if needing the dynamic size).
 2014-11-24 10:55:10 +01:00
Atgeirr Flø Rasmussen f279629bf1 Suppress unused argument warning in release mode. 2014-11-24 10:54:51 +01:00
Atgeirr Flø Rasmussen 33a91b59f9 Refactor third-party warning suppression. 
Use header files from opm/core/utility/platform_dependent instead of
build-system generated ones for suppressing warnings from dune or Eigen.
 2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen b0c6fff9f0 Avoid release mode warnings. 
Variables only used in asserts have been removed, their content used
directly in the assert() instead.
 2014-09-18 11:31:03 +02:00
Atgeirr Flø Rasmussen ca25f56365 Merge pull request #648 from bska/fix-peaceman 
effectiveRadius: Fix Numerator Formula
 2014-09-02 15:46:36 +02:00
Atgeirr Flø Rasmussen 402044a54a Use double braces for std::array init to avoid warning. 
Warning triggered at least using clang.
 2014-09-01 10:09:27 +02:00
Atgeirr Flø Rasmussen 166cd0fe6b Suppress unused argument warning. 
The eclState argument was added in PR#634, and may be needed later.
Until then, this silences the warning generated.
 2014-08-28 14:14:22 +02:00
Atgeirr Flø Rasmussen e6e2c9a330 Squash warnings by removing or commenting out unused parameters. 2014-08-28 14:14:22 +02:00
Atgeirr Flø Rasmussen cc23f74f25 Merge pull request #630 from totto82/fix_init_spe9 
The water/gas press. are calculated only if woc/goc is within the reservoar
 2014-08-26 22:27:11 +02:00
Atgeirr Flø Rasmussen abdc33a945 Merge pull request #628 from totto82/constCapPressInit2 
Initialization for constant capillary pressure functions
 2014-08-11 13:49:37 +02:00
Atgeirr Flø Rasmussen aed3add8ae Merge pull request #623 from robertk-iris/dune-3.0-compat 
Make code compile with dune trunk version (ie 3.0-git). This should incl...
 2014-08-08 10:14:13 +02:00
Atgeirr Flø Rasmussen 070f2456c4 Properly handle defaulted well reference depths. 2014-08-07 12:57:05 +02:00
Atgeirr Flø Rasmussen 12c9ef2b09 Merge pull request #607 from osae/swatinit 
Scaling of capillary pressure / initialisation from kw SWATINIT.
 2014-07-07 14:10:02 +02:00
Atgeirr Flø Rasmussen fd606d907a Fix initialization of tracer heads, and output ordering. 2014-06-25 09:56:37 +02:00
Atgeirr Flø Rasmussen 3290c41f3a Refactor tracer computations. 
Current version executes reordered solve once for each tracer. The benefit
is a simpler code and the ability to use MDU with tracers. The cost is
potentially higher runtime, compared to doing a single sweep for all
tracers (and tof).
 2014-06-24 09:43:26 +02:00
Atgeirr Flø Rasmussen 23400d7e2e Remove unused data member. 2014-06-23 14:18:01 +02:00
Atgeirr Flø Rasmussen 63d7b868d0 Clean up dead code for MDU, update comment. 2014-06-23 14:05:51 +02:00
Atgeirr Flø Rasmussen 41887508ea Add tracers_ensure_unity parameter. 
When this boolean parameter is true (the default), tracer solutions
will be normalized so that the tracer averages will sum to one in each cell.
This behaviour is the same as before, the change is that it can now be
turned off.
 2014-06-23 14:03:49 +02:00
Atgeirr Flø Rasmussen 631498bd06 Activate MDU option, making SMU method its default. 2014-06-23 11:29:14 +02:00
Atgeirr Flø Rasmussen 1a59e7360b Fix bugs in MDU. 2014-06-23 11:23:16 +02:00
Atgeirr Flø Rasmussen ae1236c5cd Add computation of face tofs parts. 
This must be done after the cell tof has been computed since they
depend on it.
 2014-06-23 11:22:14 +02:00
Atgeirr Flø Rasmussen bd1bb1099f First compiling version of fixed MDU method. 2014-06-19 15:11:32 +02:00
Atgeirr Flø Rasmussen 0b05182645 Fix use of assert. 2014-06-16 13:44:00 +02:00
Atgeirr Flø Rasmussen a199d78476 Work in progress fixing multidim upwinding. 2014-06-16 13:14:42 +02:00
Atgeirr Flø Rasmussen 4166a0621c Removed unused debugging output. 2014-06-16 12:49:41 +02:00
Atgeirr Flø Rasmussen 0afbecfa07 Split method solveSingleCell() for easier maintenance. 2014-06-16 12:49:41 +02:00
Atgeirr Flø Rasmussen abd341ab7f Supress signed-unsigned comparison warning. 2014-05-12 09:18:52 +02:00
Atgeirr Flø Rasmussen a5ccc97a0f Merge pull request #573 from osae/test-eps 
Endpoint scaling - taking advantage of the new parser.
 2014-05-12 08:28:48 +02:00
Atgeirr Flø Rasmussen 320c3332ad Add missing break statements in switch, add default case. 2014-04-24 15:43:54 +02:00
Atgeirr Flø Rasmussen be5af2378a Change option name and generated header names. 2014-04-15 20:21:10 +02:00
Atgeirr Flø Rasmussen 883e955176 Merge branch 'suppress-warnings' into suppress-external-warnings 2014-04-15 19:49:19 +02:00
Atgeirr Flø Rasmussen ba26696d22 Fix access to keywords, while still silencing warning. 
Previous fix was wrong because it called getKeyword() outside the
hasKeyword() check. Current version (like original code) uses the
short-circuiting behaviour of && to ensure this.
 2014-04-15 14:52:21 +02:00
Atgeirr Flø Rasmussen bd4eef5a86 Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings 2014-04-15 14:35:01 +02:00
Atgeirr Flø Rasmussen b225970686 Add (all-zero) initialisation of new EquilRecord fields. 2014-04-15 13:41:10 +02:00
Atgeirr Flø Rasmussen cd0d48abbd Avoid signed/unsigned warning. 2014-04-15 13:40:50 +02:00
Atgeirr Flø Rasmussen 645ff76a0b Comment out unused function argument. 2014-04-15 13:40:15 +02:00