Commit Graph
2043 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen a362f2cf09 Merge pull request #509 from joakim-hove/use-opm-data
Use opm data
2015-10-21 21:57:45 +02:00
Joakim Hove 8302db443b Try to find opm-data and run flow on SPE1 case. 2015-10-21 18:43:08 +02:00
Joakim Hove a879e9cd41 Removed cmake setting : NON_PUBLIC_TEST 2015-10-21 16:56:10 +02:00
Atgeirr Flø Rasmussen f15be17d14 Merge pull request #508 from joakim-hove/cpr-config
Changes to solver approach configuration:
2015-10-21 13:04:58 +02:00
Joakim Hove 0a7c778c36 Changes to solver approach configuration:
1. Added new parameter group string: "solver_approach" which can take
    the values {direct, cpr, interleaved}.

 2. Hierarchy:

    i   If a value is set in the parameter group that takes absolute
        presedence.

    ii  If the Eclipse input deck asks for CPR - you get CPR.

    iii You get the flow default - currently interleaved.
2015-10-21 13:01:44 +02:00
Atgeirr Flø Rasmussen 1028af6aff Merge pull request #507 from akva2/update_redhat_packaging
update redhat packaging
2015-10-20 18:34:10 +02:00
Arne Morten Kvarving b04d7f81c7 update redhat packaging 2015-10-20 15:55:39 +02:00
Atgeirr Flø Rasmussen a106ef0636 Merge pull request #504 from akva2/update_debian_packaging
update debian packaging
2015-10-20 10:20:02 +02:00
Arne Morten Kvarving a35c78bfc9 update debian packaging 2015-10-20 09:47:26 +02:00
Atgeirr Flø Rasmussen 9cbae76d06 Merge pull request #503 from babrodtk/openpm_experiment
Added/fixed comments
2015-10-20 09:32:30 +02:00
André R. Brodtkorb d43b88af76 Added/fixed comments 2015-10-20 09:30:06 +02:00
Atgeirr Flø Rasmussen 98a3d1675a Merge pull request #454 from babrodtk/openpm_experiment
Parallel assembly (partial)
2015-10-19 15:32:50 +02:00
André R. Brodtkorb a208f793d5 Set OpenMP default to off 2015-10-19 15:21:08 +02:00
Atgeirr Flø Rasmussen 2bf42e1eb2 Merge pull request #494 from totto82/crossflow
Add support for banning cross-flow in a well
2015-10-19 14:41:17 +02:00
André R. Brodtkorb 40d2262f8e Fixed typo 2015-10-19 14:25:45 +02:00
Tor Harald Sandve f02a02320d Small fixes for readabilty 2015-10-19 08:34:16 +02:00
Tor Harald Sandve 16140c54fc Update comment
Cases with wells with no flow where crossflow is banned is handled in
the parser by shutting these wells. They will never be seen by the
simulator.
2015-10-19 08:17:52 +02:00
Tor Harald Sandve 0a5364a1d8 Modifications to handle additional argument in add_well() 2015-10-19 08:17:52 +02:00
Tor Harald Sandve 1772a8c257 Handle allowCrossFlow flags from the input deck 2015-10-19 08:15:21 +02:00
Tor Harald Sandve 3f089b10d8 Add support for banning crossflow in the well equations 2015-10-19 08:15:21 +02:00
Atgeirr Flø Rasmussen 0f40727fa2 Merge pull request #502 from atgeirr/new-arg-add-well
Add "allow crossflow" argument to add_well() calls.
2015-10-15 10:04:09 +02:00
Atgeirr Flø Rasmussen 67f1def789 Add "allow crossflow" argument to add_well() calls. 2015-10-15 09:54:53 +02:00
Atgeirr Flø Rasmussen df668cc5e7 Merge pull request #497 from andlaus/error_macros_to_opm_common
Error macros to opm common
2015-10-12 13:31:54 +02:00
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
Andreas Lauser 72b0cb2c3e use the error macros from opm-common 2015-10-08 12:08:28 +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