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,299 Commits 24 Branches 102 Tags 90 MiB
621a72bb25
Commit Graph

4299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
983c7d9957 Merge pull request #787 from totto82/fix_minpv_actnum 
BUGFIX. Correctly handle ACTNUM in minPvFillProps_()
 2016-09-02 15:17:28 +02:00
Markus Blatt
4a6be3d33b Fix step number used to create global well state in parallel output. 
When running in parallel a well state object with the well information
of the whole grid needs to constructed to gather the information from all
processes. Previously, this was done with the report step exported by the
timer. This was wrong for the following reason:
The output occurs after solving the time step and the timer is already
incremented. This means that we constructed the well state for gathering the
data for the next report step, already. Unfortunately, at that step some
wells that we have computed results for might have been shut. In that case
an exception with message "global state does not contain well ..." was thrown.

This problem occured for Model number 2 and might have been due to shut wells
because of banned cross flow.

With this commit we use the last report step if this is not an initial write
and not a substep.
 2016-09-02 14:41:47 +02:00
Markus Blatt
5ecead8e6f OutputWriter::writeTimeStep needs the report step and not the sub step. 
At least that is what is documented.
 2016-09-02 14:41:47 +02:00
Liu Ming
c5a490c75a fix typo. 2016-09-02 16:58:42 +08:00
Liu Ming
490dbbf133 correct the formulation for PAV calculations. 2016-09-02 16:53:39 +08:00
Joakim Hove
10d76d5bb1 shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-08-31 19:39:39 +02:00
Atgeirr Flø Rasmussen
5f1bcb2a59 Merge pull request #802 from atgeirr/qilicun-fip-support 
Output total fluid in place
 2016-08-31 08:49:35 +02:00
Atgeirr Flø Rasmussen
b5e986df5f Remove well state argument from computeFluidInPlace(). 2016-08-30 13:34:18 +02:00
Atgeirr Flø Rasmussen
a2001ca2e1 Avoid variable shadowing. 2016-08-30 13:33:50 +02:00
Atgeirr Flø Rasmussen
69812fddd2 Remove unnecessary override of computeFluidInPlace(). 
It also called itself, causing infinite recursion.
 2016-08-30 13:18:54 +02:00
Atgeirr Flø Rasmussen
61af1fa53d Remove unused nnc arg from BlackoilOutputWriter constructor. 2016-08-30 13:18:06 +02:00
Liu Ming
46b0ef635b fix typo. 2016-08-30 10:30:26 +02:00
Liu Ming
a1bf3769fe format fip output. 2016-08-30 10:30:26 +02:00
Liu Ming
c9c7a5c744 compute hydrocarbon weighted pore voulme pressue and pv for fip regions. 2016-08-30 10:30:26 +02:00
Liu Ming
2ac3306c18 drop the for loop over fip regions. 2016-08-30 10:30:26 +02:00
Liu Ming
a492a60a64 document computeFluidInPlace function. 2016-08-30 10:30:26 +02:00
Liu Ming
b2432c871f fix typo. 2016-08-30 10:30:25 +02:00
Liu Ming
aa96931f69 use a separate function to output fip and compress fipnum from eclipseState. 2016-08-30 10:30:25 +02:00
Liu Ming
59a2668152 compute different fip regions. 2016-08-30 10:30:25 +02:00
Liu Ming
7c3148c1f3 get cell FIPNUM values. 2016-08-30 10:30:25 +02:00
Liu Ming
90086f690e only compute field fluid in place. 2016-08-30 10:30:25 +02:00
Liu Ming
056708574c compute fluid in place by regions. 2016-08-30 10:30:25 +02:00
Liu Ming
28583e4237 Add computeFluidInPlace function. 2016-08-30 10:30:25 +02:00
Liu Ming
78a5381f5d output water and gas fluid in place. 2016-08-30 10:29:24 +02:00
Liu Ming
148038939d add computeFIP method. 2016-08-30 10:29:24 +02:00
Atgeirr Flø Rasmussen
379bd967e1 Merge pull request #801 from qilicun/update-missing-keyword-list 
NOSIM is supported, should remove from the list.
 2016-08-29 08:30:09 +02:00
Liu Ming
60fd4add69 NOSIM is supported, should remove from the list. 2016-08-29 09:34:04 +08:00
Andreas Lauser
1d2a5d7f1b fix the headers 
remove the now unnecessary inclusion of
"NewtonIterationBlackoilInterleaved.cpp" (mind the .cpp extension!)
and include "dune/istl/solvers.hh" instead.
 2016-08-28 15:48:18 +02:00
