Commit Graph

626 Commits

Author SHA1 Message Date
Steinar Foss
0510173408 MissingFeatures.cpp: added keywords beginning w/ I, J, K and L. 2019-10-14 15:48:21 +02:00
Atgeirr Flø Rasmussen
40f91b0e32
Merge pull request #2034 from totto82/sync_restart
sync restart
2019-10-14 13:26:57 +02:00
Cintia Goncalves Machado
d5f5fd8b8b
Add few missing unsupported keywords to the list
Added the unsupported keywords WBP, WBP4, WBP5, WBP9, NLINEARS to the list in MissingFeatures.cpp.
2019-10-14 12:47:17 +02:00
Tor Harald Sandve
86ef30950d Add logging in ebos
With this .PRT and .DBG files are created also for ebos
2019-10-14 10:39:10 +02:00
Atgeirr Flø Rasmussen
4ddb8e8d56
Merge pull request #2051 from atgeirr/enable-onephase-revised-rebased
Enable onephase
2019-10-11 21:02:46 +02:00
Atgeirr Flø Rasmussen
b0de207940
Merge pull request #2040 from alfbr/prt-banner
Make PRT header self-explanatory
2019-10-11 20:48:43 +02:00
Atgeirr Flø Rasmussen
8ef1958c18 Silence warnings. 2019-10-11 20:18:53 +02:00
Atgeirr Flø Rasmussen
5211217c94 Whitespace fixes (tabs->spaces, reformatted new files). 2019-10-11 15:57:51 +02:00
Atgeirr Flø Rasmussen
0b9b20695c Change back relative change computation to old order.
Changing this caused tiny timestepping differences.
2019-10-11 15:29:49 +02:00
Joakim Hove
5ba9107bea Missing features on S 2019-10-11 14:49:33 +02:00
Joakim Hove
f75934c5cb
Merge pull request #2038 from joakim-hove/W
Add missing features for W keywords
2019-10-11 10:24:05 +02:00
Joakim Hove
15a004114f
Merge pull request #2050 from stefoss23/add_keywords_H
added keywords beginnign w/ H and I.
2019-10-11 08:41:01 +02:00
Joakim Hove
8e5d21438e
Merge pull request #2049 from joakim-hove/T
Add missing features on T
2019-10-11 08:40:48 +02:00
Atgeirr Flø Rasmussen
3ddcdf2349 Only run relperm diagnostics for > 1 phase cases. 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen
2d9f41b1aa Rename getPerfPressure() -> getPerfCellPressure(). 2019-10-11 08:19:18 +02:00
Halvor M. Nilsen
d873ae165d Enable single-phase runs. 2019-10-11 08:19:18 +02:00
Steinar Foss
9f8b5341ce added keywords beginnign w/ H and I. 2019-10-09 15:50:11 +02:00
Markus Blatt
e4e8425bad
Merge pull request #1858 from dr-robertk/PR/cleanup-sparsematrixadapter
Cleanup SparseMatrixAdapter.
2019-10-09 12:44:52 +02:00
Joakim Hove
4f79a281b6 Add missing features on T 2019-10-09 12:03:23 +02:00
Robert Kloefkorn
f708286111 [cleanup][Wells] Consequently use SparseMatrixAdapter in addWellContributions. 2019-10-09 10:27:38 +02:00
Alf Birger Rustad
ab1bf5f710 Make PRT header self-explanatory 2019-10-03 15:31:17 +02:00
Atgeirr Flø Rasmussen
189dc150fb
Merge pull request #2039 from totto82/moveBanner
move PRT header to the top
2019-10-03 14:28:06 +02:00
Tor Harald Sandve
aeb29a5412 move PRT header to the top 2019-10-03 12:13:13 +02:00
Joakim Hove
e1c2e70f09 Add missing features for W keywords 2019-10-02 19:28:37 +02:00
Steinar Foss
bab522d433 added keywords beginning w/ G and H. 2019-10-02 15:50:17 +02:00
Tor Harald Sandve
f83e99c6aa sync restart 2019-10-01 14:30:11 +02:00
Joakim Hove
1544f84fb4
Merge pull request #2031 from joakim-hove/missing-features-W
Add keywords WSEGDFIN - WSEGTABL as not supported
2019-10-01 07:48:06 +02:00
Joakim Hove
07c5430ac3 Add keywords WSEGDFIN - WSEGTABL as not supported 2019-09-30 18:47:25 +02:00
Bård Skaflestad
c06881b04e
Merge pull request #2027 from joakim-hove/missing-keywords-V
Add missing features on U, V and T
2019-09-30 14:44:16 +02:00
Joakim Hove
97209c2b6e Add missing features on U, V and T 2019-09-27 20:55:12 +02:00
Steinar Foss
0734802996 MissingFeatures.cpp: added keywords beginning w/ G. 2019-09-25 15:49:44 +02:00
Joakim Hove
dccb9bfa10
Merge pull request #2017 from atgeirr/fix-abort-unknown-param
Abort the run before reading the deck if there are unknown params.
2019-09-23 22:10:17 +02:00
Atgeirr Flø Rasmussen
37854bcdcb
Merge pull request #2016 from akva2/ewoms_to_models
Move ewoms/* into an opm/models/* structure
2019-09-19 14:23:47 +02:00
Atgeirr Flø Rasmussen
c7200460ab Abort the run before reading the deck if there are unknown params. 2019-09-19 14:20:05 +02:00
Joakim Hove
7ab5bf8598
Merge pull request #2015 from stefoss23/add_keywords_F1
WIP. added keywords beginning w/ F and G.
2019-09-19 12:24:32 +02:00
Arne Morten Kvarving
1aba020ea3 changed: ewoms/disc -> opm/models/discretization 2019-09-19 11:16:26 +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
Tor Harald Sandve
afdce991c2
Merge pull request #2004 from atgeirr/update-missingfeatures
Remove some supported keywords from the missing features list.
2019-09-19 09:43:55 +02:00
Steinar Foss
112225f338 added keywords beginning w/ F and G. 2019-09-18 16:20:37 +02:00
Atgeirr Flø Rasmussen
523e38e095 Remove some supported keywords from the missing features list. 2019-09-18 15:34:38 +02:00
Arne Morten Kvarving
ec007c1a86 quell shadowing warning 2019-09-18 13:03:13 +02:00
Joakim Hove
d24e935c73 Add missing features W 2019-09-16 19:46:40 +02:00
Joakim Hove
9fd4030269 Add missing features LCUNIT and LINCOM 2019-09-16 15:43:30 +02:00
Joakim Hove
4b8331bc0c Add missing keywords on W 2019-09-13 17:31:50 +02:00
Steinar Foss
997580668c added keywords beginning w/F. 2019-09-12 12:17:58 +02:00
Steinar Foss
2ac118c6e0 added keywords beginning with E. 2019-09-12 08:48:56 +02:00
Joakim Hove
63f9fde3ca
Merge pull request #1992 from stefoss23/add_keywords_D1
added more kw starting w/ D.
2019-09-11 23:22:18 +02:00
Bård Skaflestad
e9aec288e1 AmgCpr: Follow Relocation of "matrixblock.hh"
Taken from commit d71f7045.
2019-09-10 18:00:34 +02:00
Joakim Hove
6c2db2488d
Merge pull request #1999 from joakim-hove/keywordsW
Update missing features with W keywords
2019-09-10 09:59:17 +02:00
Joakim Hove
c14d8f69e7 Update missing features with W keywords 2019-09-10 07:42:58 +02:00
Arne Morten Kvarving
d71f704532 changed: ewoms/linear -> opm/simulators/linalg 2019-09-09 09:21:42 +02:00
Atgeirr Flø Rasmussen
b8b3599ac5
Merge pull request #1993 from akva2/namespace_change
changed: namespace Ewoms -> namespace Opm
2019-09-09 09:05:19 +02:00
Joakim Hove
96025d224e Unsupported W keywords 2019-09-06 11:22:25 +02:00
Arne Morten Kvarving
5599bb6d8c changed: namespace Ewoms -> namespace Opm 2019-09-05 17:14:38 +02:00
Steinar Foss
748f09c3e0 added more kw starting w/ D. 2019-09-05 14:55:06 +02:00
Joakim Hove
3d36565db7 Adapt to enum changes 2019-09-03 22:18:34 +02:00
Joakim Hove
c804e85bc7
Setup logging before the simulator is initialized (#1980)
Setup logging before the simulator is initialized
2019-08-27 22:41:48 +02:00
Joakim Hove
5b857dd43e
Merge pull request #1982 from stefoss23/add_keywords_D
added keywords beginning w/ D.
2019-08-24 05:31:52 +02:00
Steinar Foss
caea91002a added keywords beginning w/ D. 2019-08-23 09:38:32 +02:00
Joakim Hove
9df2a6f0c9 List W keywords as missing features 2019-08-23 08:02:14 +02:00
Joakim Hove
ad82f1aef3 Remove COMPDAT from list of unsupported keywords 2019-08-21 22:52:07 +02:00
Atgeirr Flø Rasmussen
fdcfa8f0ff
Merge pull request #1955 from GitPaean/well_potential_improvements
using self-copying when calculating well potentials
2019-08-21 15:31:09 +02:00
Joakim Hove
21f2448034
Merge pull request #1977 from stefoss23/add_keywords_c
added keywords beginning w/C.
2019-08-16 17:45:34 +02:00
Joakim Hove
d09b7e88ae Add some W keywords to list of missing features 2019-08-16 16:34:15 +02:00
Steinar Foss
f6bf7bec6d added keywords beginning w/C. 2019-08-16 15:14:28 +02:00
Joakim Hove
17e7fc8928
Merge pull request #1974 from joakim-hove/missing-features-Z
Some missing features on Z and W
2019-08-15 14:30:15 +02:00
Kai Bao
f40c1cc12f throw when calling addWellContributions() for MSW 2019-08-15 11:29:30 +02:00
Joakim Hove
c989874b26 Some missing features on Z and W 2019-08-15 08:04:41 +02:00
Joakim Hove
e2547a9602
Merge pull request #1973 from stefoss23/add_keywords_b
added keywords beginning with B.
2019-08-13 19:31:11 +02:00
Steinar Foss
8aa4af836a added keywords beginning with B. 2019-08-13 13:41:50 +02:00
Atgeirr Flø Rasmussen
63364dc983 Bugfix: use proper method to access injected phase. 2019-08-13 11:57:06 +02:00
Atgeirr Flø Rasmussen
b32290d65a Remove unused variable.
Also move variable to scope where used.
2019-08-13 10:51:16 +02:00
Atgeirr Flø Rasmussen
f5070c6ba9 Avoid getting distr when current control index is -1. 2019-08-13 10:14:37 +02:00
Atgeirr Flø Rasmussen
8438e84db1 Handle two possible cases where current control is -1. 2019-08-12 14:49:52 +02:00
Joakim Hove
1bc571535e
Merge pull request #1963 from stefoss23/add_keywords_A
added keywords beginning w/ A.
2019-08-09 10:35:18 +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
Atgeirr Flø Rasmussen
b7a36a6a72
Merge pull request #1938 from atgeirr/use-foam-module
Use foam module
2019-08-09 09:54:33 +02:00
Steinar Foss
d3399015d7 MissingFeatures: AQUNNC spell error. 2019-08-08 15:17:29 +02:00
Steinar Foss
f377e1dd39 added keywords beginning w/ A. 2019-08-08 12:02:59 +02:00
Atgeirr Flø Rasmussen
c6d31376b5 Use a dummy Communication object for the serial case. 2019-08-08 09:27:14 +02:00
Atgeirr Flø Rasmussen
b9e7881878 Finalize integration of foam module. 2019-08-07 10:39:16 +02:00
Franz G. Fuchs
7fb90bff47 Use foam module. 2019-08-07 10:39:16 +02:00
Atgeirr Flø Rasmussen
0e309fc254
Merge pull request #1954 from GitPaean/wrong_thp_result
Not extrapolating towards negative in VFP tables
2019-08-06 10:40:17 +02:00
Joakim Hove
9f655d13bd Calculate well potentials: check if restart file output is requestd 2019-08-05 13:48:15 +02:00
Kai Bao
a772d1ef03 not extrapolating towards negative in VFP tables 2019-07-31 09:16:44 +02:00
Bård Skaflestad
d08af810ef Remove FILLEPS from MissingFeatures
Pull request OPM/opm-common#849 added support for this keyword.
2019-07-28 17:58:30 +02:00
Steinar Foss
9b01b6b478 MISSING_FEATURES: added keywords ALPOLADS, ALSURFADM ALSURFST. 2019-07-26 18:07:52 +02:00
Steinar Foss
546dd676ad MISSING_FEATURES: added keywords beginning w/ a. 2019-07-26 17:26:29 +02:00
Steinar Foss
72a005e8b9 MISSING_FEATURES: added ACTIONG. 2019-07-26 12:41:35 +02:00
Arne Morten Kvarving
b464896cc8 quell shadowing warnings 2019-07-10 10:08:39 +02:00
Arne Morten Kvarving
4d893c35e8 changed: remove unused method BlackoilWellModel::extractLegacyPressure_ 2019-07-08 11:23:55 +02:00
Kai Bao
450f87551e adding GOR checking for WECON 2019-07-05 14:57:16 +02:00
Atgeirr Flø Rasmussen
70683b662b
Merge pull request #1933 from GitPaean/refactoring_wtest_further
refactoring the ration economic limit checking
2019-07-05 14:44:52 +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
Joakim Hove
a5eaf914e2 Fix error message for COMPORD partially support keyword 2019-07-02 06:10:50 +02:00
Kai Bao
327cf30c31 improving the WTEST results by initializing the explicit quantities 2019-07-01 12:39:09 +02:00
Bård Skaflestad
273e6a4dbc
Merge pull request #1924 from akva2/suppress_no_mpi
suppress some unused variables warnings without mpi
2019-06-29 16:06:25 +02:00
Arne Morten Kvarving
4dbf2428f7 suppress some unused variables warnings without mpi 2019-06-28 14:20:51 +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
Tor Harald Sandve
e2420a4361
Merge pull request #1916 from andlaus/abort_on_unknown_parameters
mebos, flow: adapt to the eWoms changes in handling unknown parameters
2019-06-27 14:59:35 +02:00
Andreas Lauser
2a2b183679 add comments to describe flag arguments 2019-06-27 14:27:18 +02:00
Tor Harald Sandve
fd26b61599
Merge pull request #1907 from andlaus/improve_time_integration
Improve time integration
2019-06-27 14:08:07 +02:00
Andreas Lauser
1bbf18d7c8 mebos, flow: adapt to the eWoms changes in handling unknown parameters
for `flow`, there's no change compared to the current behavior, `ebos`
and its variants will complain when it encounters unused parameters.
2019-06-27 11:51:28 +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
Atgeirr Flø Rasmussen
aa06942695
Merge pull request #1911 from GitPaean/refactoring_wtest_for_wellcut_completions_continue
adapting to the upstream change
2019-06-26 09:34:19 +02:00
Kai Bao
1d5d883e99 adapting to the upstream change 2019-06-25 22:13:34 +02:00
Andreas Lauser
c2aebbb5da EclProblem: use the generic time integration mechanism
i.e., the EclProblem does no longer need to implement the
`timeIntegration()` method itself. since `flow` does not use this code
path, it is unaffected.
2019-06-25 12:39:00 +02:00
Atgeirr Flø Rasmussen
bc07b688c5 Fix typo, indentation and return in unknown-parameter situation. 2019-06-25 10:10:58 +02:00
Atgeirr Flø Rasmussen
43503cf7c6
Merge pull request #1904 from blattms/abort-with-notification
Notify user that we are aborting because of unused keywords.
2019-06-25 09:45:27 +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
Markus Blatt
35ad7a60e2 Notify user that we are aborting because of unused keywords. 2019-06-21 13:11:21 +02:00
Atgeirr Flø Rasmussen
a598734e71
Merge pull request #1890 from akva2/janitoring
remove unused variables
2019-06-21 08:33:03 +02:00
Tor Harald Sandve
337ad8a046 Make sure rvmax and rsmax is non-negtive in the getSurfaceVoluem for MSW
Negative values can happen if the pressure is outside the table range
2019-06-21 08:15:30 +02:00
Atgeirr Flø Rasmussen
5749a7150c Move files out of opm/core/simulator. 2019-06-20 11:00:52 +02:00
Atgeirr Flø Rasmussen
fa016a6008 Moved all remaining files out of opm/autodiff. 2019-06-20 11:00:51 +02:00
Atgeirr Flø Rasmussen
a33cfbf0bc Moved Flow-related classes and files to opm/simulators/flow. 2019-06-20 11:00:51 +02:00
Andreas Thune
c4e0bc2385 Moving findOverlapRowsAndColumns() to a separate file. 2019-06-20 11:00:51 +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
Atgeirr Flø Rasmussen
841f92afc7
Merge pull request #1896 from alfbr/time-reports
Adding time and date to time step report
2019-06-20 10:31:48 +02:00
Alf Birger Rustad
671b2d9a47 Moved well test messages from debug to log and prt 2019-06-20 09:57:24 +02:00
Kai Bao
f4efd464f4
Merge pull request #1883 from totto82/fix_inj
Upwinding for MSW
2019-06-19 12:50:16 +02:00
Arne Morten Kvarving
34bcccef9c remove unused variables
quells warnings
2019-06-19 11:59:43 +02:00
Tor Harald Sandve
a7f718a368 Some clean-up adressing PR comments 2019-06-19 09:13:38 +02:00
Alf Birger Rustad
d8b4bbb0be Adding time and date to time step report 2019-06-18 14:01:08 +02:00
Arne Morten Kvarving
181d3cea6b fixed: build with dune 2.6 without MPI 2019-06-18 13:39:13 +02:00
Tor Harald Sandve
5c7cfd8c21 fix scaling of gas injector 2019-06-17 08:40:44 +02:00
Tor Harald Sandve
22af6e563c fix upwinding for injector 2019-06-17 08:40:44 +02:00
Tor Harald Sandve
c39cec55fe fix control eq inj 2019-06-17 08:40:44 +02:00
Joakim Hove
7f1970af3c Use the shared SummaryState instance when initializing well rates 2019-06-17 07:49:55 +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
Atgeirr Flø Rasmussen
078678206a Changes to support latest Dune version. 2019-06-12 10:40:55 +02:00
Atgeirr Flø Rasmussen
b837dd71b4 Small fixes for the FlexibleSolver system. 2019-06-11 09:55:05 +02:00