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,016 Commits 31 Branches 117 Tags
57dfce29bef88cdeae3f8fa955bfa604fd5ef0d4
Commit Graph
2016 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 57dfce29be Merge pull request #499 from blattms/remove-source-file-for-flow_cp-and-rename-to-flow_parallel 
Renamed flow_cp to flow_mpi
 2015-10-12 11:18:14 +02:00
Markus Blatt 82a73d969e Renamed flow_cp to flow_mpi 2015-10-12 10:59:01 +02:00
dr-robertk 3b0ebf92c0 Merge pull request #498 from atgeirr/minor-fixes-interleaved 
Fix compile warning and error message.
 2015-10-09 13:51:50 +02:00
Atgeirr Flø Rasmussen 6170542e2f Fix compile warning and error message. 2015-10-09 13:49:00 +02:00
Atgeirr Flø Rasmussen 46afd22860 Merge pull request #496 from dr-robertk/PR/variable-np-in-newton 
NewtonBlackølInterationInterleaved: allow np to be variable.
 2015-10-09 13:43:39 +02:00
Robert Kloefkorn 4d121dccf4 NewtonIterationBlackoilInterleavedImpl: cleanup. 2015-10-09 13:39:02 +02:00
Robert Kloefkorn 476a09e0d6 NewtonIterationBlackoilInterleaved: print "...to cover np = 0" 2015-10-09 12:12:50 +02:00
Robert Kloefkorn ac034bd80e NewtonIterationBlackoilInterleaved: fix docu. 2015-10-09 12:06:29 +02:00
Robert Kloefkorn 885aedb1e8 NewtonIterationBlackoilInterleaved: make parameter a struct to avoid multi reading. 2015-10-09 12:03:58 +02:00
Robert Kloefkorn 28902065cf NewtonIterationBlackoilInterleavedImpl: silence warnings about unused and shadowed 
variables.
 2015-10-08 15:54:21 +02:00
Robert Kloefkorn d93a1a5b63 NewtonIterationBlackoilInterleaved: replace switch-case statement by proper template 
recursion.
 2015-10-08 15:54:21 +02:00
Robert Kloefkorn 884edadbd6 NewtonIterationBlackoilInterleaved: remove old docu. 2015-10-08 15:54:21 +02:00
Robert Kloefkorn 6304e44242 NewtonIterationBlackoilInterleeaved: remove unused headers. 2015-10-08 15:54:21 +02:00
Robert Kloefkorn c485e3fdc7 NewtonBlackølInterationInterleaved: NewtonBlackølInterationInterleavedImpl implements 
the Iteration for a fixed number of cell variabled which is then used by the
NewtonBlackølInterationInterleaved class via a switch-case over the actually existing
numbers.
 2015-10-08 15:54:21 +02:00
dr-robertk 62511215d4 Merge pull request #495 from atgeirr/silence-warnings 
Silence warnings (shadowing and unused argument).
 2015-10-08 15:47:37 +02:00
Atgeirr Flø Rasmussen 9be05f4206 Undo changes to NewtonIterationsBlackoilInterleaved. 2015-10-08 15:11:50 +02:00
Atgeirr Flø Rasmussen 9e3d360b5b Silence warnings (shadowing and unused argument). 2015-10-07 10:07:45 +02:00
Joakim Hove 0149732abc Merge pull request #493 from joakim-hove/relocate-warning-headers 
Updated path to warning suppression header.
 2015-10-06 16:06:05 +02:00
Joakim Hove 76f674b16b Updated path to warning suppression header. 2015-10-06 12:11:49 +02:00
Atgeirr Flø Rasmussen 68caa026d9 Merge pull request #487 from totto82/solventModel 
Changes to the solvent model
 2015-10-06 11:19:58 +02:00
Tor Harald Sandve dff77afff7 Use getConvergence and convergenceReduction from base 2015-10-06 11:04:34 +02:00
Tor Harald Sandve 56d6a1f54e Add missed parentheses from the rebase process 2015-10-06 10:51:20 +02:00
Tor Harald Sandve 83bcd24108 Fill vector with zeros as constructed 2015-10-06 10:40:18 +02:00
Tor Harald Sandve 60a6451a6f Fix typo 2015-10-06 10:40:18 +02:00
Tor Harald Sandve 8b8ca200d6 Use implemented computeWellConnectionPressures() 2015-10-06 10:40:18 +02:00
Tor Harald Sandve 6106d560ba Compute matbal_scale for the solvent model 
The material balance scaling is extended to the solvent model
The gas value is used as default and an updateEquationsScaling() method
is added.

