Commit Graph

4802 Commits

Author SHA1 Message Date
Arne Morten Kvarving
bee4590aaa changed: move the comparison classes out of libopmcommon
these classes are really not made for reusability.
thus they should only be built into the applications.
2018-09-07 14:38:03 +02:00
Joakim Hove
085bbc263b
Merge pull request #482 from joakim-hove/thpres-fixup
Fixup: THPRESPR -> THRESPR
2018-09-05 21:10:34 +02:00
Joakim Hove
3e95d3f42b Fixup: THPRESPR -> THRESHPR 2018-09-05 17:53:33 +02:00
Joakim Hove
6b93051616
Merge pull request #480 from joakim-hove/thrpes-solution-section
Thrpes solution section
2018-09-04 14:18:14 +02:00
Joakim Hove
d3249d965f
Merge pull request #477 from joakim-hove/multregt-default
Multregt default
2018-09-04 14:17:50 +02:00
Joakim Hove
4a10023c0d Make sure the THPRESPR field is written in solution section 2018-09-04 08:38:15 +02:00
Joakim Hove
065b9c9c9f
Merge pull request #479 from joakim-hove/thpres-move-it
Rename THPRES string to THPRESPR
2018-09-04 08:25:55 +02:00
Joakim Hove
ae3c4e0d8c Rename THPRES string to THPRESPR 2018-09-03 17:15:01 +02:00
Joakim Hove
4d5ef337ec Accept default values when parsing MULTREGT keyword 2018-08-31 15:47:28 +02:00
Joakim Hove
a2394c06f5 Refacored MULTREGT scanner 2018-08-31 14:32:10 +02:00
Atgeirr Flø Rasmussen
43e4f0ca87
Merge pull request #473 from alfbr/master
Make compiling with OpenMP default.
2018-08-27 13:28:38 +02:00
Joakim Hove
cdf876fa15
Merge pull request #475 from dhan16opm/dhan16_fixes
fix missing "include <string>" in InitConfig.hpp
2018-08-25 09:24:34 +02:00
CDN MacbookPro13
12402916a7 See #https://github.com/OPM/opm-common/issues/474. header files should be self-sufficient 2018-08-25 12:50:58 +05:30
Alf Birger Rustad
0183fa884a Make compiling with OpenMP default. 2018-08-17 13:39:44 +02:00
Arne Morten Kvarving
e407e65b54
Merge pull request #472 from akva2/add_analysis
added: error analysis support in compareSummary / compareECL
2018-08-15 08:08:47 +02:00
Arne Morten Kvarving
e072365234 added: error analysis support in compareSummary / compareECL
useful for debugging purposes. replaces scripts in opm-simulators
2018-08-14 11:02:56 +02:00
Joakim Hove
070acf4bef
Merge pull request #460 from joakim-hove/ACTIONX
Actionx
2018-08-10 20:26:03 +02:00
Joakim Hove
451d52c18a Refactor iteration over Schedule section to for ACTIONX 2018-08-10 11:30:07 +02:00
Joakim Hove
bbb5e27e90 Add basic ACTIONX keyword 2018-08-10 11:29:46 +02:00
Joakim Hove
37ddd82545 Fix typo in keyword defintion 2018-08-10 11:28:52 +02:00
Joakim Hove
3c90adeea9 Remove unused functionality for directory loading of keywords 2018-08-10 11:28:52 +02:00
Joakim Hove
903118736a Remove unused include 2018-08-10 11:28:52 +02:00
Joakim Hove
18a22d8f68
Merge pull request #463 from joakim-hove/restart-cwd
Restart cwd
2018-08-10 11:26:33 +02:00
Atgeirr Flø Rasmussen
46be17cf58
Merge pull request #470 from joakim-hove/set-opm-pack
Add cmake variable $OPM_PACK_COMMAND
2018-08-08 13:26:47 +02:00
Joakim Hove
ce5c617f41 Add cmake variable $OPM_PACK_COMMAND 2018-08-07 22:50:56 +02:00
Joakim Hove
ca1833e6ed
Merge pull request #471 from joakim-hove/parse-test-spe9
Add precision property to DeckOutput class - default = 10
2018-08-07 18:45:05 +02:00
Joakim Hove
bb2e5e0370 Add precision property to DeckOutput class - default = 10 2018-08-07 18:44:05 +02:00
Atgeirr Flø Rasmussen
f6cc04a4ab
Merge pull request #467 from akva2/remove_deck_assignment_operator
changed: delete assignment operator in Deck class
2018-08-03 14:55:35 +02:00
Arne Morten Kvarving
d6c56982cc
Merge pull request #469 from akva2/update_data_with_pr
fixed: allow using update_data with a opm-tests PR
2018-08-03 12:58:44 +02:00
Arne Morten Kvarving
ee6fab7395
Merge pull request #468 from akva2/strip_test_prefix
added: strip test_ prefix from tests added with opm_add_test
2018-08-03 12:08:15 +02:00
Arne Morten Kvarving
93b8d26f86 fixed: allow using update_data with a opm-tests PR
the update_data command needs a full opm-tests checkout,
not just a shallow clone of the PR branch. we thus first
copy the shared copy, then we pull the PR branch into that copy.
2018-08-03 10:19:08 +02:00
Arne Morten Kvarving
0627a9f8ef added: strip test_ prefix from tests added with opm_add_test 2018-08-03 09:58:59 +02:00
Arne Morten Kvarving
3c88335852 changed: delete assignment operator in Deck class 2018-08-01 13:37:21 +02:00
Atgeirr Flø Rasmussen
ef3ef3142a
Merge pull request #465 from joakim-hove/opm-pack
Add application opmpack to load a deck and dump it again as one stream
2018-08-01 08:16:03 +02:00
Joakim Hove
9c6a0cc5d9 Add application opmpack to load a deck and dump it again as one stream 2018-07-31 15:05:34 +02:00
Joakim Hove
4502333751 Ensure that path to restart file is interpreted relative to DATAFILE 2018-07-20 22:11:12 +02:00
Joakim Hove
64e5d123a2 Deck will internalize path to datafile 2018-07-19 08:20:04 +02:00
Joakim Hove
f80644b616 Remove special case for Travis 2018-07-19 06:44:20 +02:00
Markus Blatt
6d58f519fd
Merge pull request #459 from blattms/search-deps-in-prereqs
Search for the prerequisites from package configuration file.
2018-07-16 14:32:23 +02:00
Markus Blatt
4a5333887b Research for software if we search for COMPONENTS.
Otherwise we will never search for e.g. Boost multiple
times and the upmost module in the hierarchy will dictate
the components to be used. That does not work for downstream
modules.

