OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
671 Commits 31 Branches 117 Tags
7a4b8170108a2a61ef5144773343d0b656fc319d
Commit Graph
76 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve 38dd81ba7e Avoid output of trivial fipnum regions 2018-11-06 09:02:30 +01:00
Tor Harald Sandve 513b0b462f Add support for drsdtr and drvdtr 
This PR also adds possibility for schedule dependent drsdt values
 2018-11-05 13:50:44 +01:00
Tor Harald Sandve fad7c68446 Add support for region DR[SV]DTR 2018-11-05 13:40:23 +01:00
Tor Harald Sandve 3185e8662b Merge pull request #408 from andlaus/aquifer_api_v2 
extend the aquifer model so that it can initialize itself
 2018-10-31 12:47:54 +01:00
Tor Harald Sandve 656f055992 Blackoil: Prepare for 2p conditional storage of fluidstate 
Also fix pseudo 2p case for ebos
 2018-10-18 12:55:49 +02:00
Tor Harald Sandve 3a408619da add support for minpvv 2018-10-15 13:35:45 +02:00
Tor Harald Sandve 7ad5a4d29b Support modifying trans from deck 2018-10-15 12:36:22 +02:00
Tor Harald Sandve dcb1e96606 Output and read PPCW when SWATINIT is enabled 2018-09-11 14:57:32 +02:00
Tor Harald Sandve dbcfb7af24 Return modified ntg's only when minpv mode is OPMFIL 2018-09-07 09:09:03 +02:00
Tor Harald Sandve 95578a5d79 Fix thpress restart 
THPRES is read from the restart file
We no longer need to compute it from the initial conditions if
defaulted.
 2018-06-29 15:26:08 +02:00
Tor Harald Sandve 22d144c3cd rename completion to connection 2018-06-28 15:49:45 +02:00
Tor Harald Sandve 98c2b03667 change ecl output name from SSOL to SSOLVENT 2018-05-09 14:52:43 +02:00
Tor Harald Sandve 91139efa27 Merge pull request #311 from andlaus/fixes 
ebos fix and compiler workaround
 2018-04-13 13:53:43 +02:00
Tor Harald Sandve a697b523a3 Merge pull request #310 from andlaus/update_changelog 
Update changelog
 2018-04-13 10:46:26 +02:00
Tor Harald Sandve 6a1f7c8006 BUGfix enableEclOutput false 2018-03-05 14:56:48 +01:00
Tor Harald Sandve d15a86b039 clean up 2018-02-21 10:41:27 +01:00
Tor Harald Sandve 9372f9d2ca Make sure the updateMaxOilSaturation_ is called 
The order of operation is left-to-right.
 2018-02-21 10:38:52 +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 f90e074947 Demand the hystereris values if enalbed. 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 998a6339cb Rename test_ecl_output.cpp -> test_ecl_output.cc 2018-02-19 13:18:56 +01:00
Tor Harald Sandve 3ede6ecc69 Rename ThreadHandle.hpp -> threadHandle.hh 
Also adding some comments.
 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
Tor Harald Sandve 27beb2faec Fix default output directory 
Get default ecl output directory from IOConfig.
 2018-02-19 13:16:49 +01:00
Tor Harald Sandve d3cb81a7ba Minor clean-up based on review 2018-02-05 14:24:11 +01:00
Tor Harald Sandve 154e4fd97a Obey the input given by the deck. 
Don't try to make the initial condition consistent for explicitly given
initial values.
 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 7ed66f0cf2 pass the mcmg element layout as a parameter for dune 2.6 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 5fa7b130dc Output double precision restart output if asked for 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
Tor Harald Sandve de3df0d81d Clean up PR review 2018-02-05 14:24:11 +01:00
Tor Harald Sandve f62498440d Add FIP, INIT and EGRID output 
Writes INIT and EGRID files initially
Adds Fip to summary output if required.
Output Fip to log (.PRT) if Opm-logger is set
 2018-02-05 14:24:11 +01:00
Tor Harald Sandve f0ee6df136 Only compute auxiliary values if asked for 
Ask the restartConfig if restart files are written. Solution variables are
always written since they may be needed by the summary files

Remove output of saturated data to align with legacy code.
 2018-01-09 14:01:30 +01:00
Tor Harald Sandve abd3271f1c Only collect to globalData for mpi 2018-01-09 13:08:05 +01:00
Tor Harald Sandve 1969c3711d Move instead of copy data to solution vector 2018-01-09 11:28:20 +01:00
Tor Harald Sandve 0132c3326e Add ecl output from opm-output 
The new eclwriter output and restart using the eclIO from opm-output

All tests in opm-simulator pass and
MPI restart works.

Standard initialization is done prior to restart in order
to compute correct initial thpressure values. This is not
necessary if thpressures are written to the restart file

TODO: Some trivial fields are written out in order mimic legacy code,
this should be cleaned up

TODO: Output of wells, FIP, NNC is still done in opm-simulators.
This should be moved later.
 2018-01-09 11:05:50 +01:00
