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,489 Commits 31 Branches 117 Tags
2b1c9ae7190c5442e11b434a85cefcf84ab24afe
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 2b1c9ae719 Merge pull request #346 from atgeirr/fix-output 
Fix convergence table labels (water, oil swapped).
 2015-04-08 13:35:16 +02:00
Atgeirr Flø Rasmussen 78ea73fa0a Fix convergence table labels (water, oil swapped). 2015-04-08 13:33:42 +02:00
Atgeirr Flø Rasmussen 2ce8abcdb8 Merge pull request #345 from dr-robertk/PR/fix-uninitialized-parameter 
NewtonIterationBlackoilCPR: fix uninitialized parameter
 2015-04-08 12:37:41 +02:00
Atgeirr Flø Rasmussen 72ec98f94b Merge pull request #343 from atgeirr/fix-flow-cp 
Bugfix: distribute only if comm size is strictly > 1.
 2015-04-08 10:18:30 +02:00
Atgeirr Flø Rasmussen 656e5de331 Bugfix: distribute only if comm size is strictly > 1. 2015-04-08 10:16:25 +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
Atgeirr Flø Rasmussen 170dbb58eb Merge pull request #341 from andlaus/use_EclipseState_for_summary_units 
Revert "also pass the deck to the output writer"
 2015-03-31 17:45:17 +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
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 c524be454a Merge pull request #338 from flikka/add-output-header-file 
Added SimulatorFullyImplicitBlackoilOutput.hpp to public headers, now us...
 2015-03-25 12:54:03 +01:00
Atgeirr Flø Rasmussen 059bfaf036 Fix error in test for vertcatCollapseJacs(). 2015-03-24 15:05:05 +01:00
Atgeirr Flø Rasmussen 9af3296aa9 Add test for vertcatCollapseJacs(). 
The test case is non-trivial in that it concatenates elements with a mix of
empty() and non-empty jacobian vectors.
 2015-03-24 09:50:34 +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
Atgeirr Flø Rasmussen ad3da1d946 Re-add copying overload of AutoDiffBlock::function(). 2015-03-19 11:46:48 +01:00
Atgeirr Flø Rasmussen 0a76af1b14 Include <utility> for std::move(). 2015-03-17 09:46:15 +01:00
Atgeirr Flø Rasmussen f0ba4a5797 Use swap() and move() to reduce copying in formEllipticSystem(). 2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen 5ff65b40e1 Fix bug added when adapting to new API. 
Avoid using invalidated 'jacs', make copy.
 2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen a4a3505fae Remove unused method computeRelPermWells(). 2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen 04b255a03f Make more use of move semantics in AD code. 
This makes some API changes to AutoDiffBlock.
 - Add overload for the constant() constructor taking rvalue ref.
 - Add overload for the variable() constructor taking rvalue ref.
 - Make the function() constructor *require* rvalue refs.
 - Add a swap() function.

The remaining changes in this commit are follow-ups especially
to the third change (adding std::move in many places), and
some removal of unnecessary block pattern arguments from calls to
the constant() static method.
 2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen 635f3db814 Use references in computeRelperm(). 2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen 5d5ab267d2 Use std::move() in variableState(). 2015-03-16 14:22:31 +01:00
Atgeirr Flø Rasmussen f6b28b0f66 Add helper computeGasPress(), use to improve performance. 
This avoids excessive calling of constantState().
 2015-03-09 10:56:35 +01:00
Atgeirr Flø Rasmussen ec9f5c1634 Move initial term computation to assemble(). 2015-03-09 10:56:35 +01:00
Atgeirr Flø Rasmussen 8f91296974 Eliminate extra computePressure() calls. 
The function still gets called more than necessary,
but that is due to its use in variableState() and that
constantState() calls variableState().
 2015-03-09 10:56:35 +01:00
