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
5,357 Commits 31 Branches 117 Tags
cede806bd5671eeaadeafdf0a76bb01a32ff5f43
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad 0c61f63900 Merge pull request #1265 from GitPaean/fixing_test_wellmodel 
not using std::make_unique in test_wellmodel

Closes #1264
 2017-09-04 17:33:45 +02:00
Bård Skaflestad 44c02a262e Merge pull request #1240 from blattms/work-around-unstable-matrix-inversion 
Work around unstable matrix block inversion in DUNE 2.3 und 2.4
 2017-07-04 12:34:01 +02:00
Bård Skaflestad 1e0428d821 Merge pull request #1208 from atgeirr/refactor-sequential-solver 
Refactor sequential solver
 2017-06-09 15:10:11 +02:00
Bård Skaflestad bdba47e5ac Merge pull request #1105 from atgeirr/change-default-output-dir 
Change default output dir
 2017-03-17 13:58:08 +01:00
Bård Skaflestad d700f3e946 Merge pull request #1104 from atgeirr/allow-restart-without-opmextra 
Allow restarting without OPMEXTRA field in restart file.
 2017-03-17 11:18:06 +01:00
Bård Skaflestad 6281d1f090 Merge pull request #958 from andlaus/fix_asserts 
StandardWellsDense: fix two assertations
 2016-11-29 15:05:32 +01:00
Bård Skaflestad 8cc64402be Merge pull request #927 from GitPaean/warning_fixing 
a few warning fixing.
 2016-11-16 18:48:51 +01:00
Bård Skaflestad fbc47cc186 Merge pull request #815 from bska/omit-empty-kr 
phase-KR: Don't emit empty property arrays

This is a self-merge.
 2016-09-08 19:32:36 +02:00
Bård Skaflestad dccf75d806 Initialise fields in declaration order 2016-09-08 16:28:43 +02:00
Bård Skaflestad 964c0142cc phase-KR: Don't emit empty property arrays 
Check that we actually have data values for relative permeability
properties {WAT,OIL,GAS}KR before attempting to output the arrays.

While here, also correct an apparent misprint in the criterion for
whether or not to activate relperm output.  We should check
'liquid_active' and 'vapour_active', not 'aqua_active', when
considering OILKR and GASKR properties respectively.
 2016-09-08 16:28:43 +02:00
Bård Skaflestad 01ec7befb4 Merge pull request #758 from qilicun/fix-wellIterations-bugs 
fix well iterations counting bugs.
 2016-07-20 11:20:28 +02:00
Bård Skaflestad b4df2ccff0 Merge pull request #750 from blattms/print-time-step-once-in-parallel-run 
Use termininal_output_ to only print time step status once for parallel runs
 2016-07-04 15:44:57 +02:00
Bård Skaflestad 3c590f9352 Merge pull request #672 from akva2/fix_build_with_g++_53 
fixed: build with g++ 5.3
 2016-04-29 21:16:39 +02:00
Bård Skaflestad 4ec1a306ad Merge pull request #651 from atgeirr/restore-output 
Re-enable output for 2-phase sims.
 2016-04-14 13:54:24 +02:00
Bård Skaflestad e83518108e Merge pull request #646 from atgeirr/import-sim 
Import simulator, update code
 2016-04-14 12:49:09 +02:00
Bård Skaflestad 814a94e058 Request requisite module opm-output in Travis builds 2016-04-05 12:54:44 +02:00
Bård Skaflestad 37a701430d Merge pull request #600 from jokva/fix-header-parser-695 
Add missing opm-parser headers
 2016-02-26 07:12:56 -06:00
Bård Skaflestad 1237251ee4 Merge pull request #599 from joakim-hove/state-updates 
PolymerState changes
 2016-02-24 07:31:37 -06:00
Bård Skaflestad db86c367d5 Merge pull request #597 from andlaus/fix_deprecation_warnings 
fix the deprecation warnings caused by OPM/opm-parser#687
 2016-02-21 18:09:48 -06:00
Bård Skaflestad 2c9a727844 Merge pull request #574 from jokva/clean-up-header 
Improve includes from opm-parser
 2016-01-26 13:37:53 +01:00
Bård Skaflestad 00073dbf9f Merge pull request #573 from jokva/fix-header-include-parser656 
Fixes includes wrt opm-parser PR-656
 2016-01-21 10:32:54 +01:00
Bård Skaflestad d14de856fe Merge pull request #564 from atgeirr/improve-errmsg 
Improve threshold pressure mismatch error message.
 2016-01-04 10:54:41 +01:00
