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
Atgeirr Flø Rasmussen
41234f1bee
Merge pull request #1169 from totto82/impl_polymer
...
Add polymer to blackoilstate
2017-06-23 13:31:40 +02:00
Tor Harald Sandve
d935458fca
Add polymer to phase usage.
2017-06-16 13:40:29 +02:00
Tor Harald Sandve
fc380041f2
Add polymer to blackoilstate
2017-06-12 15:37:57 +02:00
Atgeirr Flø Rasmussen
a8a46ee5ae
Merge pull request #1167 from GitPaean/fixing_petsc_compilation
...
removing the unused parameter:: for LinearSolverPetsc
2017-06-12 11:12:45 +02:00
Atgeirr Flø Rasmussen
4bab353e90
Merge pull request #1168 from dr-robertk/PR/remove-warnings
...
[cleanup] remove two uninitialized warnings in SaturationProposFromDeck.
2017-06-07 14:08:57 +02:00
Robert Kloefkorn
d058d8e380
[cleanup] remove two uninitialized warnings in SaturationProposFromDeck.
2017-06-07 13:19:21 +02:00
Kai Bao
67fbac5c95
removing the unused parameter:: for LinearSolverPetsc
...
to fix the compilation when PETsc exists.
2017-06-06 11:00:51 +02:00
Atgeirr Flø Rasmussen
d504715caa
Merge pull request #1165 from blattms/fix-warnings
...
Fix some warnings
2017-06-02 17:03:14 +02:00
Markus Blatt
327d146caa
Fix uninitialized warning intpfa calculation
2017-05-24 12:12:52 +02:00
Markus Blatt
1231870e56
Add missing include of config.h
...
Closes OPM/opm-core#1164
2017-05-24 12:11:49 +02:00
Atgeirr Flø Rasmussen
3f403a8470
Merge pull request #1162 from totto82/add_solvent_to_pu
...
Implement solvent model in flow_ebos
2017-05-19 10:02:59 +02:00
Joakim Hove
02b1e58a77
Merge pull request #1161 from joakim-hove/use-libecl
...
Use libecl in jenkins
2017-05-10 13:36:53 +02:00
Tor Harald Sandve
dbe7930ef7
Add SSOL to blackoilState
...
Stores the solvent saturation in the simulator container.
2017-05-10 11:14:53 +02:00
Tor Harald Sandve
daecfa7e55
Add solvent to phaseUsage
2017-05-08 10:29:51 +02:00
Joakim Hove
419aedfcbf
Use libecl in jenkins
2017-05-07 12:54:08 +02:00