Tor Harald Sandve 9192380308 Add support for PBDV and PDDV in initstateequil.hh 2018-01-09 10:42:04 +01:00
Tor Harald Sandve f6f2a78a6c Fix pvtIndex map for cases with non-active eqlnum regions. 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 30192eac03 Fix 2p bug 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 07c2cad36c Adress PR review issues 2018-01-02 14:28:06 +01:00
Tor Harald Sandve d27c43bf61 Cleaning the initialization code 
-remove whitespaces
-fix documentation
 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 2ce881e2e7 Use &ref not shared_pointer to MaterialLawManager 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 4f915d116f Remove blackoilPhases and phaseUsage from the initialization code 
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 8efc60957a Remove BlackoilProps from equil initalization code 
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 9265e12e0e Do not extrapolate initial rs and rv values in the depth tables 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 39cb5e9ba6 Do not set rs=rsSat and rv=rvSat for the saturated case 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 09713fd7f8 Make it optinal to apply SWATINIT 
The reasoning behind this to make it possible to initialize the case
without SWATINIT in order to compute the same defaulted THPRES values as
Ecl. The initialization needs to be re-computed to account for SWATINIT
in the simulations.
 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 4220bb2615 Fix two phase EQUIL initialization 2018-01-02 14:28:06 +01:00
Tor Harald Sandve f528dae86f Use cell depths based on averaging cell corners 2018-01-02 14:28:06 +01:00
Tor Harald Sandve cfb7be332c Change the number of integration points in the initialization 
The number is changed from 100->2000 to increase accuracy.
 2018-01-02 14:28:06 +01:00
Tor Harald Sandve 321af5ff4d Start using the BlackoilFluidState 2017-12-15 08:20:09 +01:00
Tor Harald Sandve 8ac306b50a Prepare flow for ebos initialization 
Apply swatInit in the initialization
Stop using the equilGrid in the initialization code
Keep The initialFluidState until end of first time step to make it
possible for flow to output it.
 2017-11-30 09:30:26 +01:00
Tor Harald Sandve c979ba1f95 Communicate the default thpress 2017-11-29 16:02:18 +01:00
Tor Harald Sandve 2070247244 Avoid shared pointe for MaterialLawManager 2017-11-21 13:28:53 +01:00
Tor Harald Sandve 5a9123c1b1 Use the Equil initializer directly 
Do not relay on opm-core objects like phaseUsage and BlackoilState but
instead use the initializer directly.
 2017-11-21 13:28:53 +01:00
Tor Harald Sandve 195209982e Add support for PLMIXNUM 
also fix some issues with the MISCNUM
 2017-06-21 10:27:25 +02:00
Tor Harald Sandve ecae9d3a78 Address comments frow the review. 2017-06-21 08:03:44 +02:00
Tor Harald Sandve 3dd7fd0b3a Add polymer model to ebos 
Adds a conservation equation for polymer.
Polymer concentration in the water phase is used as primary variable
The polymer influences the viscosity of the water, and leaves gas and oil
uneffected.

A shear multiplier is computed if PLYSHLOG and/or SHRATE is specified
based on either velocity or shrate.
The shear multiplier effects the water and polymer viscosity.

Tested and verified on the test cases in polymer_test_suite
 2017-06-21 08:00:31 +02:00
Tor Harald Sandve f14ea0e3af Add support for miscible solvent runs 
- initialization only via Ecl Deck
- adds modification of relperms and cap-pressures for miscible runs
- adds TL mixing model for effective viscosity and density calculations

Tested on SPE1CASE2_SOLVENT_MISC_TL, SPE9_CP_CO2_MISC_TL, SPE5CASE1-3
and SPE3CASE1_SOLVENT_MISC
 2017-05-24 10:52:04 +02:00
Tor Harald Sandve a5858393c6 Avoid negative indicies in minPvFillNtg_ 2017-05-23 15:48:35 +02:00
Tor Harald Sandve 64feefaf05 Fix minpvProps calculations 2017-05-15 13:49:13 +02:00
Tor Harald Sandve 5fb005d87b Use volume weighted arithmetic average of NTG for cells merged by minpv. 
This is a big hack to make the TRAN[X,Y] like flow_legacy and a bit more
like Eclipse.
 2017-05-12 13:01:07 +02:00
Tor Harald Sandve ef9966b188 Start using face geometry computed the Ecl way 
Face centers are computed using the cell corners. With this
implementation the face center seen from a cell may be different from the
face center seen from its neighbour.

Face normals with area lenghts are calculated using the face corners
directly not using a triangulation point in the center of the face.

This gives transmissibility almost equal to eclipse.
 2017-01-19 08:57:44 +01:00
Tor Harald Sandve 0dbbfbd8a6 Don't include connections with negligible flow in thpress caclulations 2017-01-02 16:03:19 +01:00
Tor Harald Sandve ef3de796bc Pass enableSwatinit to the OPM initialisation 
Only apply swatinit in the initialization if Swatinit is enabled.
 2017-01-02 14:27:14 +01:00