Bård Skaflestad 05bd5def58 Merge pull request #559 from totto82/fix_critialSat 
Fix typo in BlackoilPropsAdFromDeck
 2015-12-14 12:41:47 +01:00
Bård Skaflestad cb3ed9aa4f Merge pull request #551 from atgeirr/silence-warnings 
Remove unneeded function parameter for SimulatorBase::run(), fix warnings.
 2015-12-07 16:13:25 +01:00
Bård Skaflestad c956494402 Merge pull request #540 from atgeirr/remember-asimpl 
Add asImpl() to method calls.
 2015-11-19 14:47:13 +01:00
Bård Skaflestad a822151082 Merge pull request #157 from atgeirr/refactor-nonlinear-solver 
Adapt to refactored/renamed NonlinearSolver (was NewtonSolver).
 2015-11-18 11:50:28 +01:00
Bård Skaflestad 022bd6b8fe Merge pull request #536 from atgeirr/refactor-nonlinear 
Refactor nonlinear solver
 2015-11-18 11:47:43 +01:00
Bård Skaflestad 65da8b7e11 Merge pull request #531 from blattms/parallel-RateConverter 
Calculate parallel averages in RateConverter.

Closes issue #530
 2015-11-13 18:26:36 +01:00
Bård Skaflestad 112b0b7e6e Merge pull request #537 from andlaus/update_cdash_drop_site 
cdash: update dropsite
 2015-11-11 19:22:09 +01:00
Bård Skaflestad 308a3fd57e Merge pull request #535 from atgeirr/bug-in-scalar-autodiff 
Fix bug in scalar autodiff
 2015-11-10 14:02:49 +01:00
Bård Skaflestad 91af12034c Merge pull request #533 from atgeirr/install-flow-solvent 
Add flow_solvent to list of programs to be installed.
 2015-11-05 14:18:24 +01:00
Bård Skaflestad a3d4224445 Merge pull request #527 from blattms/fix-sequential-redist-grid 
Only specialize distributeGridAndData for CpGrid if MPI is found.
 2015-10-30 19:31:26 +01:00
Bård Skaflestad cfc1350717 Merge pull request #500 from blattms/removed-superfluous-ptr-during-redistribution 
Remove unnecessary shared_ptr for geology and black oil properties during redistribution.
 2015-10-22 15:27:40 +02:00
Bård Skaflestad 8b31c8b946 Merge pull request #147 from joakim-hove/table-container 
Using TableContainer.
 2015-10-05 15:08:13 +02:00
