OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
12,425 Commits 31 Branches 117 Tags
f980ff5f777f47f55fda6dfc0765b90ff4fffac4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao 24d5d73009 cleaning up comments 
There is no functional change.
 2021-03-15 21:15:56 +01:00
Kai Bao 1bd7d8775a Merge remote-tracking branch 'upstream/master' into new_numerical_aquifer 2021-03-15 12:16:09 +01:00
Kai Bao 116b77bd8a addressing the reviewing comments for PR OPM/opm-simulators#3039 
putting the numerical aquifer related modification in a function and the
function is called after the equilibration calculation, so it will work
for different equilibration methods.
 2021-03-15 10:21:40 +01:00
Kai Bao afac0fb485 changing the parameters for the numerical aquifer regression tests 
cpr linear solver is used for better convergence.
 2021-03-12 23:39:01 +01:00
Kai Bao 9ecdca75d9 Merge remote-tracking branch 'upstream/master' into new_numerical_aquifer 2021-03-11 14:08:42 +01:00
Kai Bao 82521be152 adjusting the parameters for the numerical aquifer regression test 2021-03-11 11:43:34 +01:00
Kai Bao 347ca3978a adding parameter to control the min time step 
can be reduced to based on the newton iteration counts.

By default it is zero, so it should not change any running results.
 2021-03-10 11:49:59 +01:00
Kai Bao 0ad848658e Merge pull request #3099 from atgeirr/revive-using_porevolume_average 
Fix hydrocarbon volume issue with no oil or gas
 2021-03-09 12:15:06 +01:00
Kai Bao f9ead85435 Use pore volume to do the average when hydrocarbon is missing. 2021-03-05 14:49:15 +01:00
Kai Bao c0beb6e2ae using --tolerance-cnv=0.0001 for numerical aquifer regression test 
and also coarse_rel_tol_parallel for parallel regression test.
 2021-03-05 12:01:53 +01:00
Kai Bao 69619339a1 Merge branch 'master' into new_numerical_aquifer 2021-03-04 22:54:36 +01:00
Kai Bao 923f0ac0e0 adding --relaxed-max-pv-fraction=0 to numerical aquifer tests 2021-03-04 22:37:32 +01:00
Kai Bao f00b4d9aa8 Merge pull request #3059 from alfbr/fix-error 
Do not report confusing error
 2021-02-23 14:21:59 +01:00
Kai Bao d76251818f adding tests for numerical aquifers 2021-02-22 23:18:43 +01:00
Kai Bao 4c92f22677 for numerical aquifer, flux_rate_ should not be summed across processes 
it will be taken care of in ecloutputblackoilmodule.hh

              aq.fluxRate += data.fluxRate;
              aq.volume += data.volume;
 2021-02-22 23:15:26 +01:00
Kai Bao 867b769fcb only handling the interior elements for numerical aquifer 2021-02-22 23:15:26 +01:00
Kai Bao a43c45e6ff setting numerical aquifer cells water saturation to 1.0 
was removed accidently during cleaning up
 2021-02-22 23:15:26 +01:00
Kai Bao 5e408ad71b trying to make the numerical aquifer runs in parallel 
the current approach is not necessarily correct. When aquifer cells are
on the overlap layers, things are much more complicated.

But it mostly affects only the summary output of the numerical aquifers.
The well data should be fine.
 2021-02-22 23:15:26 +01:00
Kai Bao ab9b43249c using the water volume instead of pore volume 
when calculating the nuemricla aquifer pressure.
 2021-02-22 23:15:26 +01:00
Kai Bao 2b85e93ef6 some cleaning up 
not functionality changes.
 2021-02-22 23:15:26 +01:00
Kai Bao 524e63a255 adapting to the upstream interface change. 2021-02-22 23:15:26 +01:00
Kai Bao c1a61e3b72 fixing the numerical aquifer related after rebasing 2021-02-22 23:15:26 +01:00
Kai Bao a755b54afc rebasing and fixing the compilation. 
The equilibration needs to be fixed for numerical aquifers.
 2021-02-22 23:15:26 +01:00