Andreas Lauser
75d99fa335 Merge pull request #6 from totto82/reorg_wells 
Remove usage of ADB and the residual struct.
 2016-08-28 15:47:43 +02:00
Andreas Lauser
49f13e6664 Merge remote-tracking branch 'origin/master' into frankenstein 2016-08-28 15:36:11 +02:00
Tor Harald Sandve
bfddaa3402 Merge pull request #1 from dr-robertk/ebos_restruct 
make code compile and run.
 2016-08-26 12:34:10 +02:00
Robert Kloefkorn
b092b2504c make code compile and run. 2016-08-26 11:54:59 +02:00
Tor Harald Sandve
699a0ede01 Remove remaning usage of ADBs 
-- the code is still kept for comparison
 2016-08-26 10:55:09 +02:00
Tor Harald Sandve
190076f5da Temperary commit 
-- works on SPE1 but not SPE9
-- if number of perforations are increased to 3 in SPE1 the same error
as in SPE9 occur.
 2016-08-25 15:25:01 +02:00
Arne Morten Kvarving
a563360e74 Merge pull request #798 from akva2/add_multiconfiguration 
add multiconfiguration support to jenkins build script
 2016-08-24 16:02:21 +02:00
Arne Morten Kvarving
4f779b7a01 add multiconfiguration support to jenkins build script 
also unifies build.sh and build-pr.sh and gets rid of
build-opm-simulators.sh
 2016-08-23 14:26:06 +02:00
Joakim Hove
5602e654c3 Merge pull request #795 from joakim-hove/arg-reorder 
Illustrate support of properties like KRW and FLUX in restart file.
 2016-08-23 11:30:36 +02:00
Tor Harald Sandve
4bdf74eb11 Reorganize the wellModel 
- All well-related stuff is moved to StandardWellsDense.hpp
- Some unused functions are removed from BlackoilModelEbos.hpp
 2016-08-23 09:58:21 +02:00
Atgeirr Flø Rasmussen
183d2f4477 Merge pull request #762 from qilicun/messages-for-keywords-options 
Handle partially supported options manually.
 2016-08-23 08:07:29 +02:00
Joakim Hove
71491cac6c Merge pull request #796 from akva2/simplify_after_ert_reorg 
simplify jenkins build scripts after ert reorganization
 2016-08-22 17:29:40 +02:00
Arne Morten Kvarving
cd822bc714 simplify jenkins build scripts after ert reorganization 2016-08-22 13:57:32 +02:00
Liu Ming
95ab7038ea Rename addUnsupported to addSupported. 2016-08-22 16:14:37 +08:00
Joakim Hove
0f7c9f4b97 Added optional simProps argument to restart. 2016-08-20 20:10:50 +02:00
Joakim Hove
56a7775fee Changed order of arguments to match opm-output. 2016-08-20 20:09:56 +02:00
Andreas Lauser
1415168729 Merge pull request #5 from totto82/dense_well 
WIP New well model
 2016-08-19 14:19:08 +02:00
Tor Harald Sandve
b023cb15a5 Reset wellcontrols from well_state 2016-08-19 13:50:27 +02:00
Tor Harald Sandve
cd76816ea5 Stay in sync with changes in restartWriter in the eclipseState 2016-08-19 10:30:49 +02:00
Tor Harald Sandve
0c9c5a031f Add copy constructure and operator to WellStateFullyImplicitBlackoil 2016-08-19 10:28:54 +02:00
Tor Harald Sandve
f60e26faf7 Minor convergence improvments 
- set current control when initializing the wellstate
- re calculate wellVariable after well control has changed.
 2016-08-18 12:23:46 +02:00
Tor Harald Sandve
49f478480d Remove usage of state in the model 
1) The wellsolution is stored in wellVariables as a vector of DenseAD
objects. The wellVariables is computed from the wellstate  in
setWellVariables()
2) BHP and well fluxes are not stored directly but calculated based on
the wellVariables
3) The initial well accumulation term is stored as a vector of doubles.
4) addWellFluxEq() uses DenseAd flux and accumulation terms
5) computePropertiesForWellConnectionPressures() no longer uses state as
input. The wellstate is used to get the bhp pressure.
6) The current wellcontrol is set when updated in updateWellControls()
in order to use well_controls_get_current_type(wc) insted of
well_controls_iget_type(wc, currentIdx)

Tested on SPE1, SPE9 and Norne.
Effects the convergence but the results are identical.
 2016-08-18 12:23:46 +02:00