Bård Skaflestad 13df018745 Follow API update of BlackoilOutputWriter 
The constructor of class BlackoilOutputWriter gained a new parameter
in commit OPM/opm-autodiff@299b0aa (OPM/opm-autodiff#484).  Honour
new API requirement.
 2015-09-30 11:01:01 +02:00
Bård Skaflestad a333755a2b Merge pull request #481 from babrodtk/faster-form-interleaved 
Faster form interleaved
 2015-09-24 09:19:54 +02:00
Bård Skaflestad 2c84414641 Merge pull request #480 from atgeirr/silence-warning 
Silence unused argument warning.
 2015-09-21 10:45:58 +02:00
Bård Skaflestad a94fe3ed4f Chase API update of opm-core's RegionMapping 
In the process, generalise the notion of region properties.  We
introduce a new helper class

    Details::RegionAttributes<RegionId, Attributes>

that provides lookup from a RegionId, typically an int, to a
user-defined set of Attributes--in this case pressure and
temperature.

While here, mark 'SurfaceToReservoirVoidage::calcCoeff()' as 'const'
because it doesn't need to modify any internal state and refactor
the implementation to eliminate repeated calculations of

    ADB::constant(X)
 2015-09-14 19:21:54 +02:00
Bård Skaflestad d43b259886 Merge pull request #469 from atgeirr/silence-warnings 
Silence some more warnings.
 2015-09-14 19:18:06 +02:00
Bård Skaflestad 9390988f07 Merge pull request #143 from atgeirr/remove-args 
Update for removed constructor args.
 2015-09-14 17:08:09 +02:00
Bård Skaflestad 8517fd29a6 Merge pull request #468 from atgeirr/remove-args 
Update for removed constructor args.
 2015-09-14 17:07:54 +02:00
Bård Skaflestad 854be06489 Merge pull request #142 from atgeirr/master 
Update for opm-autodiff changes.
 2015-09-08 10:07:14 +02:00
Bård Skaflestad 63d34157ef Merge pull request #462 from blattms/fix-build 
Removes unused experimental header include to fix build.
 2015-09-07 11:23:59 +02:00
Bård Skaflestad 994e342d7b Restore build of flow_polymer 
Function Opm::thresholdPressures() gained a new ParseMode parameter
in commit OPM/opm-core@09aa2b7 (PR OPM/opm-core#857).  Chase updated
call interface.
 2015-08-25 09:30:44 +02:00
Bård Skaflestad c5ae85e480 Merge pull request #415 from atgeirr/fix-nnctreatment 
Fix nnc treatment
 2015-07-13 22:09:10 +02:00
Bård Skaflestad 85fe3d6ad2 Merge pull request #412 from atgeirr/fix-warning 
Avoid unused argument warning.
 2015-07-09 13:51:47 +02:00
Bård Skaflestad 8cd014f937 Merge pull request #408 from atgeirr/performance-opt 
Performance enhancements and simplifications for BlackoilModelBase
 2015-07-01 14:41:50 +02:00
Bård Skaflestad 8f46134861 Merge pull request #134 from GitPaean/companion_PR_autodiff_408 
adapting to the change in autodiff#408
 2015-07-01 14:41:41 +02:00
Bård Skaflestad f41bab749a Merge pull request #393 from atgeirr/create-params-once 
Create solver and model parameters only once.
 2015-06-10 15:01:17 +02:00
Bård Skaflestad bfd9071307 Merge pull request #125 from atgeirr/add-dummy-types 
Satisfy interface requirements of SimulatorBase.
 2015-06-10 13:52:28 +02:00
Bård Skaflestad f1a20b6b3b Merge pull request #391 from bska/fix-install 
Record New and Renamed Files
 2015-05-29 17:06:19 +02:00
Bård Skaflestad 35162df431 Record New and Renamed Files 
This fixes 'make install'.
 2015-05-29 16:18:56 +02:00
Bård Skaflestad 3e12d739b5 Restore build on older compilers 
Older compilers, e.g., GCC 4.4., do not understand the
"simple-type-specifier" syntax of C++11's "friend" declarations.
Typical responses are

   error: a class-key must be used when declaring a friend
   error: friend declaration does not name a class or function

Restore build on older compilers (e.g., GCC prior to 4.7) by
inserting the 'class' keyword.
 2015-05-28 17:16:28 +02:00
Bård Skaflestad 83c8912933 Merge pull request #388 from akva2/shared_check_commits 
changed: use common check-commits target from opm-cmake
 2015-05-28 15:35:06 +02:00
Bård Skaflestad a9c4d373a4 Merge pull request #114 from akva2/shared_check_commits 
changed: use common check-commits target from opm-cmake
 2015-05-28 15:19:36 +02:00
Bård Skaflestad 1b7b786cba Merge pull request #365 from akva2/update_redhat_packaging 
update redhat packaging
 2015-04-24 17:34:22 +02:00
Bård Skaflestad 78be86a9ed Merge pull request #361 from atgeirr/minor-output-fix 
Use more appropriate end-of-sim timing output.
 2015-04-21 12:33:22 +02:00
Bård Skaflestad e13ed48e4e Merge pull request #356 from atgeirr/accept-deck-as-argument 
Accept single deck filename as command line argument.
 2015-04-14 18:11:12 +02:00
Bård Skaflestad f688c7e87a Merge pull request #355 from atgeirr/new-startup-message 
Provide nicer startup message that includes opm-project URL.
 2015-04-14 13:35:18 +02:00
Bård Skaflestad 69ac687eb2 Merge pull request #351 from atgeirr/cmake_01 
Sync build system
 2015-04-10 17:35:34 +02:00
Bård Skaflestad f9dfd36043 Merge pull request #99 from atgeirr/cmake_01 
Sync build system
 2015-04-10 17:22:35 +02:00
Bård Skaflestad 7fa2d53db5 Merge pull request #337 from atgeirr/improve-helpers 
Add new vertcatCollapseJacs() helper and use it
 2015-03-24 17:13:47 +01:00
Bård Skaflestad 531bc7fd73 Merge pull request #333 from atgeirr/reduce-recalculation 
Reduce recalculation of phase pressures
 2015-03-11 09:20:51 +01:00
Bård Skaflestad 5ae25819f1 Merge pull request #331 from dr-robertk/PR/eclipsewriter-only-summary-in-substeps 
SimFullyImplBO: write simulation state at all report step and in the end.
 2015-03-10 12:32:11 +01:00
Bård Skaflestad 50fd23bffe Merge pull request #330 from atgeirr/simplify-props 
Further simplify properties
 2015-03-09 10:25:56 +01:00
Bård Skaflestad f2b928932a Merge pull request #92 from atgeirr/fix-compile-error 
Follow API change in BlackoilPropsAdInterface.
 2015-03-09 10:25:53 +01:00
Bård Skaflestad eed6b0a4a3 Merge pull request #329 from atgeirr/fix-rateconverter-test 
Fix for test failures after #327.
 2015-03-05 16:27:28 +01:00
Bård Skaflestad 5a390f0d27 Merge pull request #323 from blattms/uggridhelpers-completion 
Moves functions that do not depend on Eigen to Opm::UgGridHelpers. [3/3]
 2015-03-02 18:50:06 +01:00
Bård Skaflestad e1805f3224 Merge pull request #322 from blattms/bugfix-blackoilsate 
[bugfix] read only from the sendState in BlackoilStateDataHandle.
 2015-03-02 11:30:11 +01:00
Bård Skaflestad 90ff9c055d Merge pull request #320 from atgeirr/fix-pvtregions 
Fix pvt regions
 2015-02-27 12:29:42 +01:00
Bård Skaflestad d53cf1cf54 Merge pull request #318 from atgeirr/cleanup 
Remove unused classes and example
 2015-02-27 10:11:39 +01:00
Bård Skaflestad 945104f39b Merge pull request #89 from qilicun/fix_polymer_inflow 
Change PolymerInflow constructor interface.
 2015-01-26 23:29:55 -06:00
Bård Skaflestad 7dfcf7b0c0 Merge pull request #282 from atgeirr/fix-wellstate-init 
Fix issues in WellStateFullyImplicitBlackoil::init().
 2015-01-26 23:12:12 -06:00
Bård Skaflestad 18fa00b542 Merge pull request #270 from blattms/transmissibility-check-with-local 
Use correct constructor of DerivedGeology used with CpGrid in test_trans...
 2015-01-12 15:23:30 +01:00
Bård Skaflestad b9b2b9f520 Really catch up to file renaming. 
Pointy hat: @bska
 2014-12-17 11:39:51 +01:00
Bård Skaflestad c04351d4ac Merge pull request #261 from atgeirr/master 
Fix call to DerivedGeology constructor.
 2014-12-17 11:37:15 +01:00
Bård Skaflestad 6c7bdecd30 Catch up to file renaming 
This fixes "make install" which would otherwise fail with a diagnostic
message of the form

   CMake Error at cmake_install.cmake:64 (FILE):
     file INSTALL cannot find
     opm/autodiff/ConservativeSparseSparseProduct.h

Thanks to HudsonBuildServer for highlighting the issue.
 2014-12-17 11:34:08 +01:00
Bård Skaflestad 5ce5658892 Merge pull request #260 from atgeirr/add-generic-local-trans 
Add a generic (throwing) tpfa_loc_trans_compute_().
 2014-12-17 10:50:17 +01:00
Bård Skaflestad 9a599d0e24 Merge pull request #256 from totto82/addregionTrans 
Add contribution from region multipliers
 2014-12-10 17:02:08 +01:00
Bård Skaflestad 72553f314a Merge pull request #253 from joakim-hove/FindERT-update 
FindERT.cmake: Look for libecl_well library
 2014-12-08 13:15:18 +01:00
Bård Skaflestad c69b2fd8ed Include <config.h> to fix build on GCC 4.8 
GCC 4.8 provides 'nullptr' in C++11 mode.  That capability is
detected at configuration time and stored in <config.h> and we need
it when targeting Dune 2.2.1 to avoid diagnostics of the form

  [...]/dune/common/nullptr.hh:27:1:
  error: expected ‘;’ after class definition
   } nullptr = {};              // and whose name is nullptr
    ^

  [...]/dune/common/nullptr.hh:27:1:
  error: qualifiers can only be specified for objects and functions
  [...]/dune/common/nullptr.hh:27:3:
  error: expected unqualified-id before ‘nullptr’
   } nullptr = {};              // and whose name is nullptr
 2014-11-27 15:12:56 +01:00