Kai Bao 74f2fcd121 WIP in using pinched grid for numerical aquifer 2021-02-22 23:15:26 +01:00
Kai Bao b6fdb7cc8e using global index when accessing pore volume in numerical aquifer 2021-02-22 23:15:26 +01:00
Kai Bao 65bde5d65b making sure the aquifer cells have the correct cell volume 
because AQUNUM can specify different cells volume, which is indepedent
of the grid coordinates.
 2021-02-22 23:15:26 +01:00
Kai Bao c246dc6938 applying the face area when calculating the flux rate 
For NNC is not needed, but some NNC is converted to some non-NNC, we
need the face area.
 2021-02-22 23:15:26 +01:00
Kai Bao 8d7c3aa0ca getting numerical aquifer ready for summary output 
it works well for some cases, while not the other one. More
investigation is ongoing.
 2021-02-22 23:15:26 +01:00
Kai Bao 6008aa8339 begining simulator code for numerical aquifer 
most of the functionality is to collect data for summary output.
 2021-02-22 23:15:26 +01:00
Kai Bao ef67d9a9e7 using the specified pressure for numerical aquifer 
NOT totally sure how to use this pressure value, do we need to consider
the capillary pressure?
 2021-02-22 23:15:26 +01:00
Kai Bao 80c0073a69 set water saturations for numerical aquifer cells to be 1. 2021-02-22 23:15:26 +01:00
Kai Bao 1d5b60a600 using the depth specified by numerical aquifer 
for numerical aquifer cells, instead of the depth calculated from the
grid geometry.
 2021-02-22 23:15:26 +01:00
Kai Bao a18c1a15ab correcting the output of the number of threads 2021-02-03 14:02:56 +01:00
Kai Bao e77f8b2f7d Merge pull request #2997 from totto82/avoidDoubleCopy 
dont copy the well model in computeWellPotentials
 2021-01-28 11:45:41 +01:00
Kai Bao d8f8b9f0cc Merge pull request #3028 from totto82/quarryPerfLengthAndRadius 
get connection length and radius from the connection object
 2021-01-28 11:21:21 +01:00
Kai Bao a3004580e6 adapting to the directory change in opm-common related to aquifer 2021-01-08 23:18:41 +01:00
Kai Bao 00ca6dc492 putting all the pressure assmeble function to one function 
assemblePressureEq for MSW
 2021-01-08 16:46:32 +01:00
Kai Bao 2dc63b7a57 putting the three ICD assembleEq function to be one 
to reduce the code duplication.
 2021-01-08 15:09:27 +01:00
Kai Bao 286a7d2e5b Merge pull request #3002 from totto82/moveWellOpCheck 
move well operability check for STW
 2021-01-08 11:28:35 +01:00
Kai Bao 7ecb2e4813 Merge pull request #2866 from bska/activate-welpi-scaling 
Initial Implementation of WELPI Feature
 2020-12-04 20:44:42 +01:00
Kai Bao 61bebb2ec5 addressing reviewing comments for OPM/opm-simulators#2951 2020-12-03 15:23:14 +01:00
Kai Bao 3f5402fb5b adding running test for WSEGAICD 2020-12-03 15:23:14 +01:00
Kai Bao 6e8394eba6 supporting WSEGAICD 2020-12-03 15:23:14 +01:00
Kai Bao 69948f8469 Merge pull request #2960 from bska/refactor-wellptr-creation 
Well Model: Add Helper for Well Pointer Creation
 2020-12-02 20:33:16 +01:00
Kai Bao 64746e21bf Merge pull request #2826 from akva2/janitoring 
fixed: make some indices constexpr
 2020-10-06 11:21:40 +02:00
Kai Bao ed89f25d1b providing the aquifer data for summary output 2020-10-02 13:13:20 +02:00
Kai Bao 49eb111225 adapting to the interface change of SummaryConfig 2020-10-01 23:32:21 +02:00
Kai Bao fd3287cdd3 removing the duplication of calculateReservoirEquilibrium 
in the aquifer models.
 2020-09-24 16:09:56 +02:00
