OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 17:32:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,933 Commits 31 Branches 117 Tags
f54db0f7f6631d59abc9c2a87eff89e16dbe620b
Commit Graph
3933 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
babrodtk f54db0f7f6 Removed need for extra constructor in CellData 2016-09-07 14:59:16 +02:00
babrodtk 17d171fae6 Fixed erroneous unit for b 2016-09-07 14:59:16 +02:00
babrodtk 332d1bb318 Removed special case handling of ALLPROPS keyword 2016-09-07 14:59:16 +02:00
babrodtk 0b24dffe05 Fixed unit for bw/bo/bg in output 2016-09-07 14:59:16 +02:00
babrodtk eb56ecab12 Refactored the logic of writing without cell properties 2016-09-07 14:59:16 +02:00
babrodtk 739976535f Added rs and rv output capabilities 2016-09-07 14:55:53 +02:00
babrodtk 40b2b95d87 Extended the support for keywords for restart file output 2016-09-07 14:55:53 +02:00
babrodtk 35bed24465 Initial version for outputting cell data 2016-09-07 14:55:53 +02:00
Atgeirr Flø Rasmussen 4d2d004c43 Merge pull request #769 from blattms/fix-step-used-by-parallel-io 
Fix step number used by parallel io and OutputWriter::writeTimeStep
 2016-09-07 14:09:56 +02:00
Atgeirr Flø Rasmussen ff09dbef71 Merge pull request #811 from atgeirr/remove-unneeded-include 
Remove unused include.
 2016-09-07 13:54:23 +02:00
Atgeirr Flø Rasmussen be8f8b479f Merge pull request #773 from blattms/honor-unordered_map-in-simulationdatacontainer-when-gathering-data 
Do not assume ordering in an unordered_map when gathering data.
 2016-09-07 13:52:08 +02:00
Atgeirr Flø Rasmussen 68a0d3796b Remove unused include. 2016-09-07 12:53:19 +02:00
Atgeirr Flø Rasmussen 98ec930a25 Merge pull request #770 from blattms/call-writeInit-before-distributing-grid 
Call writeInit with global grid and properties.
 2016-09-07 11:29:19 +02:00
Joakim Hove d7e054cbfa Merge pull request #804 from joakim-hove/remove-shared-ptr 
shared_ptr<EclipseGrid> -> const EclipseGrid&
 2016-09-07 11:12:29 +02:00
Atgeirr Flø Rasmussen f78155fe23 Merge pull request #808 from qilicun/fix-pav 
Correct the formulation for PAV calculations.
 2016-09-07 08:52:18 +02:00
Liu Ming 4b88d4edd1 use PV weighted pressure when HCPV is zero. 2016-09-07 14:00:30 +08:00
Liu Ming d5b4194a0e format fIP output for field units and check the phase is present or not. 2016-09-06 09:33:41 +08:00
Liu Ming 170607e60c check if the phase is present. 2016-09-05 16:14:27 +08:00
Liu Ming 1943978dbd update PAV formulation. 2016-09-05 10:38:57 +08:00
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
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
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