Bård Skaflestad 9e72ea50ad Merge pull request #234 from akva2/debian_packaging 
update debian packaging
 2014-11-17 18:01:58 +01:00
Bård Skaflestad 7ac155531a Merge pull request #233 from atgeirr/improve-cpr-performance 
Improve performance of CPR preconditioner.
 2014-11-14 08:47:05 +01:00
Bård Skaflestad e4ad38ec31 Merge pull request #231 from atgeirr/modify-convergence-output 
Improve convergence output.
 2014-11-12 22:43:47 +01:00
Bård Skaflestad 55226c3b86 Merge pull request #220 from qilicun/fix_phase_idx 
phaseIdx in this for statement is actual active phase index, should not active once again.
 2014-10-11 11:14:16 +02:00
Bård Skaflestad 9124b6f56b Don't use 'typename' in non-template context 
This fixes the build on GCC 4.4.

Pointy hat: @bska
 2014-10-06 12:33:08 +02:00
Bård Skaflestad 9b10f7827b Merge pull request #210 from atgeirr/dune-matrix-hack 
Add a horrible hack: DuneMatrix class.
 2014-10-06 11:43:05 +02:00
Bård Skaflestad 7ee66047b1 Merge pull request #214 from atgeirr/fix-pressure-usage 
Fix usage of result from computePressures().
 2014-10-06 11:16:07 +02:00
