OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,242 Commits 24 Branches 102 Tags 90 MiB
0d00579f7d
Commit Graph

4242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
bef33ed00c Add an option for using values from TUNING in the timestepping. 
if the paramter use_TUNING is set to true, the adaptive timestepper will
initalize with relevant values from the TUNING keywords.
 2016-09-30 10:28:34 +02:00
Tor Harald Sandve
09a86747b5 Feed solvent wellrates to data::wells for summary output 2016-09-30 09:49:16 +02:00
Tor Harald Sandve
8e2657ce4d Some tuning in the Appleyard 2016-09-30 08:57:52 +02:00
Tor Harald Sandve
69811e9585 Use correct pvtregions in rsSat and rvSat calculations 2016-09-30 08:57:52 +02:00
Tor Harald Sandve
84c33e0e96 Add trivial well equation when there is no flow 
Fixes case when all perforations in a well are crossflowing while
crossflow is not allowed
 2016-09-30 08:57:52 +02:00
Tor Harald Sandve
07339be80e BUGFIX. Make frankenstein compile and run 
- remove outout of initial timestep
- pass phaseUsage to report(...) in WellStateFullyImplicitBlackoil.hpp
 2016-09-30 08:57:52 +02:00
Andreas Lauser
7d7e619333 Merge pull request #846 from andlaus/frankenstein_merge_master_v2 
Frankenstein merge master v2
 2016-09-29 18:44:55 +02:00
Andreas Lauser
6722c67534 Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v2 2016-09-29 18:38:39 +02:00
Andreas Lauser
fa626a543b make it work with the latest master branches 
it broke because the Compat.hpp header was removed today.
 2016-09-29 18:24:54 +02:00
Atgeirr Flø Rasmussen
4a82ac386b Merge pull request #844 from blattms/report-step-iterations-in-step_timing.txt 
Correct number of (nonlineat) iterations/linearizations in step_timing.txt
 2016-09-29 17:44:37 +02:00
Atgeirr Flø Rasmussen
4a6fcde45e Merge pull request #837 from totto82/output_solvent2 
Output solvent saturation
 2016-09-29 17:32:51 +02:00
Andreas Lauser
6aabc99814 Merge pull request #818 from andlaus/frankenstein_merge_master 
Frankenstein merge master
 2016-09-29 09:55:32 +02:00
Andreas Lauser
36b00ba570 Merge remote-tracking branch 'origin/master' into frankenstein_merge_master 2016-09-28 21:20:47 +02:00
Andreas Lauser
83a9f6ffce threshold pressure defaults: calculate the pressure difference like when computing the fluxes 
this should not change the value of the result at all (because the
total delta which is added to the phase pressures stays identical),
but it should be less confusing when comparing this with the code that
calculates the gravity correction term in the flux calculation.
 2016-09-28 16:57:34 +02:00
Andreas Lauser
000fde19dc threshold pressures: simplify code for the density calculation a bit 2016-09-28 16:57:34 +02:00
Andreas Lauser
4f4d7531af threshold pressure: be more cautious when acessing the defaults 
maybe it worked as-is, or maybe decks which lead to illegal accesses
to the map are incorrect (i.e., they specify threshold pressures for
EQUIL-regions that do not touch), but let's play save here...
 2016-09-28 16:56:54 +02:00
Andreas Lauser
662d6e28cd threshold pressures: properly consider the dissolved components for the density 
even if a phase is saturated, the dissolved component must be
considered when calculating the fluid density.
 2016-09-28 16:55:15 +02:00
Andreas Lauser
ae3248da8b threshold pressure: use phase pressure instead of reference pressure... 
... to calculate phase densities for the threshold pressure
defaults. I don't know if the reference simulator does this, but this
makes it consistent with what's done in the flux calculation of flow.
 2016-09-28 16:54:00 +02:00
Markus Blatt
0bdab6e579 Correct number of (nonlineat) iterations/linearizations in step_timing.txt 
Previously, for all step zero was reported. With this commit
we set these numbers in the SimulatorReport and now they end
up correctly in step_timings.txt
 2016-09-28 12:05:52 +02:00
Tor Harald Sandve
45eae4bbc8 Output solvent saturation 
-- Compat.hpp is moved to opm-simulators
-- add SSOL if solvent is present
 2016-09-27 08:40:04 +02:00
Atgeirr Flø Rasmussen
3e04ef89f4 Merge pull request #838 from atgeirr/avoid-pessimizing-move 
Do not move when it would disable copy elision.
 2016-09-26 10:25:01 +02:00
Atgeirr Flø Rasmussen
08c5e31265 Do not move when it would disable copy elision. 2016-09-26 09:33:13 +02:00
Tor Harald Sandve
7f91eade7e Move Compdat.hpp from opm-core to opm-simulators 2016-09-23 13:03:12 +02:00
Jørgen Kvalsvik
95143868a3 2 -> To 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
7448ecae09 Newlines 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
c468d9c84b Braces. 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
5f5d69da6f WellState::report() to make opm-output Well data 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
9894f98910 utility/Compat 
Introduces some helper functions to quickly enable support for the new
opm-output implementation. Conversion from simulator oriented cell- and
well representation to opm-output defined representation.
 2016-09-23 12:59:18 +02:00