Kai Bao 91ec74dffc fixing the initialization of aquifer pressure for CT aquifer 2020-09-24 15:37:31 +02:00
Kai Bao 897fc77a1d Merge pull request #2791 from GitPaean/increasing_maxIter 
increasing maxIter to 1000 for function satFromPc
 2020-09-21 21:18:20 +02:00
Kai Bao 775793676c increasing maxIter to 1000 for function satFromPc 
it is a temporary fix to make some parallel running easier. We need to
change it manually to make some parallel running pass.
 2020-09-17 20:59:58 +02:00
Kai Bao 7b4142e9b6 adding timing for the well assembly 
And changes the indentation of the linear solver setup time a little to
show it is part of the linear solve time.
 2020-09-08 11:12:41 +02:00
Kai Bao d13e5ac8dd Merge pull request #2718 from blattms/reuse-umfpack-ms 
Reuse umfpack decomposition for multisegment wells.
 2020-08-20 11:33:59 +02:00
Kai Bao b88501bc7d Merge pull request #2711 from blattms/fix-unused-vars-wells 
Remove unused variable groups from BlackoilWellModel::wellsToState.
 2020-08-12 22:29:07 +02:00
Kai Bao 08b93424f3 setting UseInnerIterationsWells default to be false 
and reducing default MaxInnerIterWells to be 50, which should not matter
much. We should try to reduce it further to something like 20, 10 later.
 2020-08-11 09:46:23 +02:00
Kai Bao a38dc27bcb refactoring for iterateWellEquations 2020-08-11 09:10:19 +02:00
Kai Bao 11807747cb renaming solveWellEqUntilConverged to be iterateWellEquations 2020-08-11 09:10:19 +02:00
Kai Bao 23a9f4732b Merge pull request #2666 from atgeirr/msw-log-output-cleanup 
Prettifying and reducing log output from MSW.
 2020-06-10 19:44:01 +02:00
Kai Bao 93655244ce increasing the max iteration number for statFromPc 
when doing the equilibration.
 2020-04-30 12:12:58 +02:00
Kai Bao 954e5e769a addressing comments from OPM/opm-common#1695 2020-04-17 14:34:48 +02:00
Kai Bao 251c09a288 adding the several pressure drop values to WellState for MSW 
segpress_ and segrates_ are renamed to help the name style.
 2020-04-17 00:38:38 +02:00
Kai Bao 3af1d852ef removing WSEGVALV from MissingFeatures.cpp 2020-03-13 22:18:29 +01:00
Kai Bao f44c441acb tightenging tolerance for MS cases for regression test 2020-03-12 08:59:06 +01:00
Kai Bao 936a43cf2e tightening the tolerance for polymer cases for testing purpose 2020-03-04 09:44:53 +01:00
Kai Bao 5568c73d2c Merge pull request #2320 from joakim-hove/aquifer-refactor-aquancon 
Aquifer refactor aquancon
 2020-02-18 11:08:28 +01:00
Kai Bao 53e118c31c Merge pull request #2333 from joakim-hove/segment-remove-flag 
Remove members from WellSegment class
 2020-02-13 14:39:49 +01:00
Kai Bao 56580ad431 adding WGR support for WECON 2020-01-30 21:54:36 +01:00
Kai Bao 6be8d1b4bb adapting to the interface change from OPM/opm-common#1386 2020-01-07 11:40:06 +01:00
Kai Bao d1fd04e635 WIP in fixing the non-defaulted influx coefficient for AquiferFetkovich 2020-01-02 10:55:03 +01:00
Kai Bao 7fc81ae228 using range for a few occasions in BlackoilAquiferModel_impl.hpp 2019-12-20 15:32:39 +01:00
Kai Bao 3fb96deb36 re-formatting aquifer files with clang-format 2019-12-20 14:30:13 +01:00
Kai Bao 61ed33c458 implementing the support for WSEGVALV 2019-12-11 14:43:09 +01:00
Kai Bao 799997d70a fixing a mistake was introduced when rebasing 2019-12-06 10:34:58 +01:00
Kai Bao ab9d175e8d addressing the reviewing comments for PR#2178 2019-12-06 10:15:12 +01:00
Kai Bao 9266b8bd1f adding a running test for wsegsicd 2019-12-06 10:15:12 +01:00
Kai Bao 196e997e79 various fixes and improvements 2019-12-06 10:15:11 +01:00
Kai Bao 3d7f0efe07 various fixes. 
the most important one is that the formulation is changed in the recent
version
 2019-12-06 10:14:20 +01:00
