OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,056 Commits 31 Branches 117 Tags
7d32729a00dec939740cee750a9a7873dffbe285
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 8a2cf4fd2d Merge pull request #1167 from GitPaean/fixing_petsc_compilation 
removing the unused parameter:: for LinearSolverPetsc
 2017-06-12 11:12:45 +02:00
Atgeirr Flø Rasmussen ce6801df7a Merge pull request #1157 from andlaus/fix-non-MPI-build 
fix non-MPI builds
 2017-04-20 21:47:08 +02:00
Atgeirr Flø Rasmussen 208e394e3d Merge pull request #1153 from babrodtk/hysteresis_output 
Added functions in SaturationProps for hysteresis IO
 2017-04-07 15:54:26 +02:00
Atgeirr Flø Rasmussen 863b00bf30 Merge pull request #1143 from GitPaean/fixing_thp_initialization 
Fixing thp initialization
 2017-03-02 15:51:38 +01:00
Atgeirr Flø Rasmussen 99c69a17d5 Merge pull request #1138 from andlaus/refactor_well_permeability 
do not explicitly pass the permeability to the well model anymore
 2017-01-27 13:15:50 +01:00
Atgeirr Flø Rasmussen 15790ecb57 Merge pull request #1133 from blattms/parallel-accumulate 
Added an accumulate method that allows to switch off non-owner entries.
 2017-01-11 15:16:48 +01:00
Atgeirr Flø Rasmussen f19c90bba7 Throw if solvent phase injected. 2017-01-09 16:33:03 +01:00
Atgeirr Flø Rasmussen e5bb786df2 Merge pull request #1120 from jokva/density-from-eclipsestate 
Use Density from EclipseState
 2017-01-09 10:38:30 +01:00
Atgeirr Flø Rasmussen 95d4a8101d Merge pull request #1125 from jokva/reduce-deck-use-relperm-diagnostics 
Don't rely on Deck for checkTable and checkPhase
 2017-01-09 09:35:25 +01:00
Atgeirr Flø Rasmussen e88c7df418 Merge pull request #1124 from jokva/read-rock-from-eclipsestate 
Read ROCK from EclipseState, not Deck
 2017-01-09 09:33:47 +01:00
Atgeirr Flø Rasmussen 8122c13f0d Merge pull request #1131 from atgeirr/increase-iters-for-equil 
Increase max iterations for capillary curve inversion.
 2017-01-09 09:31:14 +01:00
Atgeirr Flø Rasmussen c57ed2f32c Increase max iterations for capillary curve inversion. 
Triggered by a new two-phase case.
 2017-01-06 15:24:08 +01:00
Atgeirr Flø Rasmussen d81c150bae Remove unused Deck function argument. 2017-01-02 09:47:57 +01:00
Atgeirr Flø Rasmussen 08689af3e9 Fix order of initialization. 2016-12-29 13:55:42 +01:00
Atgeirr Flø Rasmussen 22fc88b2af Merge pull request #1103 from GitPaean/fixing_warning 
warning fixed related to petsc
 2016-11-23 12:37:31 +01:00
Atgeirr Flø Rasmussen b026295376 Merge pull request #1107 from GitPaean/fixing_findWellNode 
Adding a flag to WellCollection whether group control active
 2016-11-17 23:27:06 +01:00
Atgeirr Flø Rasmussen cd2eba4d0b Merge pull request #1088 from GitPaean/group_control 
group control_updating well production targets within a group.
 2016-11-16 13:20:04 +01:00
Atgeirr Flø Rasmussen 5662c32605 Fix saturation family diagnostics for two-phase case. 2016-10-27 11:58:50 +02:00
Atgeirr Flø Rasmussen 4aa14a4dcb Adapt to changed data::Wells API. 2016-10-25 10:41:16 +02:00
Atgeirr Flø Rasmussen 9253969828 Merge pull request #1093 from dr-robertk/PR/fix-wellmanager-constructor 
Make WellsManager compile with c++-11.
 2016-10-23 07:36:08 +02:00
Atgeirr Flø Rasmussen de1e3327d2 Merge pull request #1075 from jokva/output-data-wells-sans-vectors 
WIP: Restore from data::Wells without vector dumps
 2016-10-21 14:58:10 +02:00
