OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,498 Commits 24 Branches 102 Tags 90 MiB
c6e140f615
Commit Graph

5498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
ebc2f46967 Use pore volume weighted averaged hydrocarbon state in rateConverted. 
- pressure, rs and rv is averaged using hydrocarbon pore volume weights.
- pvtRegions is used as input in the conversion factor calculations.
- the pvt cell of the first well cell is used as the pvt index.
(Completing a well in two different PVT regions sounds like a very bad
idea anyway)
- FIP region support is added to the rate converter also for the ebos
interface.
 2017-10-03 10:25:56 +02:00
Kai Bao
28a7167d61 avoiding the oscillation treatment applied to well solution 
it is a design to avoid some performance degeneration for parallel
running.
 2017-09-29 17:15:39 +02:00
Arne Morten Kvarving
cdb8220c9b Merge pull request #1276 from blattms/cmakify-sibling-search 
Cmakify sibling search
 2017-09-27 09:34:33 +02:00
Markus Blatt
03a94c1cde Got rid of false warning for empty opm_common_DIR. 2017-09-26 16:39:50 +02:00
Atgeirr Flø Rasmussen
5aa78bd0f8 Merge pull request #1278 from akva2/fix_flow_ebos_spe1_2p 
fixed: spe1_2p is not run with flow_ebos, it is run with flow_ebos_2p
 2017-09-26 08:43:10 +02:00
Arne Morten Kvarving
0b2fa89e69 fixed: spe1_2p is not run with flow_ebos, it is run with flow_ebos_2p 2017-09-26 08:05:42 +02:00
Markus Blatt
54acb69d7a Drop support for OPM_COMMON_ROOT. 
Users should either rely in sibling search, use opm-common_DIR, or
set CMAKE_PREFIX_PATH correctly to find opm-common.
 2017-09-25 14:03:01 +02:00
Markus Blatt
a26cec6a6c Allow arbitrary clone directories and <prefix><module-name><postfix> build directories 2017-09-25 13:54:04 +02:00
Markus Blatt
0b83f68cdc Warn if OPM_COMMON_ROOT and opm-common_DIR are set and use the latter. 2017-09-25 13:53:34 +02:00
Markus Blatt
f6db28eb5d Changed find_package call to require opm-common. 
Previously, QUIET was passed to opm-common which would
not even print a message if there is a problem. Now cmake
will fail if OPM_COMMON_ROOT is not set, and neither guessing
opm_common_DIR did  work nor searching in the default locations.
 2017-09-25 13:53:34 +02:00
Markus Blatt
e59084c540 Added deprecation warning if OPM_COMMON_ROOT is used 2017-09-25 13:53:34 +02:00
Markus Blatt
b2c6092127 Added warning if opm-common_DIR is not an existing directory. 2017-09-25 13:53:29 +02:00
Atgeirr Flø Rasmussen
f7529cf33e Merge pull request #1269 from GitPaean/fixing_well_efficiency 
correcting the way to use efficiency factor in assembleWelEq
 2017-09-25 10:26:55 +02:00
Atgeirr Flø Rasmussen
26cd61b107 Merge pull request #1274 from akva2/update_packaging_libecl 
update packaging to reflect new libecl
 2017-09-25 10:05:24 +02:00
Arne Morten Kvarving
c6176b7137 update packaging to reflect new libecl 2017-09-25 09:48:22 +02:00
Arne Morten Kvarving
4371f19bda Merge pull request #1242 from akva2/req_dune_2.4 
require dune >= 2.4
 2017-09-22 11:40:22 +02:00
Atgeirr Flø Rasmussen
83ca6d41e3 Merge pull request #1263 from totto82/gasoil 
Make 2p gas oil compile and run
 2017-09-21 14:03:33 +02:00
Tor Harald Sandve
5839962e31 Some trivial cleaning 2017-09-21 12:16:46 +02:00
Atgeirr Flø Rasmussen
c1024ce2d1 Merge pull request #1268 from blattms/log-wells-debug-messages-only-on-master 
Log debug messages about wells only on master.
 2017-09-21 10:33:04 +02:00
Tor Harald Sandve
992ab84435 Remove support and tests for pseudo 2p model in flow ebos 2017-09-20 08:11:44 +02:00
Tor Harald Sandve
b452d16f46 Fix parallell run 2017-09-19 11:16:34 +02:00
Tor Harald Sandve
69c608829f Include RESV in the scaling factor 
- solvent + RESV is not correct. Make the simulator throw until this is
sorted out.

- remove unused parameter
 2017-09-18 11:28:13 +02:00
Tor Harald Sandve
352dccd5e9 Make 2p gas oil compile and runs 
-- use mapping from canonicalToActiveCompIdx from Ebos
-- add guards againts non-existing components
 2017-09-18 11:28:13 +02:00
Alf Birger Rustad
7b1e034a90 Merge pull request #1270 from atgeirr/fix-output-timestep 
Fix report step number associated with substeps.
 2017-09-17 20:25:33 +02:00
