OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-11 17:01:55 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,368 Commits 24 Branches 102 Tags 88 MiB
0a1210a392
Commit Graph

161 Commits

Author SHA1 Message Date
Joakim Hove
e962374856 Pass the initial inplace values to Summary::eval() 2020-11-20 10:02:16 +01:00
Joakim Hove
6084f7c4d4 Use class Inplace to manage aggregated region properties in output 2020-11-19 11:38:18 +01:00
Ove Sævareid
98b2ed5bd4 Cleaning up various issues. 2020-11-17 12:39:21 +01:00
Ove Sævareid
0f7e66e151 Alternative solvent extension for the black oil model. 2020-11-17 12:33:19 +01:00
Joakim Hove
cddc8044b3 Change output name of Region Pore Volume 2020-11-13 08:21:22 +01:00
Bård Skaflestad
362c84a01c
Merge pull request #2798 from totto82/outputTemperature 
output temperature when TEMP is set
 2020-09-24 22:06:20 +02:00
Markus Blatt
1d94357558 Refactored how well information is exported after load balancing. 
Previously, we exported an unordered map containing all names of
wells that are not present in the local part of the grid.

As we envision to have wells that are distributed across multiple
processors, this information does not seem to be enough. We need
to be able to set up communication for each well. To do this we need
to find out who handles perforations of each well.

We now export a full list of well name together with a boolean
indicating whether it perforates local cells (vector of pair of string
and bool).
 2020-09-22 20:04:01 +02:00
Tor Harald Sandve
ae95570693 output temperature when TEMP is set 2020-09-21 15:35:55 +02:00
Bård Skaflestad
79f2908277
Merge pull request #2782 from totto82/fixOilWater 
Fix oil water for MSW
 2020-09-14 20:00:09 +02:00
Bård Skaflestad
e4878addb4
Merge pull request #2727 from totto82/fixUnitSalt 
fix output unit salt
 2020-09-14 15:46:11 +02:00
Tor Harald Sandve
bcc0a1be69 only output connection saturation for existing phases 2020-09-14 14:44:16 +02:00
Joakim Hove
4be8240771 Support alternate FIPxxx regions in region summary keywords 
As part of support the RPR__xxx summary keywords the ecloutputblackoilmodule.hh
file hase been refactored significantly:

 - std::optional<> is used to manage the calculate once initial values.

 - several small functions are extracted from the outputFipLog() function.

 - std::array<> is used instead of ScalarBuffer to manage containers over all
   FipTypes.

 - SummaryConfig nodes for the requested summary output is stored in the class.

 - A small struct RegionSum is created to hold the region summed properties.
 2020-09-14 11:09:37 +02:00
Tor Harald Sandve
a32f6bbfa8 fix output unit salt 2020-09-14 08:40:24 +02:00
Joakim Hove
03852825d5 White space change 2020-09-10 13:53:39 +02:00
Markus Blatt
ee6044b2e0 Fixes determining whether index of summary keyword is on process. 
We used a method isGlobalIdxOnThisRank to determine whether to write
an entry for a summary keyword (like BPR). Unfortunately, this did
exactly what the name suggested, but we actually passed a cartesian
index to it. That meant that a lower cartesian index might have found on
many processes (with different cartesian index and hence resulting in
wrong values), while higher for ones no process would have been found
with it (resulting in writing zeros).

With this commit we store a sorted list of cartesian indices and query
that in the renamed and restructured function isCartesianidxOnThisRank.

Most probably this broke during refactoring.

Closes #2665
 2020-09-08 20:44:27 +02:00
Arne Morten Kvarving
93a3ebf8f7 changed: remove NEW_PROP_TAG macro usage 2020-08-28 10:44:53 +02:00
Arne Morten Kvarving
0e71c0e29b changed: remove SET_BOOL_PROP macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
e8248b44ff changed: remove NEW_TYPE_TAG macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
914053ac3c changed: remove GET_PROP_VALUE macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
74fac38d85 changed: remove GET_PROP_TYPE / GET_PROP macro usage 2020-08-27 08:19:39 +02:00
Arne Morten Kvarving
70908d9017 changed: remove BEGIN_PROPERTIES/END_PROPERTIES macro usage 2020-08-21 15:50:35 +02:00
Bård Skaflestad
8c8635d221 Cell Data: Don't Warn About Supported Output Directives 
This commit ensures that we don't issue misleading warning about
output creation directives such as

    BASIC
    FREQ
    RESTART