Therefore with this change we check whether there is an argument
COMPONENTS passed to find_package and make sure there will be
another call to it if that is the case.
2018-07-13 16:10:32 +02:00
Markus Blatt
760d0d70b4 Export ENABLE_ECL_INPUT as it is used in opm-common-prereq.cmake 2018-07-12 12:25:21 +02:00
Markus Blatt
563c053d3a Set only ecl_LIBRARIES and nothing else for ecl. 2018-07-12 12:25:21 +02:00
Markus Blatt
cbd44ff67a Remove unneeded opm_common_processed variable.
As we now process the prerequisites in the package configuration file
one search for opm-common is fully sufficient.
2018-07-12 12:25:21 +02:00
Markus Blatt
32dabd6572 Handle prerequisites at the end of package configuration file.
The code in @opm-project_NAME@-prereqs uses macros from OpmPackage.cmake. At
the previous location that file was not yet included for the module opm-common
as this is done in the section @OPM_PROJECT_EXTRA_CODE@, which also sets
CMAKE_MODULE_PATH.
2018-07-12 12:24:43 +02:00
Bård Skaflestad
3d61162e29
Merge pull request #451 from bska/restart-xWELL-output
Revise Infrastructure for Well Arrays in Restart Files
2018-07-12 11:57:37 +02:00
Markus Blatt
3fabf2aad3 Unify handling of package dependency.
There was one macro to do that and one inline code in another
macro. With these changes we always use the macro for this.
2018-07-12 10:45:08 +02:00
Bård Skaflestad
3fa0064e5b VectorItems/well.hpp: Annotate More Items
In particular recognize that the 'item*' indices represent values
that aren't fully characterised yet.
2018-07-12 10:44:27 +02:00
Bård Skaflestad
62f267cf89 INTEHEAD: Document Inter-Module Relations
In particular, the index list in InteHEAD.cpp must use public values
from VectorItems/intehead.hpp if available.
2018-07-12 10:44:27 +02:00
Bård Skaflestad
f16b45eeed SWEL Array: Use L=O+W if LRAT Limit Unavailable
As an alternative source for LRAT data.
2018-07-12 10:44:27 +02:00
Bård Skaflestad
7b301cb300 Aggregate Well Data: Report Default BHP Limits if Defaulted
Use E100 default values.
2018-07-12 10:44:27 +02:00