Atgeirr Flø Rasmussen a108b0fb72 Merge pull request #1090 from atgeirr/convergence-failure-problem-not-error 
Convergence failure is "problem" not "error"
 2016-10-21 12:49:10 +02:00
Atgeirr Flø Rasmussen e4faa86973 Add option to enable logging (default true). 
This makes it possible to avoid logging from this class in a parallel setting.
 2016-10-20 22:39:08 +02:00
Atgeirr Flø Rasmussen f889306c05 Undo premature API change adaption. 2016-10-18 15:34:53 +02:00
Atgeirr Flø Rasmussen fb3e09fb39 Merge pull request #1085 from andlaus/opm-parser_units 
consolidate the units code to opm-parser
 2016-10-18 15:25:20 +02:00
Atgeirr Flø Rasmussen 6a1ad6f3fe Merge pull request #1078 from andlaus/fix_initial_rs_and_rv 
set the Rv and Rs factors to the saturated values for cells which have no gas and no oil
 2016-09-30 14:40:06 +02:00
Atgeirr Flø Rasmussen 35ce9f5884 Avoid shadowing warning by using explicit scope. 2016-09-23 15:15:17 +02:00
Atgeirr Flø Rasmussen 2cc3be1629 Forward declare structs as same to avoid warning. 2016-09-23 15:14:36 +02:00
Atgeirr Flø Rasmussen 2261999c1e Merge pull request #1062 from blattms/refactor-parallel-wellsmanager 
Use provided set of deactivated wells in parallel.
 2016-09-19 13:42:37 +02:00
Atgeirr Flø Rasmussen 24fa367fda Merge pull request #1027 from totto82/fix_2p_equil_init 
Fix two phase equil initialization
 2016-06-24 14:42:48 +02:00
Atgeirr Flø Rasmussen 675bc960db Merge pull request #1043 from pgdr/remove-return-type-warn 
Remove warnings (by throwing), added copyright header
 2016-06-20 22:34:40 +02:00
Atgeirr Flø Rasmussen 010480a7de Merge pull request #1039 from atgeirr/fix-compile-maxabs-unsigned 
Avoid ambiguous calls to abs with unsigned integers.
 2016-06-17 08:02:20 +02:00
Atgeirr Flø Rasmussen d76cfbed5f Merge pull request #1038 from qilicun/equil-check 
Rise up a warning if equil region has no active cells.
 2016-06-16 10:02:49 +02:00
Atgeirr Flø Rasmussen f5d1cbfb75 Make specialization for all unsigned integer types. 2016-06-16 08:47:21 +02:00
Atgeirr Flø Rasmussen 7c45264a77 Merge pull request #1034 from qilicun/minor-format-change 
Minor format changes
 2016-06-15 15:10:57 +02:00
Atgeirr Flø Rasmussen c6c452765c Merge pull request #1029 from blattms/make-ownermask-accessible 
Make ParallelIstlInformation::ownerMask_ accessible.
 2016-06-15 15:08:58 +02:00
Atgeirr Flø Rasmussen 854296d710 Address review comments. 2016-06-15 15:01:45 +02:00
Atgeirr Flø Rasmussen 22c2093426 Set default solver depending on configuration. 2016-06-15 14:32:00 +02:00
Atgeirr Flø Rasmussen 06ebdc9268 Avoid ambiguous calls to abs with unsigned integers. 2016-06-15 10:55:42 +02:00
Atgeirr Flø Rasmussen d065a2c095 Make new ops const. 2016-06-15 09:20:19 +02:00
Atgeirr Flø Rasmussen b0c6e43cf8 Add operator== and operator!= to PhasePresence. 
This makes it simpler to write code debugging or inspecting changed phase configurations.
 2016-06-15 08:57:20 +02:00
Atgeirr Flø Rasmussen ec3d7e7702 Merge pull request #1028 from qilicun/format-message 
Format message
 2016-06-08 10:57:31 +02:00
Atgeirr Flø Rasmussen 2d746e8c54 Merge pull request #1024 from andlaus/lad_to_dad 
rename some variables from "Lad" to "Eval" (was: to "Dad")
 2016-06-07 11:43:42 +02:00