Atgeirr Flø Rasmussen
ec955690cd Merge pull request #834 from akva2/fix_regression_pr_833 
fix output of gas phase
 2016-09-21 10:54:29 +02:00
Arne Morten Kvarving
78049a174e fix output of gas phase 
fixes a regression caused by 65b512e903
 2016-09-21 10:46:50 +02:00
Arne Morten Kvarving
bf88ccc95a Merge pull request #821 from akva2/kristfho_moretests 
Added more cases/models to ctest
 2016-09-20 12:40:32 +02:00
Atgeirr Flø Rasmussen
c84abe63a5 Merge pull request #833 from ANerd/output_present_phases 
Output well rates for present phases
 2016-09-20 11:03:31 +02:00
Anders Matheson
65b512e903 Use PhaseUsage to determine output phases 2016-09-20 09:44:17 +02:00
Anders Matheson
0ac0c97612 Output rates for present phases 2016-09-19 16:43:41 +02:00
Atgeirr Flø Rasmussen
9d991292be Merge pull request #832 from totto82/fix_outputRSsat_solvent 
BUGFIX. Store RsSat and RvSat in simulator container also in the Solvent model
 2016-09-19 13:47:03 +02:00
Atgeirr Flø Rasmussen
06e41bdaca Merge pull request #819 from blattms/use-defunct-wells-from-loadbalancer-for-wellsmanager 
Use names of defunct wells from loadbalancer for wellsmanager
 2016-09-19 13:42:42 +02:00
Tor Harald Sandve
cb5238f5dc BUGFIX 
Updated solvent model after #825
Store rsSat and rvSat in simulator container for outut.
 2016-09-19 11:10:14 +02:00
Atgeirr Flø Rasmussen
51237cb960 Merge pull request #829 from blattms/parallelize-computeFluidInPlace 
Correctly parallelize computeFluidInPlace
 2016-09-19 09:31:05 +02:00
Atgeirr Flø Rasmussen
48f151bfca Merge pull request #806 from andlaus/implement_multregp 
use the PORV 3D property from opm-parser to determine the pore volume
 2016-09-16 09:46:22 +02:00
Atgeirr Flø Rasmussen
420a5b7b4f Merge pull request #827 from babrodtk/bugfix_output_writer_polymer 
Added missing code for polymer model for output
 2016-09-16 09:27:59 +02:00
babrodtk
5b75649a07 Simplified arguments to computeWaterShearVelocityFaces 2016-09-15 15:56:06 +02:00
Markus Blatt
2c70f05d6b Correctly parallelize computeFluidInPlace. 
Its first implementation computed wrong results in parallel. With this commit
we noe have completely parallelized the computations and the results seem correct
for parallel runs with norne.
 2016-09-15 15:43:08 +02:00
Markus Blatt
e15f9bfb9c Save space in computeFluidAndSpace. 
Both hcpv and res will be used to save only dims elements. As dims
will most likely be much smaller than the number of cells, we only
allocate containers of size dims with this commit.
 2016-09-15 15:35:27 +02:00
Andreas Lauser
6bc8080722 Merge remote-tracking branch 'totto82/frankenstein_mod' into frankenstein_merge_master 
* totto82/frankenstein_mod:
  Avoid copying of matrices inside StandardWellsDense.
 2016-09-15 11:48:24 +02:00
babrodtk
537c5d71b8 Added missing code for polymer model for output 2016-09-15 11:40:36 +02:00
Atgeirr Flø Rasmussen
bbd2575e00 Merge pull request #825 from babrodtk/bugfix_output_writer 
Bugfix for output writer
 2016-09-15 09:57:27 +02:00
Tor Harald Sandve
a84adf05a5 Merge pull request #2 from dr-robertk/frankenstein_mod 
Avoid copying of matrices inside StandardWellsDense.
 2016-09-14 16:03:19 +02:00
babrodtk
f7e3185546 Fixed bug where rsSat/rvSat were never set 2016-09-14 15:41:47 +02:00
Andreas Lauser
5278b88e2e Merge remote-tracking branch 'remotes/totto82/frankenstein_mod' into frankenstein_merge_master 
* remotes/totto82/frankenstein_mod:
  Fix seg-fault for cases without wells
  Some micro performance improvments and cleaning
  Add THP support in the denseAD well model
  Only solve the linear system when it is not converged.
  Revert changes to NewtonIterationBlackoilInterleaved.cpp
  add and use class wellModelMatrixAdapter
  Remove unused code and remove Eigen vectors
  New updateState
  Some cleaning and small changes
 2016-09-14 15:03:17 +02:00
Markus Blatt
8c18bfcc50 Added missing include for unordered_set. 
This is what the travis build
https://travis-ci.org/OPM/opm-simulators/builds/159576974 complained about.
 2016-09-14 14:41:27 +02:00