that could be, and typically are, put into keywords like RPTRST and
RPTSCHED.  Previously, we would interpret these directives as names
of cell vectors and we would get very confusing diagnostic messages
of the form

    Keyword 'BASIC' is unhandled for output to file

which suggests that 'BASIC' is unsupported despite the output system
supporting the directive for quite some time.  While here, also
apply the same reasoning to the vectors we always output such as
SWAT, SGAS, or PRESSURE.
 2020-07-28 13:36:25 +02:00
Arne Morten Kvarving
654fae05a4 adjust for SummaryNode -> SummaryConfigNode rename 2020-03-13 15:56:33 +01:00
Joakim Hove
93964b2fa8
Merge pull request #2389 from joakim-hove/move-wellinjector-enum 
InjectorType enum is moved out from Well class
 2020-03-03 16:36:40 +01:00
Joakim Hove
9268bcb2ac InjectorType enum is moved out from Well class 2020-03-03 09:08:02 +01:00
Arne Morten Kvarving
5a9340b5b1 use compressed field property for fipnum 2020-03-03 08:40:48 +01:00
Arne Morten Kvarving
4904f09d4d changed: avoid use of EclipseGrid outputting RFT data 2020-02-28 10:24:00 +01:00
Joakim Hove
5ad4936025 RestartConfig has moved from EclipseState to Schedule 2020-02-17 21:48:12 +01:00
Joakim Hove
0e9535319b
Simulate with only active cells (#2213) 
Use FieldProps implementation for 3D properties
 2020-01-13 15:46:50 +01:00
Trine S. Mykkeltvedt
99e7785fb5 renamed saltwater-->brine and removed keywords from missingFeatures 2020-01-09 14:14:38 +01:00
Trine S. Mykkeltvedt
5749615bd8 addd simple salt/brine implementation 2020-01-09 14:14:38 +01:00
Joakim Hove
fce5d2f369 Rename Well2 -> Well and Group2 -> Group 2019-11-13 23:18:01 +01:00
Cintia Goncalves Machado
003fa994db
Update ecloutputblackoilmodule.hh 2019-11-06 13:25:04 +01:00
goncalvesmachadoc
8efae16087 çonverted tabs to spaces 2019-11-01 12:56:20 +01:00
goncalvesmachadoc
9982ddf3fb fix 2019-10-30 17:51:49 +01:00
goncalvesmachadoc
2082641074 fix 2019-10-30 15:27:41 +01:00
goncalvesmachadoc
6f2adff3d7 added groups to reports 2019-10-30 14:09:51 +01:00
goncalvesmachadoc
03433997b9 Changes revised by Bard 2019-10-29 11:46:26 +01:00
goncalvesmachadoc
18b5ad2bf8 changed as revised by OPMUsers 2019-10-26 13:13:44 +02:00
Tor Harald Sandve
cf7c8552a5 Always allocate buffers when restarting 2019-10-18 09:07:06 +02:00
Halvor M. Nilsen
d873ae165d Enable single-phase runs. 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen
96af6ca5f0
Merge pull request #2023 from totto82/fix_solvent_restart 
Fix solvent restart
 2019-10-01 15:35:22 +02:00
Tor Harald Sandve
afba6c8e8e Fix solvent restart 2019-10-01 13:07:29 +02:00
Bård Skaflestad
d979fb0fae Blackoil Output: Chase API Change in SummaryNode Class 
In particular, the .type() function is renamed to .category(), and
it no longer returns a LibECL type.  Similarly, the .num() function
has been renamed to .number().
 2019-09-30 15:00:05 +02:00
Bård Skaflestad
fabc067b5e Blackoil Output: Don't Include "eclwriter.hh" 
The EclWriter class depends on the EclOutputBlackOilModule, not the
other way around.  This removes a cyclic include.
 2019-09-30 14:47:50 +02:00
Arne Morten Kvarving
d3d9831fc3 changed: ewoms/common -> opm/models/utils 2019-09-19 11:14:36 +02:00
Arne Morten Kvarving
7048589ec1 changed: ewoms/models/blackoil -> opm/models/blackoil 2019-09-19 11:12:45 +02:00
Arne Morten Kvarving
5599bb6d8c changed: namespace Ewoms -> namespace Opm 2019-09-05 17:14:38 +02:00
Atgeirr Flø Rasmussen
12032203b3 Improve out-of-range check for extra components. 2019-08-07 12:03:43 +02:00
Franz G. Fuchs
7fb90bff47 Use foam module. 2019-08-07 10:39:16 +02:00
Andreas Lauser
18d989c394 ebos: replace tabs with spaces and remove trailing white space 
for some reason this keeps creping back in...
 2019-06-03 11:11:41 +02:00
Tor Harald Sandve
e8db16554f Fix FPRP output 2019-05-27 11:24:55 +02:00
Bård Skaflestad
a618a1a777
Merge pull request #1857 from totto82/fix_fip_seg_fault 
fix typo in fip output
 2019-05-23 10:38:07 +02:00
Joakim Hove
b6840db604 Use new well implementation Well2 from opm-common 2019-05-22 21:47:45 +02:00
Tor Harald Sandve
dbf7efa6cb fix typo in fip output 2019-05-22 15:39:57 +02:00
Jostein Alvestad
38265ead52 Have rerwritten the code in a more compact and logical form 2019-05-14 09:31:18 +02:00
Jostein Alvestad
9d5e55180a Added corrections to cancel unintended changes to code 2019-05-14 09:31:17 +02:00
Jostein Alvestad
45e0773edd changes to provide Summary data output of additional block variables 
Provide output data for:
    BOSAT
    BWKR
    BOKR
    BKRO
    BGKR
    BKRG
    BKRW
    BWPC
    BGPC
    BVWAT
    BWVIS
    BVGAS
    BGVIS
    BVOIL
    BOVIS
 2019-05-14 09:31:16 +02:00
Tor Harald Sandve
890d34a9e1 Add support for water induced compaction using 
ROCKCOMP, ROCK2D, ROCK2DTR, ROCKWNOD and OVERBURD
 2019-05-07 13:17:29 +02:00
Joakim Hove
c9dcfc8be0 Use RFTConfig() object to query for RFT active wells 2019-04-04 07:27:39 +02:00
Markus Blatt
831f41c0e3 Cater for empty fipnum vectors in output code. 
Due to loadbalancing this vector might be empty under some circumstances.
Hence the old code would dereference the end iterator which is a bug.
 2019-03-22 15:14:08 +01:00
Andreas Lauser
9afa62b78b fix some minor coding style issues in Ewoms::EclOutputBlackOilModule 2019-02-01 17:33:30 +01:00
Tor Harald Sandve
ee7b47e0f9 convert FIP values to LAB scale 2019-01-21 14:55:40 +01:00
Andreas Lauser
af0d02b03d use enableEnergy consistently 
thanks to [at]totto82 for noticing.
 2018-12-21 10:07:58 +01:00
Andreas Lauser
6a29318adf ebos: only write out temperature in thermal runs 2018-12-17 11:37:47 +01:00
Markus Blatt
84acf3965f Do not log messages during getWriteRestartFile query on all procs. 
Previously all processes reported
Warning: Fast restart using SAVE is not supported. Standard restart file is written instead.
Now this is done only on the master process where logging is activated.
 2018-12-07 15:56:45 +01:00
Trine S Mykkeltvedt
ac931d1713 Add ecl tracer model 
reads tracer input from deck, solves tracer equation fully implicit as a post processing step in endTimeStep

tested on a simple modified SPE1CASE1 deck and compared with eclipse

TODO: restart and parallel
 2018-11-19 13:46:10 +01:00
Tor Harald Sandve
38dd81ba7e Avoid output of trivial fipnum regions 2018-11-06 09:02:30 +01:00
Andreas Lauser
f03711aff6 replace tabs by spaces 
for whatever reason a few tabulator characters crept in...
 2018-10-29 10:05:46 +01:00
Tor Harald Sandve
dcb1e96606 Output and read PPCW when SWATINIT is enabled 2018-09-11 14:57:32 +02:00
Joakim Hove
621028f6e6 Store capillary pressure in SOLUTION section 2018-09-04 14:14:48 +02:00
Andreas Lauser
ef845bb4f4 ebos: add possibility to disable the FIP output even if requested in the deck 
this significantly reduces the noise level of debug files if the FIP
values are not of interest.
 2018-07-26 12:31:32 +02:00
Andreas Lauser
29e113f1fd ebos: get rid of HAVE_ECL_{IN,OUT}PUT 
there are about a trillion places within ebos where the availability
of the ECL I/O routines is hardcoded, so it does not make sense to
pretent that the EclWriter can be useful without them.

(in fact, ebos is deactivated at build system level if the ECL I/O
routines have not been detected.)
 2018-07-12 13:47:01 +02:00
Tor Harald Sandve
22d144c3cd rename completion to connection 2018-06-28 15:49:45 +02:00
Andreas Lauser
26e6d56930 do explicit put properties into the the Ewoms::Properties namespace anymore 
instead, do it implicitly by using the BEGIN_PROPERTIES and
END_PROPERTIES macros.
 2018-06-15 20:22:07 +02:00
Joakim Hove
2bd9c0ea78 Rename Completions -> Connections 2018-06-11 14:11:32 +02:00
Tor Harald Sandve
98c2b03667 change ecl output name from SSOL to SSOLVENT 2018-05-09 14:52:43 +02:00
Andreas Lauser
a53ef08699 ecloutputblackoilmodule.hh: adapt coding style to the rest of eWoms 
the style was mostly fine, but there were a few leftovers from the
pre-eWoms epoch of that code.
 2018-04-30 19:06:07 +02:00
Andreas Lauser
5f8fdb2324 make all headers fully autonomous again 2018-03-12 14:31:37 +01:00
Arne Morten Kvarving
a1601afd21 adjustments for eclipse support in opm-common 2018-03-06 09:09:17 +01:00
Andreas Lauser
21cce7514e fix a few "unused variable" warnings that occur on more uncommon compilers 
i.e. on ICC. the compiler is right in producing warnings here, though.
 2018-03-03 13:27:48 +01:00
Tor Harald Sandve
44ab370fae Make the restart code more robust. 
Don't assume all needed data is given in the restart file.
i.e. make it possible to run a solvent restart run from a standard
blackoil run.
 2018-02-21 10:38:52 +01:00
Tor Harald Sandve
b89a960a50 Fix bug in setting the max oil saturation after restart 2018-02-21 10:38:52 +01:00
Tor Harald Sandve
afe26e8f12 Split the PackUnPack class 
into PackUnPackBlockData, PackUnPackCellData and PackUnPackWellData
 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
76edfa7789 clean up after rebase 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
932527d772 Pass RFT output via data::well 
With this no cell data is used by the output code in opm-output
 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
bbe2ae4a7b fix rebase failure 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
56bcb419fb Add async output 2018-02-19 13:18:56 +01:00
Andreas Lauser
436c9f8791 rename the "grid manager" to "vanguard" 
IMO the term "vanguard" expresses better what these classes are
supposed to do: level the ground for the cavalry. Normally this simply
means to create and distribute a grid object, but it can become quite
a bit more complicated, as exemplified by the vanguard classes of
ebos..
 2018-02-08 16:26:58 +01:00
Andreas Lauser
260d62c2b8 adapt to the move of code from opm-common to opm-material 2018-02-08 12:11:20 +01:00
Tor Harald Sandve
d3cb81a7ba Minor clean-up based on review 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
fb27ebd4eb Add output of temperature 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
d771810562 Some more minor clean-up 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
af7d031875 Minor clean-up after review 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
51c1201fa6 Fix bug in pv output 
Output current not orignal pore volumes
 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
eca5d8aff5 Fix slow code 
Avoid checking summaryConfig at every cell
Add temporary fix around issue with RPTSCHED in restartConfig
 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
b021ee54ca Some clean-up 
Dont' output rs, rv, somax and hysteresis if they are not enabled.
We no longer output the same as legacy.
 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
85ed4bffbf Pass block values to OPM-output 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
2264b44f38 Pass region and field FIP to opm-output 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
5d5c6bad75 Fix parallel restart and pav in water zone 2018-02-05 14:24:11 +01:00