Atgeirr Flø Rasmussen 2faff12696 Merge pull request #1019 from qilicun/log-more-messages 
Write more messages into OpmLog.
 2016-05-26 11:20:49 +02:00
Atgeirr Flø Rasmussen d1d77649ec Merge pull request #1011 from qilicun/format-output-relperm-diagnostics 
Unify output messages format.
 2016-05-19 15:06:52 +02:00
Atgeirr Flø Rasmussen 486633fded Merge pull request #997 from totto82/Fix_guiderates 
Bugfix in setup guiderates
 2016-04-15 08:46:17 +02:00
Atgeirr Flø Rasmussen 9558e155c6 Merge pull request #987 from qilicun/refactor-relpermDiagnostics 
Refactor relperm diagnostics using OpmLog functionalities.
 2016-04-04 15:04:44 +02:00
Atgeirr Flø Rasmussen 734fbfc38d Implement direct fast field access. 2016-03-29 10:46:14 +02:00
Atgeirr Flø Rasmussen 271c82d55e Only include normal (not _impl.hpp) header from client code. 2016-03-04 09:12:43 +01:00
Atgeirr Flø Rasmussen d6c0e771ca Only .cpp files should include config.h. 2016-03-04 09:10:19 +01:00
Atgeirr Flø Rasmussen 6b2f1d1507 Include template implementation file. 2016-03-04 09:09:52 +01:00
Atgeirr Flø Rasmussen 9c189415ab Merge pull request #958 from qilicun/rename_logfile 
use standard filename for output log file.
 2016-03-02 08:29:20 +01:00
Atgeirr Flø Rasmussen b9d44c1f4b Merge pull request #957 from joakim-hove/cmp-template 
Using template for cmp::vector_equal()
 2016-02-19 11:41:07 +01:00
Atgeirr Flø Rasmussen 186d77867a Silence warnings in test programs. 2015-12-14 15:25:27 +01:00
Atgeirr Flø Rasmussen c8a1492ca9 Merge pull request #928 from totto82/minpv_pinch 
compatibility of MINPV and PINCH
 2015-12-14 11:33:20 +01:00
Atgeirr Flø Rasmussen 462b4ca996 Merge pull request #934 from totto82/residualSaturations 
Add method to access the materialLawManager
 2015-12-11 13:08:39 +01:00
Atgeirr Flø Rasmussen 80c16e7ea9 Merge pull request #907 from andlaus/thpress_from_initial 
implement determining the threshold pressure from the initial condition
 2015-11-17 09:03:02 +01:00
Atgeirr Flø Rasmussen 5f9d361c03 Merge pull request #922 from blattms/return_mask_for_updateOwnerMask 
Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask
 2015-11-13 15:20:35 +01:00
Atgeirr Flø Rasmussen c0cd038e97 Merge pull request #920 from totto82/interpolation_points 
Change the number of integration points in the initialization
 2015-11-09 16:52:30 +01:00
Atgeirr Flø Rasmussen 8d327e9c67 Merge pull request #919 from blattms/fixes-wells-with-perforations-in-overlap 
Fixes well manager for wells crossing into cells that overlap.
 2015-10-28 13:23:35 +01:00
Atgeirr Flø Rasmussen 9de17c38d3 Merge pull request #918 from blattms/allow-zero-initialization-of-rock-properties 
Allow the rock properties to be zero initialized without a deck.
 2015-10-28 13:21:16 +01:00
Atgeirr Flø Rasmussen c65ad8292b Make SaturationPropsFromDeck work for two-phase cases. 2015-10-21 15:27:52 +02:00
Atgeirr Flø Rasmussen 682f53fdc5 Remove unused arguments in PinchProcessor methods. 
This silences warnings. It also makes it clear that
the cell thicknesses are not used in the current
algorithm, the doc comment has been updated to
reflect this.
 2015-10-21 11:52:31 +02:00
Atgeirr Flø Rasmussen 852693b72c Merge pull request #892 from qilicun/pinchprocessor 
PinchProcessor
 2015-10-19 10:22:44 +02:00
Atgeirr Flø Rasmussen 10b4d6c6f7 Merge pull request #897 from totto82/crossflow 
Add boolean flag to determine whether crossflow is allowed in a well
 2015-10-14 09:36:27 +02:00
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