Atgeirr Flø Rasmussen 818b653c15 Removed extra overload of relperm(). 2015-03-09 09:40:30 +01:00
Atgeirr Flø Rasmussen a347e35304 Removing extra overloads of rsSat() and rvSat(). 
Also a few minor fixes to docs and indentation while in the area.
 2015-03-09 09:40:30 +01:00
Atgeirr Flø Rasmussen 64769f1062 Merge pull request #332 from atgeirr/fix-compile-error 
Fix compile error instroduced by merging #275.
 2015-03-09 09:39:02 +01:00
Atgeirr Flø Rasmussen ae31c034b6 Fix compile error instroduced by merging #275. 
Moved output directory code near top again, changed rank query
to use Dune::MPIHelper instead of the grid.
 2015-03-09 09:37:16 +01:00
Atgeirr Flø Rasmussen 17117e7a0e Avoid storing return value in reference. 
Normally this is OK for by-value returns, but here the right hand side
was changed to call ADB::value(), which returns by reference.
 2015-03-05 16:07:04 +01:00
Atgeirr Flø Rasmussen 17b2a0e726 Merge pull request #327 from atgeirr/simplify-props 
Simplify properties
 2015-03-05 14:01:41 +01:00
Atgeirr Flø Rasmussen d9d3554cb7 Merge pull request #328 from dr-robertk/PR/tolerance-wells 
Output Newton and Lienar solver iterations
 2015-03-05 11:32:47 +01:00
Atgeirr Flø Rasmussen 4be1671b4f Merge pull request #326 from dr-robertk/PR/tolerances-as-parameters 
Allow tolerances to be set in parameter files.
 2015-03-03 14:39:08 +01:00
Atgeirr Flø Rasmussen fbf06c06e7 Remove extra overloads of bWat(), bOil() and bGas(). 
Remaining method is the one taking AD objects. This modification
required changes to a few more places than anticipated:
  - RateConverter
  - FullyImplicitBlackoilSolver::computeWellConnectionPressures()
In these places, the call now is a little more complex and there
might be a very minor performance loss, until we optimize the
bX() functions to check for the no-derivatives case.
 2015-03-03 14:33:19 +01:00
Atgeirr Flø Rasmussen 1195ced57a Remove obsolete comment. 2015-03-03 13:19:42 +01:00
Atgeirr Flø Rasmussen 1d68f7e846 Remove extra overloads of muGas() and muWat(). 
This change has been made in both BlackoilPropsAdInterface
and BlackoilPropsAdFromDeck. Only remaining overloads are
those using AD objects and passing the PhasePresence for
each data point.
 2015-03-03 13:14:31 +01:00
Atgeirr Flø Rasmussen 965be0471f Remove non-AD overload of muWat(). 
The AD version is made a little smarter, detecting the
case of input with no derivatives. Existing use of the
non-AD rewritten.
 2015-03-03 12:56:30 +01:00
Atgeirr Flø Rasmussen e1c9eea997 Merge pull request #321 from atgeirr/remove-unused-variable 
Remove unused variable.
 2015-03-02 10:35:13 +01:00
Atgeirr Flø Rasmussen 94742bd560 Remove unused variable. 2015-03-02 10:33:44 +01:00
Atgeirr Flø Rasmussen 09f6e8aacb Merge pull request #319 from blattms/removes-uggridhelpers-cpgrid 
Moves Opm::UgGridHelpers from opm-autodiff to dune-cornerpoint
 2015-03-02 10:10:26 +01:00
Atgeirr Flø Rasmussen 80692675ba Merge pull request #315 from atgeirr/rename-simulator 
Rename "sim_fibo_ad" to "flow"
 2015-02-27 12:36:47 +01:00
Atgeirr Flø Rasmussen c6d38f543c Rename sim_fibo_ad[_cp] -> flow[_cp]. 
In line with the decision we made to use "flow" as name for the
fully implicit black-oil simulators.
 2015-02-27 12:35:03 +01:00
