Kai Bao
65a3fff6f2
moving computeWellPotentials to be earlier in assemble()
...
in StandardWellsDense.
solveWellEq then have access to the updated well potentials.
does not change the result.
2017-01-16 16:18:35 +01:00
Kai Bao
01322b740e
fixing the mistakes in the code due to rebasing.
2017-01-16 16:18:35 +01:00
Kai Bao
a95977e716
making the group control works for StandardWellsDense
2017-01-16 16:18:35 +01:00
Kai Bao
b0e2bd9221
adding well perforation efficiency factor to StandardWellsDense
...
And also calculateEfficiencyFactor to initialize the values.
2017-01-16 16:18:35 +01:00
Kai Bao
4b47fa52ca
adding well collection to StandardWellsDense
...
to make StandardWellsDense have access to the group information.
2017-01-16 16:18:35 +01:00
Kai Bao
941689722f
adding functioin computeWellPotentials to StandardWellsDense
2017-01-16 16:18:35 +01:00
Kai Bao
92a4d8687f
adding bhp as a parameter of computeWellFlux in StandardWellsDense
...
To make the function usable for computing well potentionals.
2017-01-16 16:18:35 +01:00
Atgeirr Flø Rasmussen
5955cb07ba
Merge pull request #1026 from andlaus/flow_ebos-sync-with-flow_legacy
...
Flow ebos sync with flow legacy
2017-01-16 15:56:20 +01:00
Arne Morten Kvarving
0466d71d15
add option -o
...
use this to pass a toolchain file to use
2017-01-16 14:25:06 +01:00
Arne Morten Kvarving
0472d99fc8
fixed: include all updated tests in commit message
2017-01-16 14:02:39 +01:00
Arne Morten Kvarving
1812bf240e
separate spe1 cases in data update
...
spe11 for spe1 case 1
spe12 for spe1 case 2
2017-01-16 14:02:39 +01:00
Arne Morten Kvarving
69f84075f5
changed: default to use one build thread per core on system, not a hardcoded 4
...
relies on nproc being available
2017-01-16 14:02:38 +01:00
Andreas Lauser
ae38de70ef
flow_ebos: update the solution of the eWoms model from the reservoir state before each time step
...
this is has become necessary by the recent SWATINIT changes and is
needed to calculate the fluid-in-place consistently as well as for
ebos to use the correct initial solution for the initial
linearization.
2017-01-16 12:42:35 +01:00
Andreas Lauser
30e9d3826d
synchronize SimulatorFullyImplicitBlackoilEbos::run() with SimulatorFullyImplicitBlackoil::run()
2017-01-16 12:42:35 +01:00
Andreas Lauser
d87b788d09
BlackoilModelEbos: make computeFluidInPlace() work unconditionally
...
i.e. it now works regardless of whether the cache for intensive
quatities is available or not.
2017-01-16 12:42:35 +01:00
Arne Morten Kvarving
f43bac8efa
some cosmetic updates
...
- remove whitespace at eol
- add function parameter documentation
2017-01-16 11:46:32 +01:00
Atgeirr Flø Rasmussen
7b17c7f1b6
Merge pull request #1024 from atgeirr/accept-missing-dims-keyword
...
Warn instead of throw when missing DIMS keyword.
2017-01-16 08:56:51 +01:00
babrodtk
9b91e2f20b
Added script to update opm-data references
2017-01-16 08:06:26 +01:00
Atgeirr Flø Rasmussen
1d918453c9
Warn instead of throw when missing DIMS keyword.
...
Default values will be used for parsing.
2017-01-13 11:07:02 +01:00
Atgeirr Flø Rasmussen
8534b82c2e
Merge pull request #1022 from atgeirr/silence-warning
...
Silence unused argument warning.
2017-01-13 09:26:46 +01:00
Atgeirr Flø Rasmussen
bc35b753b5
Merge pull request #1003 from blattms/merge-only-created-parallel-files
...
Only try to merge files from a parallel run if ouptput requested.
2017-01-12 17:00:12 +01:00
Atgeirr Flø Rasmussen
6ea858b6b9
Silence unused argument warning.
2017-01-12 15:35:13 +01:00
Atgeirr Flø Rasmussen
af3049b5a6
Merge pull request #1016 from andlaus/flow_ebos-remove-redundant-gravity
...
flow_ebos: remove the redundant gravity objects
2017-01-12 12:19:19 +01:00
Andreas Lauser
7a7ebc010f
flow_ebos: remove the redundant gravity objects
...
the canonical source is now the EclProblem object.
v2: don't change the API of the DerivedGeology class. thanks to
[at]atgeirr for noticing that this can be avoided.
2017-01-12 11:20:02 +01:00
Atgeirr Flø Rasmussen
0028b35e03
Merge pull request #1018 from andlaus/simplify_isParallel
...
simplify BlackoilModelEbos::isParallel()
2017-01-12 10:41:15 +01:00
Tor Harald Sandve
28bbe20344
Merge pull request #1012 from andlaus/cleanup_StandardWellsDense
...
small improvements to StandardWellsDense
2017-01-12 10:27:18 +01:00
Atgeirr Flø Rasmussen
af2c9a8200
Merge pull request #1015 from andlaus/flow_ebos-remove-redundancy
...
FlowMainEbos: remove the redundant pointer to the MaterialLawManager
2017-01-12 10:25:47 +01:00
Atgeirr Flø Rasmussen
eb8132453f
Merge pull request #1017 from andlaus/remove_allcells
...
SimulatorFullyImplicitBlackoilEbos: remove unused "allcells_" attribute
2017-01-12 09:59:41 +01:00
Atgeirr Flø Rasmussen
1406f7cf16
Merge pull request #1013 from andlaus/flow_ebos-no-SolutionState
...
BlackoilModelEbos: remove the last traces of "SolutionState"
2017-01-12 09:27:13 +01:00
Andreas Lauser
3a9146866a
simplify BlackoilModelEbos::isParallel()
2017-01-11 18:57:47 +01:00
Andreas Lauser
f808c5b681
SimulatorFullyImplicitBlackoilEbos: remove unused "allcells_" attribute
2017-01-11 18:53:06 +01:00
Andreas Lauser
8c76bf5b9b
FlowMainEbos: remove the redundant pointer to the MaterialLawManager
2017-01-11 17:16:46 +01:00
Andreas Lauser
f2115b44ac
BlackoilModelEbos: remove the last traces of "SolutionState"
...
it was not used for real for a while anyway.
2017-01-11 17:07:08 +01:00
Andreas Lauser
b324d17003
small improvements to StandardWellsDense
...
the most significant change is that only a "PhaseUsage" object must be
passed to its constructor instead of a full "fluid object". also, the
pointers to the vector of "active" phases has been converted into a
full object. (this helps to avoid potential use-after-free errors.)
2017-01-11 17:02:20 +01:00
Markus Blatt
aacbdb1777
Switch off non-owner entries during accumulation.
...
Previously entries attached to cells that are present
on multiply processes were acumulated several times.
2017-01-11 12:20:32 +01:00
Joakim Hove
4411712dce
Merge pull request #1008 from joakim-hove/correct-rsrv-dim
...
Fixed output units RS and RV.
2017-01-10 21:39:25 +01:00
Atgeirr Flø Rasmussen
cd9dcfc59d
Merge pull request #1007 from blattms/StandardWells-support-no-wells
...
Make StandardWells support cases with no wells.
2017-01-09 17:05:04 +01:00
Atgeirr Flø Rasmussen
1c594100c2
Merge pull request #1006 from blattms/ebos-fip-global-sum
...
Added missing global sum for FIP totals.
2017-01-09 17:04:50 +01:00
Atgeirr Flø Rasmussen
e225fdaf38
Merge pull request #1005 from blattms/unify-fip-totals
...
Fix unit conversion of fip totals (pav) again.
2017-01-09 17:04:25 +01:00
Joakim Hove
6b0626272d
Fixed output units RS and RV.
2017-01-09 16:20:19 +01:00
Markus Blatt
86209139db
Make StandardWells support cases with no wells.
...
Dense case was handled in PR #1002 . I was not aware that the same
regression was in the legacy code. wells_manager.c_wells() might return
a null pointer if there are no wells in the domain of a process.
2017-01-09 16:12:07 +01:00
Markus Blatt
7c91be92a9
Added missing global sum for FIP totals.
2017-01-09 15:55:39 +01:00
Markus Blatt
fb55aedf4b
Fix unit conversion of fip totals (pav) again.
...
This was (accidentally?) introduced in c880efae5b
(labelled
"mostly eliminate Eigen in the FIP and VFP code"). As it is neither
present in flow_ebos nor in flow_mpi and was previously removed in
ccec17f8
(labelled "Fixed missing unit conversion for total fluid in place")
I assume that this is a bug.
2017-01-09 15:31:40 +01:00
Atgeirr Flø Rasmussen
c292dd4975
Merge pull request #1004 from andlaus/fix_undefined_behaviour
...
avoid relying on undefined behaviour
2017-01-09 12:49:03 +01:00
Atgeirr Flø Rasmussen
fbad16aba7
Merge pull request #1001 from blattms/ebos-parallel-fip-total
...
Implement parallel fip total computation.
2017-01-09 12:33:43 +01:00
Atgeirr Flø Rasmussen
58acc49991
Merge pull request #1002 from blattms/StandardWellsDense-with-no-wells
...
Make StandardWellsDense support cases with no wells.
2017-01-09 12:33:37 +01:00
Markus Blatt
0a904deb02
Only try to merge files from a parallel run if ouptput requested.
...
If it is not requested then output_dir is not created and boost
will throw an exception if we try to read from a non existing
directory.
2017-01-09 12:09:49 +01:00
Andreas Lauser
12083ccfd0
BlackoilPropsAdFromDeck: don't rely on undefined behaviour when initializing the fluid system
...
in C++ references may be assumed to be non-null. thanks to
[at]atgeirr for pointing this out.
2017-01-09 12:08:29 +01:00
Andreas Lauser
f50dc9507f
fix a few pesky sign comparison warnings
...
the problem here is that some types used as the `BVector` template
parameters return signed integers for the `size()` method, others
return unsigned ones.
2017-01-09 12:05:32 +01:00
Markus Blatt
601dc77a37
Fix typo in exception message
2017-01-09 11:41:34 +01:00