OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,065 Commits 9 Branches 35 Tags 15 MiB
e613f2b8c5
Commit Graph

6065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
e613f2b8c5 Use &ref not shared_pointer to MaterialLawManager 2017-11-21 12:08:10 +01:00
Tor Harald Sandve
12108d57ab Remove blackoilPhases and phaseUsage from the initialization code 
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
 2017-11-21 12:08:10 +01:00
Tor Harald Sandve
8def11ff93 Remove BlackoilProps from equil initalization code 
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
 2017-11-21 12:08:10 +01:00
Atgeirr Flø Rasmussen
d049125205
Merge pull request #1186 from akva2/remove_param_group 
remove ParameterGroup code
 2017-11-18 09:14:11 +01:00
Arne Morten Kvarving
acc631f504 remove ParameterGroup code 
moved to opm-common
 2017-11-17 13:55:07 +01:00
Atgeirr Flø Rasmussen
d4bbaa1d3e
Merge pull request #1185 from akva2/more_removals 
remove more sources which are unused after removals in opm-upscaling
 2017-11-17 12:52:28 +01:00
Arne Morten Kvarving
476a64c370 remove more sources which are unused after removals in opm-upscaling 2017-11-17 10:47:15 +01:00
Atgeirr Flø Rasmussen
c3121f0a1a
Merge pull request #1184 from akva2/remove_unused_sources 
remove unused code
 2017-11-15 14:09:31 +01:00
Arne Morten Kvarving
b208db1b74 remove unused code 2017-11-15 11:56:40 +01:00
Atgeirr Flø Rasmussen
18e230a18b
Merge pull request #1122 from atgeirr/fix-type-bug-in-equil 
Fix type bug in equil
 2017-11-14 14:40:47 +01:00
Joakim Hove
c2dd80f6c5
Merge pull request #1182 from joakim-hove/use-wells 
Updated NNC() constructor arguments.
 2017-11-06 17:06:22 +01:00
Atgeirr Flø Rasmussen
c1f16be87b Merge pull request #1183 from akva2/update_rh_packaging 
update redhat packaging
 2017-10-25 13:06:37 +02:00
Arne Morten Kvarving
132cfc0ff7 update redhat packaging 2017-10-25 09:43:30 +02:00
Joakim Hove
210364ecde Schedule no longer part of EclipseState. 2017-10-24 20:38:15 +02:00
Andreas Lauser
10a07ef9a4 change version to 2018.04-pre 2017-10-19 19:30:31 +02:00
Atgeirr Flø Rasmussen
1e0135c9bd Update swatinit tests to account for bugfix. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
ac9a20da20 Update equil regression reference after bugfix. 
Also reduce some very coarse tolerances to more reasonable levels.
 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
e5a7535a22 Bugfix: type for target capillary pressure. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
e4a8fad29c Merge pull request #1180 from blattms/cleanup-version-ifs 
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
 2017-10-12 13:28:50 +02:00
Atgeirr Flø Rasmussen
c8fc2bd336 Merge pull request #1177 from alfbr/master 
Removing redundant checks from Nexus
 2017-10-11 21:57:36 +02:00
Markus Blatt
a46e2c7121 [cleanup] Removes unnecessary if clauses for unsupported DUNE versions. 
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
 2017-10-11 21:25:18 +02:00
Atgeirr Flø Rasmussen
e0fc476fbe Merge pull request #1179 from totto82/fixSwatInitTest 
Update the swatinit test base on fix in opm-material#248
 2017-10-11 18:53:21 +02:00
Alf B. Rustad
75ff5ea7d5 Cosmetic change 2017-10-11 10:45:18 +02:00
Alf B. Rustad
7e40af760f Cosmetic change 2017-10-11 10:45:18 +02:00
Alf B. Rustad
0a6baab957 Remove remaining Nexus checks 2017-10-11 10:45:17 +02:00
Alf B. Rustad
8f445699e9 Avoid false positives by introducing a tolerance 2017-10-11 10:45:17 +02:00
Alf B. Rustad
8321530c4e Removing redundant checks from Nexus 2017-10-11 10:44:59 +02:00
Tor Harald Sandve
75657ff482 Update the swatinit test base on fix in opm-material#248 2017-10-11 09:39:12 +02:00
Atgeirr Flø Rasmussen
417c5b2d46 Merge pull request #1178 from andlaus/fix_mcu 
mark initHydroCarbonState() as inline
 2017-10-05 09:06:57 +02:00
Andreas Lauser
2ab9b5de45 mark initHydroCarbonState() as inline 
this allows it to be used in multiple compile units without the linker
running amok.
 2017-10-04 19:24:20 +02:00
Arne Morten Kvarving
33305c4f1f Merge pull request #1175 from blattms/cmakify-sibling-search 
Cmakify sibling search
 2017-09-27 09:34:48 +02:00
Joakim Hove
f696042f26 Merge pull request #1176 from joakim-hove/master 
Updated NNC() constructor.
 2017-09-26 18:43:54 +02:00
Markus Blatt
6ff0433435 Got rid of false warning for empty opm_common_DIR. 2017-09-26 16:38:41 +02:00
Joakim Hove
8a3fe0a3f6 Updated NNC() constructor. 2017-09-26 14:30:50 +02:00
Markus Blatt
660a65aec9 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 12:58:10 +02:00
Markus Blatt
9a278c32b1 Allow arbitrary clone directories and <prefix><module-name><postfix> build directories 2017-09-25 12:48:08 +02:00
Markus Blatt
b544bfe9cd Warn if OPM_COMMON_ROOT and opm-common_DIR are set and use the latter. 2017-09-25 12:29:54 +02:00
Markus Blatt
babfbd5e28 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 12:29:54 +02:00
Markus Blatt
1f8e56311e Added deprecation warning if OPM_COMMON_ROOT is used 2017-09-25 12:29:54 +02:00
Markus Blatt
355d4e7809 Added warning if opm-common_DIR is not an existing directory. 2017-09-25 12:29:49 +02:00
Atgeirr Flø Rasmussen
1a8ae0a95a Merge pull request #1174 from akva2/update_packaging_libecl 
update packaging to reflect new libecl
 2017-09-25 10:05:40 +02:00
Arne Morten Kvarving
059cfa5a0c update packaging to reflect new libecl 2017-09-25 09:44:52 +02:00
Arne Morten Kvarving
96c4e8f531 Merge pull request #1171 from akva2/req_dune_2.4 
require dune >= 2.4
 2017-09-22 11:38:44 +02:00
Markus Blatt
b8838d28b3 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:37:51 +02:00
Markus Blatt
d3b7f24abb 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:37:51 +02:00
Atgeirr Flø Rasmussen
c98683e31e Merge pull request #1173 from totto82/fix_fallout_none_productionSpecification 
Fix fallout if no group controll (NONE) is specified for a group
 2017-08-18 12:21:03 +02:00
Tor Harald Sandve
9a306def92 Fix fallout if no group controll (NONE) is specified for a group 2017-08-18 08:56:26 +02:00
Atgeirr Flø Rasmussen
4a8d74a910 Merge pull request #1172 from totto82/removeState 
Add interface for passing cell pressures directly in wellState.init(...)
 2017-08-10 14:21:53 +02:00
Tor Harald Sandve
843e8c9a6f Add interface for passing cell pressures directly in wellState.init(...) 2017-08-03 10:31:10 +02:00
Arne Morten Kvarving
86524b27aa require dune >= 2.4 2017-07-19 14:32:57 +02:00