Commit Graph
100 Commits
Author SHA1 Message Date
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
Kai Bao 30e5a20f86 WELOPEN and WCON* interacting with WTEST and WECON
WELOPEN and WCON* can open well closed due to various reasons, physical
            or economic.

If a well is shut with WELOPEN and WCON*, we do not try to re-open it
through WTEST
2019-07-05 08:50:58 +02:00
Kai Bao cbbd75164e refactoring the ration economic limit checking 2019-07-02 12:44:56 +02:00
Kai Bao 327cf30c31 improving the WTEST results by initializing the explicit quantities 2019-07-01 12:39:09 +02:00
Kai Bao dfe22cb1a4 Merge pull request #1901 from totto82/fixMSWThrow
Make sure rvmax and rsmax is non-negtive in the getSurfaceVolume for MSW
2019-06-27 15:41:45 +02:00
Kai Bao c2d472cd96 considering FOAM in the switch 2019-06-26 13:21:03 +02:00
Kai Bao 24fe1c8fba more fixing for the tests 2019-06-26 13:19:11 +02:00
Kai Bao 9a2fcdbfd5 fixing warnings in other folder under opm-simulators 2019-06-26 10:48:41 +02:00
Kai Bao 53b15527c2 fixing warnings under simulator/wells 2019-06-26 09:52:38 +02:00
Kai Bao 1d5d883e99 adapting to the upstream change 2019-06-25 22:13:34 +02:00
Kai Bao f6ea98a0cb Merge pull request #1914 from atgeirr/fixup-unknown-params
Fix typo, indentation and return in unknown-parameter situation.
2019-06-25 13:25:11 +02:00
Kai Bao e15a8f62e8 considering not OPEN connection when updateCompletions
in WellInterface.
2019-06-24 21:20:37 +02:00
Kai Bao e0bd33db43 using template instead of pointer to function
for functions checkMaxRatioLimitWell and checkMaxRatioLimitCompletions
2019-06-24 14:03:20 +02:00
Kai Bao b27a646b98 adding function checkMaxRatioLimitCompletions in WellInterface
and use it in checkMaxWaterCutLimit()
2019-06-21 14:11:12 +02:00
Kai Bao 7bb06e1c3c adding function checkMaxRatioLimitWell to WellInterface
and use it in function checkMaxWaterCutLimit
2019-06-21 14:11:12 +02:00
Kai Bao 01c9935b02 fixing the function checkMaxWaterCutLimit
when looking for the worst offending completion
2019-06-21 14:11:12 +02:00
Kai Bao 8be28e8448 adding function initCompletions() to WellInterface 2019-06-21 14:11:12 +02:00
Kai Bao 1593d431ce Merge pull request #1897 from alfbr/well-logging
Moved well test messages from debug to log and prt
2019-06-20 10:47:04 +02:00
Kai Bao f4efd464f4 Merge pull request #1883 from totto82/fix_inj
Upwinding for MSW
2019-06-19 12:50:16 +02:00
Kai Bao ab839896b6 using createConstantZero instead of createBlank
the content for createBlank is not initialized, which causes undefined
behavoir.
2019-06-13 15:05:12 +02:00
Kai Bao 4c105d7672 copying invertMatrix for DynamicMatrix
the reason is to make sure for blackoil cases, the same algorithm will
be used to invert the D matrix for the well model. As a result, it will
reduce the burden to test the PR.

Whether we will keep this algorithm for 4 X 4 matrix will be addressed
as a separate issue.
2019-06-13 14:49:04 +02:00
Kai Bao 310741a54f fixing a small bug related to EvalWell 2019-06-13 14:49:04 +02:00
Kai Bao 4449f0c172 adding updateConnectionRatePolyMW to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao 2256395957 adding updateExtraPrimaryVariables to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao 94057a53f9 adding checkConvergenceExtraEqs to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao 4f7b899290 fixing the compilation problem due to rebasing
and also some small cleaning up
2019-06-13 14:49:04 +02:00
Kai Bao 3dcec6a436 removing StandardWellV 2019-06-13 14:49:04 +02:00
Kai Bao 33de77e595 incorporate the staticSize template parameter for DynamicEvaluation 2019-06-13 14:49:04 +02:00
Kai Bao ad0e294e52 using StandardWellV as the default StandardWell model 2019-06-13 14:49:04 +02:00
Kai Bao 809a78780e Merge pull request #1876 from bska/fipnum-supported-kw
Remove FIPNUM From List of Unsupported Keywords
2019-06-05 14:07:43 +02:00
Kai Bao 8fd1a8b7da assert pressure derivative in getSegmentRateUpwinding is zero 2019-05-31 12:51:50 +02:00
Kai Bao 5aacda1880 adding some comments about getSegmentRateUpwinding() 2019-05-31 11:22:35 +02:00
Kai Bao 8796935f7c Merge pull request #1867 from GitPaean/fixing_resv_prediction
not trying to update RESV target for prediction producers
2019-05-31 09:25:15 +02:00
Kai Bao c5983eeec5 not trying to update RESV target for prediction producers 2019-05-30 11:58:23 +02:00
Kai Bao 236e4d7e33 adding function updateUpwindingSegments() for MSW
to update the upwinding segment for each segment based on flow direction
2019-05-28 12:35:59 +02:00
Kai Bao 8ac85b892c Merge pull request #1859 from joakim-hove/use-exit
Return EXIT_FAILURE in main() instead of rethrow
2019-05-24 10:29:59 +02:00
Kai Bao 080e840f2f using tolerance_wells_ for BHP control tolerance for MSW 2019-05-16 12:20:35 +02:00
Kai Bao 28f0274fb5 fixing bugs spotted in the review comments 2019-05-15 16:28:18 +02:00
Kai Bao 4593453d10 adding function checkConvergenceControlEq to refactor getWellConvergence
only functional change is that rate control or BHP control has different
tolerance for MSW now.
2019-05-15 16:28:18 +02:00
Kai Bao ba106602e1 moving the output of the Report step information earlier
a lot of things have happened before the printing out the `Report step`
information. When some error messages get thrown, it is easy to make
people confused to look a the wrong report step.
2019-05-11 14:13:26 +02:00
Kai Bao 8c96aeebbe updating well control during iterateWellEquations in MSW 2019-05-10 14:56:20 +02:00