Minor modifications is done to the BlackoilModelBase.hpp and
BlackoilModelBase_impl.hpp in order to re-use code from the base case.
 2015-10-06 10:40:18 +02:00
Tor Harald Sandve fb9e21d695 Add a local version of computeWellConnectionPressures() 
Solvent is accounted for in the calculations of well connection
pressures by adjusting the surface_density and the b-factor

TODO: Restructuring to avoid code duplication with
BlackoilModelBase_impl
 2015-10-06 10:38:36 +02:00
Tor Harald Sandve 7bdd91d78f Allow for different surface densities in well perforations 
The surface density input in well_perforation_densities() in
WellDensitySegmented.hpp is changed from one value pr. phase to one
value pr phase and perforation. This allow for different densities in
different perforation. The test is changed accordingly.
 2015-10-06 10:38:36 +02:00
Tor Harald Sandve 23f4f48df5 Initialize well solvent fraction 
The well solvent fraction is set to zero as default.
 2015-10-06 10:38:36 +02:00
Tor Harald Sandve 18613b9c7b Make flow_solvent run when SOLVENT is not specified 2015-10-06 10:38:36 +02:00
Tor Harald Sandve c9b6db6c7e Use a weighted sum of the b-factors of gas and solvent 
A weighted sum of the b-factors of gas and solvent is used in the well
equation.
 2015-10-06 10:33:17 +02:00
Tor Harald Sandve 08ce231869 Recalculate gas fluxes 
The gas fluxes must be recalculated along with the mobilities after the
gasRelPermMultiplier is applied
 2015-10-06 10:33:17 +02:00
Tor Harald Sandve 853e1f0dc1 Use ADB for solvent fraction 2015-10-06 10:33:17 +02:00
Atgeirr Flø Rasmussen 64c5b29b87 Merge pull request #492 from atgeirr/refactor-convergence-report 
Refactor convergence reduction and report
 2015-10-06 10:03:37 +02:00
Joakim Hove f3437a67f7 Merge pull request #488 from joakim-hove/table-container 
Changed Table code to use TableContainer
 2015-10-05 14:47:13 +02:00
Joakim Hove a9a42e82be Changed Table code to use TableContainer 2015-10-04 07:45:58 +02:00
Atgeirr Flø Rasmussen 85d7f6c904 Merge pull request #482 from babrodtk/autodiffmatrix_documentation 
Autodiffmatrix beautification
 2015-10-02 12:48:16 +02:00
babrodtk 654e4a81bf Fixed errors from rebasing 2015-10-02 10:33:55 +02:00
babrodtk 7f9175e046 Created named constructor for identity matrices 2015-10-02 10:22:05 +02:00
babrodtk 4073abeafb Added documentation for AutoDiffMatrix 2015-10-02 10:21:28 +02:00
Atgeirr Flø Rasmussen 39a0766b8c Refactor MPI version of convergenceReduction(). 2015-10-01 11:05:35 +02:00
Atgeirr Flø Rasmussen d29ee6967c Also refactor getWellConvergence() like getConvergence(). 2015-09-30 15:20:04 +02:00
Atgeirr Flø Rasmussen dcb78877eb Separate phase and material concepts. 2015-09-30 14:44:50 +02:00
Atgeirr Flø Rasmussen 01f7e48693 Implement numPhases() by phase_name_.size(). 
This makes it easier for derived models to add a phase.
 2015-09-30 13:46:57 +02:00
Atgeirr Flø Rasmussen 67ac59288d Make numPhases() calls use asImpl(). 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen 3d86b9b619 Refactor getWellConvergence() similar to getConvergence(). 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen 6a0964851c Make convergence checks and output work with active phases. 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen 4f72bfdbcf Added phaseName() method. 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen aac34009e1 Use active and not canonical phases in getConvergence() etc. 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen 57deb18dc4 Merge pull request #484 from dr-robertk/PR/Parallel-output-only-in-parallel-runs 
ParallelDebugOutput: only use parallel output when mpi size > 1.
 2015-09-30 09:42:28 +02:00