Markus Blatt
149d531c68 Added sibling search mechanism using ${PROJECT_BINARY_DIR} for opm-common 
If sibling search is activated and opm-common_DIR is not set, then
we try to determine the build directory layout from ${PROJECT_BINARY_DIR}.
The following two possibilities are supported:
 + <modules-build-dir>/<project-name>
 + <project-name>/<build-dir>
where <project-name> is the case sensitive module name (in this case
opm-common).

This results in the following search precedence:
1. User set opm-common_DIR
2. sibling directories search (if the directories exist)
3. Default (system) CMake search path
 2017-09-15 15:26:53 +02:00
Markus Blatt
da86d1c0bd Introduced mandatory call to project in top level CMakeLists.txt 
Somehow this was never called in the OPM modules. But the CMake documentation
actually says:
"The top-level ``CMakeLists.txt`` file for a project must contain a
literal, direct call to the ``project()`` command; loading one
through the ``include()`` command is not sufficient.  If no such
call exists CMake will implicitly add one to the top that enables the
default languages (``C`` and ``CXX``).
"

Without it some variables (like CMAKE_PROJECT_NAME) are not correctly defined.
 2017-09-15 15:26:53 +02:00
Atgeirr Flø Rasmussen
60fe6b2687 Fix report step number associated with substeps. 
It appears summary files by convention expect all substep data points to
be chunked together with the data point at the end of the report step.
 2017-09-15 12:04:30 +02:00
Kai Bao
fa03db07f8 correcting the way to use efficiency factor in assembleWelEq 2017-09-11 13:01:55 +02:00
Kai Bao
5d9c8350a2 Merge pull request #1267 from GitPaean/removing_new_variables 
removing a few unused nw variable in StandardWell_impl.
 2017-09-11 10:37:38 +02:00
Markus Blatt
a1f960b467 Reallow logging fatal errors for well convergence on all ranks 2017-09-07 14:45:00 +00:00
Markus Blatt
5d1eff5107 Log debug messages about wells only on master. 
Previously all ranks logged the message and did clutter the
output files quite a bit.
 2017-09-07 14:17:56 +00:00
Kai Bao
cd4d17bfa7 removing a few unused nw variable in StandardWell_impl. 2017-09-07 15:04:09 +02:00
Bård Skaflestad
0c61f63900 Merge pull request #1265 from GitPaean/fixing_test_wellmodel 
not using std::make_unique in test_wellmodel

Closes #1264
 2017-09-04 17:33:45 +02:00
Kai Bao
f982faed05 not using std::make_unique in test_wellmodel 
to avoid using C++14 specific functions.
 2017-09-04 15:50:01 +02:00
Atgeirr Flø Rasmussen
77f3bdaeda Merge pull request #1257 from totto82/add_invert4x4 
Add invert4x4 specialization for invertMatrix()
 2017-09-04 09:08:32 +02:00
Atgeirr Flø Rasmussen
a162d883bf Merge pull request #1261 from GitPaean/recovering_model2_running 
not throwing when encountering multisegment wells.
 2017-08-29 11:21:45 +02:00
Tor Harald Sandve
210f1edf25 Add test for invert 4x4 matrix specialization 2017-08-29 11:01:20 +02:00
Kai Bao
b4538af164 not throwing when encountering multisegment wells. 2017-08-29 10:01:31 +02:00
Atgeirr Flø Rasmussen
160314424e Merge pull request #1250 from GitPaean/refactoring_well_model_June_2017_rebase 
well refactoring for flow_ebos
 2017-08-28 14:36:18 +02:00
Kai Bao
9accb56c86 adding a test for well model. 
It is just test for StandardWell.
 2017-08-25 14:09:26 +02:00
Kai Bao
355be6c26c collecting the NaN and too large well residuals 
make sure all the processes will throw if there is any of the processes
found abnormal residual values.
 2017-08-25 14:09:26 +02:00
Kai Bao
8abe48a693 making destructor of WellInterface virtual 
to avoid memory leaking.
 2017-08-25 14:09:26 +02:00
Kai Bao
a60a969257 fixing one memory-leaking for flow_ebos running 2p case. 2017-08-25 14:09:26 +02:00
Kai Bao
96340a23ff computePerfRate and crossFlowAllowed protected in StandardWell 2017-08-25 14:09:26 +02:00
Kai Bao
bc78553686 renaming well_solutions_ and well_variables 
to give slightly easier understanding.
 2017-08-25 14:09:26 +02:00
Kai Bao
25869026e5 renaming a few functions 
to reflect the functions better. No functional change.
 2017-08-25 14:09:26 +02:00
Kai Bao
9a4a9a2bcc using well name and allow_cf form well_ecl. 2017-08-25 14:09:26 +02:00
Kai Bao
a908bd7cf1 makding createWellContainer a static function. 2017-08-25 14:09:26 +02:00
Kai Bao
f9b7094075 fixing of some comments 
no functional change.
 2017-08-25 14:09:26 +02:00
Kai Bao
a04d1a9393 correcting a typo in CMakeLists_files.cmake. 2017-08-25 14:09:26 +02:00