Atgeirr Flø Rasmussen 22d0d7cd27 Remove extra call to extractPvtTableIndex(). 2015-02-27 12:26:12 +01:00
Atgeirr Flø Rasmussen 4d9a30807b Fix test_rateconverter failure. 
- Make test use three phases, not two.
 - Avoid interpolation failure by adding a line to PVDG.
 2015-02-27 10:20:30 +01:00
Atgeirr Flø Rasmussen 635fea1cad Remove pvtTableIdx_ from BlackoilPropsAdFromDeck. 
It was not used by the properties, this commit also fixes the bug that
pvtTableIdx_ was initialized instead of cellPvtRegionIdx_.
 2015-02-27 10:20:30 +01:00
Atgeirr Flø Rasmussen ba86dc191c Fix handling of multiple pvt-regions in BlackoilPropsAdFromDeck. 2015-02-27 10:20:30 +01:00
Atgeirr Flø Rasmussen f3cfe26edb Correct function comment. 2015-02-23 13:42:51 +01:00
Atgeirr Flø Rasmussen d9ce8625cf Remove unused classes. 
After this, the two affected tests fail due to bugs in PVT region
support in BlackoilPropsAdFromDeck.
 2015-02-23 13:42:51 +01:00
Atgeirr Flø Rasmussen eb89236552 Merge pull request #317 from blattms/generic-equil 
Modified sim_fibo_ad_cp to also allow running with EQUIL keyword.
 2015-02-20 18:24:05 +01:00
Atgeirr Flø Rasmussen 0ce57cb6db Merge pull request #316 from blattms/parallel-verbose-on-0 
Print status output only on rank 0 for parallel runs.
 2015-02-20 18:11:38 +01:00
Atgeirr Flø Rasmussen 1ba856ebfe Merge pull request #314 from totto82/avg_press 
Use the average well block pressure when evaluating the properties
 2015-02-20 08:36:49 +01:00
Atgeirr Flø Rasmussen ab835ec443 Merge pull request #308 from atgeirr/resv-injectors 
Implement RESV limit targets for INJECTOR wells.
 2015-02-19 15:45:18 +01:00
Atgeirr Flø Rasmussen fec50b491a Merge pull request #311 from totto82/fix_verticalscaling 
Apply the swatinit scaling to new_props
 2015-02-19 11:29:00 +01:00
Atgeirr Flø Rasmussen 1e5b691a49 Merge pull request #313 from blattms/redistgridhandle-without-grid 
Remove the unsused grid members from BlackoilPropsDataHandle.
 2015-02-19 10:03:43 +01:00
Atgeirr Flø Rasmussen 46cfaa1432 Merge pull request #312 from atgeirr/fix-warnings 
Fix warnings
 2015-02-19 09:14:05 +01:00
Atgeirr Flø Rasmussen e96036bdb3 Move helper functions to namespace detail. 
These were in the anonymous namespace, which was not wrong but lead to
false-positive unused function warnings on some compilers, probably due
to being used only from within templates. This allows us to keep the
warning activated by default.
 2015-02-19 09:07:42 +01:00
Atgeirr Flø Rasmussen b83bb7bf92 Remove unused function. 2015-02-19 09:03:22 +01:00
Atgeirr Flø Rasmussen 47d9b3438e Merge pull request #310 from atgeirr/fix-warnings 
Fix warnings and adapt to API changes
 2015-02-18 13:16:07 +01:00
Atgeirr Flø Rasmussen f0190dd2bb Remove const from bool return type. 
Since it has no effect for value types, and generates a warning.
 2015-02-17 13:45:14 +01:00
Atgeirr Flø Rasmussen 850845c61d Suppress re-declaration warning. 2015-02-17 13:44:52 +01:00
Atgeirr Flø Rasmussen 17ade0457f Suppress unused argument errors. 2015-02-17 13:44:33 +01:00
Atgeirr Flø Rasmussen a4024a3f9e Remove unused functions. 2015-02-17 13:42:26 +01:00
Atgeirr Flø Rasmussen 355bfb0e70 Suppress signed/unsigned warning. 
Also fix formatting.
 2015-02-17 13:41:31 +01:00
