OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 02:30:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,813 Commits 24 Branches 101 Tags 96 MiB
bc35ddf8bb
Commit Graph

4813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Markus Blatt
6b2c33978e Implement parallel fip total computation. 
Up to now parallel runs aborted due to an exception with
the message "FIP not yet implemented for MPI". With this
commit we do the computation in parallel, too. And flow_ebos
runs a bit longer...
 2017-01-09 11:40:57 +01:00
Markus Blatt
5bcdb01f5a Make StandardWellsDense support cases with no wells. 
In that case `wells_manager.c_wells()` returns a null pointer
which made `updateListEconLimited` segfault. With this commit
we treat a null wells_struct as having zero wells.

With this this and #1001 opm-data/equilibrium at least runs
through in parallel. Results will be checked next.
 2017-01-09 11:36:12 +01:00
Atgeirr Flø Rasmussen
86b71e7d48 Merge pull request #989 from jokva/read-rock-compressibility-from-eclipsestate 
RockCompressibility takes only EclipseState
 2017-01-09 09:33:41 +01:00
Atgeirr Flø Rasmussen
a7922ecfa1 Merge pull request #998 from totto82/fix_so_initialization 
Fix SOIL restart initialization
 2017-01-09 09:32:19 +01:00
Atgeirr Flø Rasmussen
9ba40520b8 Merge pull request #997 from andlaus/use_fluidsystem_in_blackoilpropsadfromdeck 
Use fluidsystem in blackoilpropsadfromdeck
 2017-01-06 22:14:33 +01:00
Tor Harald Sandve
5990201ee9 Fix SOIL restart initialization 2017-01-05 10:02:50 +01:00
Andreas Lauser
5fd83985a9 port the RateConverter to use the FluidSystem instead of the old fluid property API 
this makes the RateConverter stuff independent of Eigen and it
simplifies some things because the the old PVT API is designed as a
"bulk-with-derivatives" API while the rate converter code used it in
"single shot" mode without derivatives.
 2017-01-02 13:19:25 +01:00
Andreas Lauser
66decb4bda BlackoilPropsAdFromDeck: let the BlackOilFluidSystem manage the low level PVT objects 
this makes it easier to migrate code away from BlackoilPropsAdFromDeck.
 2017-01-02 13:19:25 +01:00
Andreas Lauser
ef731672c9 remove the BlackoilPropsAdInterface abstraction layer 
instead, directly use BlackoilPropsAdFromDeck.
 2017-01-02 13:19:23 +01:00
Atgeirr Flø Rasmussen
edf883e747 Merge pull request #996 from andlaus/no_eigen_in_VFP_and_FIP 
mostly eliminate Eigen in the FIP and VFP code
 2017-01-02 12:56:30 +01:00
Atgeirr Flø Rasmussen
d039fc6899 Merge pull request #994 from atgeirr/silence-ebos-warnings 
Silence warnings
 2017-01-02 09:36:04 +01:00
Atgeirr Flø Rasmussen
c3f93db74d Merge pull request #995 from andlaus/low_level_enums 
BlackoilModelEnums: don't use high-level classes
 2017-01-01 20:41:46 +01:00
Andreas Lauser
98b9e2ef58 remove the phase enums from BlackoilPropsAdInterface 
since the enums in BlackoilModelEnums.hpp are namespace-global this
does not require any code changes. (except replacing 'Liquid' by
'Oil', etc.)
 2016-12-30 14:15:14 +01:00
Andreas Lauser
fb770faca0 fix Dune 2.3 build issue 2016-12-30 11:46:27 +01:00
Andreas Lauser
c880efae5b mostly eliminate Eigen in the FIP and VFP code 
this code mostly used the Eigen vectors as arrays anyway, so let's use
`std::vector`.

also, this patch only "mostly eliminates" Eigen from from these parts
of the code because the source files of the VFP code still use
AutoDiffBlock; Unfortunately this cannot easily be changed because
`flow_legacy` depends on these methods. (`flow_ebos` does not use the
incriminating methods.)
 2016-12-30 11:46:27 +01:00