Commit Graph

9793 Commits

Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
77e7a07756
Merge pull request #1918 from bska/printf-ptr
Format Specifier '%p' Requires Pointers to Void
2019-06-26 18:22:51 +02:00
Bård Skaflestad
a98caf1d2a Format Specifier '%p' Requires Pointers to Void
While here, also print both 'ctrls1' and 'ctrls2' instead of
printing 'ctrls2' twice.
2019-06-26 14:39:14 +02:00
Atgeirr Flø Rasmussen
766afa4602
Merge pull request #1917 from GitPaean/fixing_warnings_
more fixing for the tests
2019-06-26 14:35:00 +02:00
Bård Skaflestad
402320267a
Merge pull request #1912 from akva2/janitoring
Some janitoring
2019-06-26 14:04:03 +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
Atgeirr Flø Rasmussen
e731715924
Merge pull request #1915 from GitPaean/fixing_warnings_
fixing warnings under opm-simulators
2019-06-26 12:52:41 +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
Arne Morten Kvarving
8c589cf082
Merge pull request #1908 from tskille/master
Including 10 new regression tests to test suite.
2019-06-25 14:53:58 +02:00
Torbjørn Skille
ff212215a0 Including 10 new regression tests to test suite.
All of these regression tests are based on model2.
2019-06-25 14:04:12 +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
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
Arne Morten Kvarving
4aec900699 reduce scope of variables
quells sca warnings
2019-06-25 09:29:07 +02:00
Arne Morten Kvarving
a21b81d5d9 fixed: check pointers before dereference
quells a sca warning
2019-06-25 09:28:51 +02:00
Arne Morten Kvarving
c826a709b1 fixed: reassignment before use of value
quells a sca warning
2019-06-25 09:27:26 +02:00
Arne Morten Kvarving
66394c870a fixed: check pointer before dereference
quells a sca warning
2019-06-25 09:26:41 +02:00
Bård Skaflestad
35a174d326
Merge pull request #1909 from GitPaean/fixing_completions
considering not OPEN connection when updateCompletions in WellInterface.
2019-06-24 22:18:37 +02:00
Kai Bao
e15a8f62e8 considering not OPEN connection when updateCompletions
in WellInterface.
2019-06-24 21:20:37 +02:00
Atgeirr Flø Rasmussen
6d0aa4351a
Merge pull request #1898 from GitPaean/refactoring_wtest_for_wellcut_completions
Fixing completion water cut checking for WTEST and some related refactoring
2019-06-24 16:48:32 +02:00
Andreas Lauser
626e8dd243 ebos: set the default for the number of threads to 2 if openMP is available
this value is was chosen to exactly replicate `flow`'s behavior. IMO,
it would be less surprising to set the default to `1`, i.e., the user
needs to specify `--threads-per-process=$N` explicitly if
multithreaded linearization ought to be used.
2019-06-24 14:23:55 +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
Atgeirr Flø Rasmussen
5029b83321
Merge pull request #1905 from andlaus/include_config_h
NNC sorter test: include config.h
2019-06-21 21:00:51 +02:00
Andreas Lauser
9a4dd6210a NNC sorter test: include config.h
This caused some issues on my machine and it is supposed to be done by
any compile unit anyway.
2019-06-21 19:06:46 +02:00
Markus Blatt
3e8127cb54
Merge pull request #1884 from akva2/buildsys_clean
changed: simplify buildsystem a little
2019-06-21 15:41:55 +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
Andreas Lauser
c0b48e28c3
Merge pull request #1902 from totto82/fix_ebos_ecl_tuning2
Only apply timestep after event at the beginning of an episode
2019-06-21 11:02:56 +02:00
Tor Harald Sandve
4b1544469d Only apply timestep after event at the beginning of an episode 2019-06-21 08:43:13 +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
Joakim Hove
0f386c21da
Merge pull request #1899 from atgeirr/cleanup-autodiff
Cleanup autodiff dir
2019-06-20 12:43:57 +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