Atgeirr Flø Rasmussen 7cdb65cff3 Suppress unused argument warnings. 2015-02-17 13:41:00 +01:00
Atgeirr Flø Rasmussen 75d98c7e3b Remove uneeded function argument. 2015-02-17 13:40:09 +01:00
Atgeirr Flø Rasmussen bd2f659770 Adapt to API change in WellsManager. 2015-02-17 13:22:43 +01:00
Atgeirr Flø Rasmussen 3873e5d810 Merge pull request #309 from chflo/opm-166 
opm-166: Fix due to signature change in method thresholdPressures
 2015-02-17 10:49:43 +01:00
Atgeirr Flø Rasmussen 484f1e4438 Merge pull request #302 from blattms/distribute-input-props-data 
Adds data redistribution capabilities and makes sim_fibo_ad_cp parallel.
 2015-02-16 12:48:03 +01:00
Atgeirr Flø Rasmussen 3ade13d235 Implement RESV limit targets for INJECTOR wells. 2015-02-16 11:08:57 +01:00
Atgeirr Flø Rasmussen 15aa7ec2ab Merge pull request #306 from joakim-hove/stream-open-c_str 
The stream::open() functions require c_str()
 2015-02-12 17:31:44 +01:00
Atgeirr Flø Rasmussen eea8bb23a9 Merge pull request #304 from blattms/parallel-info-by-value 
Store the boost::any of ParallelIstlInformation by value. (Alternative to #303)
 2015-02-12 14:48:46 +01:00
Atgeirr Flø Rasmussen d2b3e52472 Merge pull request #292 from blattms/parallel-newton-convergence 
Adds parallel solver support for sim_fibo_ad_cp
 2015-02-12 11:24:15 +01:00
Atgeirr Flø Rasmussen bed7bada40 Merge pull request #286 from dr-robertk/PR/add-support-for-restart 
BlackoilOutputWriter: added support for backup and restore.
 2015-02-11 14:05:24 +01:00
Atgeirr Flø Rasmussen 2f632bc9c3 Merge pull request #299 from blattms/fix-dependency 
[bugfix] Fixes dependency clause of #296
 2015-02-11 12:45:00 +01:00
Atgeirr Flø Rasmussen d99931ae0f Merge pull request #298 from dr-robertk/PR/remove-warning 
convergenceReduction: remove warning.
 2015-02-10 14:44:16 +01:00
Atgeirr Flø Rasmussen 3b742e0093 Merge pull request #296 from blattms/require-dune-istl 
Explicitly list dune-istl as a dependency.
 2015-02-06 14:36:02 +01:00
Atgeirr Flø Rasmussen 588615bd21 Merge pull request #285 from dr-robertk/PR/revision-of-output 
Revision of black oil output by putting everything into a single class following the OutputWriter IF.
 2015-02-05 15:20:35 +01:00
Atgeirr Flø Rasmussen 12248f5c14 Merge pull request #294 from totto82/default_bhp_wconhist 
Hardcode bhp limit for WCONHIST/RESV to 1 atm.
 2015-02-05 13:31:05 +01:00
Atgeirr Flø Rasmussen 5b79ead6ba Merge pull request #288 from andlaus/temperature_dependent_viscosity 
add the glue code required for temperature dependent viscosity
 2015-02-03 17:48:41 +01:00
Atgeirr Flø Rasmussen 3d8209abe4 Merge pull request #283 from blattms/restructure-newton-convergence-for-parallelization 
Restructure newton convergence for parallelization
 2015-01-30 15:38:25 +01:00
Atgeirr Flø Rasmussen e6a053a392 Merge pull request #291 from blattms/fixes-issue-290 
Fixes raisal of assertion in Eigen because of empty vector and matrices. Fixes #290
 2015-01-30 15:12:48 +01:00
Atgeirr Flø Rasmussen a8b715893f Merge pull request #289 from totto82/vap_der 
Include derivatives of vappars
 2015-01-30 15:06:16 +01:00
Atgeirr Flø Rasmussen 69c1a660a8 Merge pull request #287 from qilicun/update_pv 
Use original grid cell volume to compute pore volume.
 2015-01-30 15:00:34 +01:00
Atgeirr Flø Rasmussen e3b0a92176 Merge pull request #284 from blattms/rename-residuals 
Renames residuals() to computeResidualNorms()
 2015-01-28 14:46:48 +01:00
Atgeirr Flø Rasmussen ce3519dadb Fix issues in init(). 
- Failed to set all rates to zero initially.
 - Could set out-of-bounds index if number of controls changed.
 2015-01-26 16:46:51 +01:00
Atgeirr Flø Rasmussen 56ef604773 Merge pull request #280 from dr-robertk/PR/restart-solver-when-residual-nan 
Restart solver when residual is nan or to large.
 2015-01-26 13:08:37 +01:00
Atgeirr Flø Rasmussen 59f9b58d54 Merge pull request #281 from totto82/copy_perf_shut_complitions 
Only copy perfPhaseRates if number of perforations is equal.
 2015-01-26 10:17:51 +01:00
Atgeirr Flø Rasmussen e7dc775a05 Merge pull request #278 from dr-robertk/PR/fix-276-gcc44 
remove template keyword.
 2015-01-20 14:53:39 +01:00
Atgeirr Flø Rasmussen 97b98328c6 Merge pull request #276 from dr-robertk/PR/allow-to-run-without-wells 
Allow sim_fibo_ad to run without wells.
 2015-01-20 13:03:08 +01:00
Atgeirr Flø Rasmussen bfe5f57c9a Merge pull request #277 from blattms/fix-phaseindex 
Unifies the phase indices with the ones in opm-core.
 2015-01-20 09:31:59 +01:00
Atgeirr Flø Rasmussen 325ad95e80 Merge pull request #274 from blattms/generic-transmissibilities 
Implement generic transmissibilities computations using the GridHelpers
 2015-01-15 22:40:05 +01:00
Atgeirr Flø Rasmussen 656e688692 Merge pull request #272 from blattms/add-facetag-access-2 
Adds free function to access the face tag to UgGridHelpers.
 2015-01-15 20:30:51 +01:00
Atgeirr Flø Rasmussen 7086ece5a2 Merge pull request #273 from blattms/ports-transmissilities-test-to-grid-helpers 
Ports transmissibilities test to grid helpers
 2015-01-15 14:46:31 +01:00
Atgeirr Flø Rasmussen 9d6e55c4a1 Merge pull request #268 from dr-robertk/PR/EclipseWriter-revision-to-write-substeps 
Support of writing substeps with EclipseWriter.
 2015-01-15 13:52:35 +01:00
Atgeirr Flø Rasmussen 86e5677b8e Merge pull request #269 from totto82/rsrv_fix 
BUGFIX: Avoid inclusion of disgas in the vapoil contribution
 2015-01-12 10:08:13 +01:00
Atgeirr Flø Rasmussen 7a3008db72 Merge pull request #265 from totto82/fix_stoppedwells2 
Account for the renaming in the wellsManager
 2015-01-09 13:16:37 +01:00
Atgeirr Flø Rasmussen 20599ab698 Merge pull request #263 from totto82/phase_pressure 
Use phase pressures for the fluid properties
 2015-01-09 10:35:34 +01:00
Atgeirr Flø Rasmussen 29df1cab88 Merge pull request #262 from bska/fix-make-install 
Fix "make install" in opm-autodiff
 2014-12-18 11:20:49 +01:00
Atgeirr Flø Rasmussen e52af158fc Fix call to DerivedGeology constructor. 
New argument to constructor was not provided, still compiled
due to default argument.
 2014-12-17 11:32:20 +01:00