Kai Bao cc77c0e826 importing the old WSEGSICD implementation 
with small adjustments to make it compile
 2019-12-06 10:14:20 +01:00
Kai Bao 975a7a6c50 Merge pull request #2197 from bska/load-aquifer-data 
Load aquifer data
 2019-12-05 15:08:15 +01:00
Kai Bao 0c6adbbba0 some small cleaning up for Aquifer models 
there should be no functional change.
 2019-11-17 10:37:10 +01:00
Kai Bao eea833ced2 correcting the way of calculate initial aquifer pressure 
for AquiferFetkovich.
 2019-11-17 10:37:10 +01:00
Kai Bao 383748b161 some cleaning up for the AquiferFetkovich 2019-11-17 10:37:10 +01:00
Kai Bao 21d69a7af0 making dp is Eval for AquiferFetkovich 2019-11-17 10:37:10 +01:00
Kai Bao 930f80b8c3 Merge pull request #2163 from GitPaean/adding_unsupported_keywords 
adding AQUFET back to MissingFeatures.cpp
 2019-11-17 00:42:14 +01:00
Kai Bao fabc2a6f22 adding AQUFET back to MissingFeatures.cpp 
which was removed by mistake in PR #2162
 2019-11-16 23:45:26 +01:00
Kai Bao b36ac45fea removing several keywords from MissingFeatures.cpp 
COMPSEGS, AQUFET and PLYROCK
 2019-11-16 22:44:24 +01:00
Kai Bao f95718a3c5 Merge pull request #2131 from blattms/fix-wellmodel-numcomponents 
Fix BlackoilWellModel::numComponents for parallel runs.
 2019-11-01 16:28:48 +01:00
Kai Bao dd9a205afc Merge pull request #2094 from GitPaean/dune-fem-version-needed 
the version information of opm-fem is needed.
 2019-10-22 21:19:09 +02:00
Kai Bao d6181a4a06 Merge pull request #2092 from totto82/wellOp 
Add well operability param
 2019-10-22 13:43:35 +02:00
Kai Bao 0605b2fe6f the version information of opm-fem is needed. 2019-10-22 13:00:33 +02:00
Kai Bao 501122ca0d Merge pull request #2076 from GitPaean/converting_aquifier_unix 
converting the aquifer files to be unix format
 2019-10-19 21:40:03 +02:00
Kai Bao c4a9bd346c converting the aquifer files to be unix format 
to avoid ^M in git diff and when editing.
 2019-10-19 20:53:35 +02:00
Kai Bao deeecf8c04 Merge pull request #1975 from GitPaean/throw_addwell_contribution_msw 
throw when calling addWellContributions() for MSW
 2019-08-15 12:43:08 +02:00
Kai Bao f40c1cc12f throw when calling addWellContributions() for MSW 2019-08-15 11:29:30 +02:00
Kai Bao fec9d1feee recovering the interface of function createWellContainer 
in BlackoilWellModel, which makes its usage easier.
 2019-08-09 10:02:28 +02:00
Kai Bao 4d8afb8539 using self-copying when calculating well potentials 
in order to re-use the existing well model in stead of re-creating new
ones. The latter way really complicates the function createWellContainer
in BlackWellModel.
 2019-08-09 10:02:28 +02:00
Kai Bao a772d1ef03 not extrapolating towards negative in VFP tables 2019-07-31 09:16:44 +02:00
Kai Bao ef4b5928fb Merge pull request #1940 from akva2/janitoring 
Some janitoring
 2019-07-10 11:16:35 +02:00
Kai Bao 450f87551e adding GOR checking for WECON 2019-07-05 14:57:16 +02:00
Kai Bao 4be0a7aaa3 Merge pull request #1934 from GitPaean/wellopen_wtest 
WELOPEN and WCON* interacting with WTEST and WECON
 2019-07-05 11:43:07 +02:00