Bård Skaflestad 3c97fa0d64 Merge pull request #212 from dr-robertk/master 
separat solver parameters
 2014-10-01 18:19:15 +02:00
Bård Skaflestad a0567cc887 Fix out-of-bounds indexing into PVT function table 
The 'props_' table of PVT functions has one entry for each active
phase.  Fix four instances of indexing into the table using the
canonical rather than active phase indices.

This is necessary, but not sufficient, to run two-phase problems
without a "dummy" third phase.
 2014-09-18 00:19:35 +02:00
Bård Skaflestad be589ba5f3 Merge pull request #189 from atgeirr/add-minpv 
Add MINPV support to grid creation for fully implicit sims.
 2014-08-29 09:16:55 +02:00
Bård Skaflestad d0b677920a Merge pull request #190 from atgeirr/threshold-pressure 
Threshold pressure
 2014-08-29 09:14:24 +02:00
Bård Skaflestad de33d39f46 Merge pull request #191 from atgeirr/fix-warnings 
Suppress warnings of various kinds.
 2014-08-28 16:11:27 +02:00
Bård Skaflestad 53e6bfcd3d Merge pull request #187 from osae/satFunc-eclState 
Provide eclipse state to saturation property init.
 2014-08-25 13:56:14 +02:00
Bård Skaflestad 077b01b767 Merge pull request #188 from OPM/support-resv 
Support RESV controls
 2014-08-25 13:54:30 +02:00
Bård Skaflestad d8452145ae Merge pull request #186 from atgeirr/use-pinch 
Use direct deck-using version of grid construction method.
 2014-08-22 20:36:26 +02:00
Bård Skaflestad 6fccb4b446 Merge pull request #179 from atgeirr/restructure-sim 
Restructure fully implicit blackoil simulators
 2014-08-13 10:23:41 +02:00
Bård Skaflestad a3bc595a91 Aesthetics: Turn if-else into switch() 
This commit replaces an if-else-based query of the primaryVariable_
with the equivalent switch() statement for uniformity with the rest
of the implementation.
 2014-08-08 11:40:50 +02:00
Bård Skaflestad 0f663dfe9f Implement RESV control mode for producers 
This commit introduces support for the RESV control mode of
prediction (WCONPROD) and history-matching (WCONHIST) alike.  The
implementation uses class SurfaceToReservoirVoidage<> to compute
coefficients that convert component rates at surface conditions
(i.e., the primary degrees of freedom in the well residual) to phase
rates at reservoir condition.  The resulting coefficients can be
entered directly into system matrix of the linearised residual.

Note: We abuse the "distr" mechanism of struct WellControls to store
the conversion coefficients.  This may require refactorisation and
clarification at a later stage.  In the meantime, it allows for
transparent assembly of well equations--irrespective of surface- or
reservoir (voidage) rates.

Note: We do not yet support injectors controlled by total reservoir
voidage rate--either in history-matching (WCONINJH) or
prediction-scenario capacity.
 2014-08-08 11:40:50 +02:00
Bård Skaflestad 23520be41a RESV: Prepare for dynamic rate distribution calculation 
This commit changes the API of class SimulatorFullyImplicitBlackoil<>
in order to support wells controlled by (total) reservoir voidage
volume rates.  Specifically, we switch to holding a mutable Wells
object (backed by a std::shared_ptr<>) in class Impl rather than a
reference to a WellsManager.  This allows dynamically updating rate
distributions and targets of individual well controls.  That, in
turn, is a prerequisite to supporting ECL-style "RESV" control
modes--be it in prediction or history matching capacity.

While in the process of API changes, also prepare for the second
stage of "WCONHIST/RESV" support: Accept a ScheduleConstPtr that
holds the input deck's notion of the history matching vs. prediction
controls.  We need to distinguish the two in order to support the
exact semantics of "WCONHIST/RESV".

Update SimFIBO<> clients accordingly.
 2014-08-08 11:40:50 +02:00