Commit Graph

356 Commits

Author SHA1 Message Date
Arne Morten Kvarving
218771a16a added: jenkins build scripts 2016-04-04 09:21:44 +02:00
Bård Skaflestad
1d3db34972 Merge pull request #100 from atgeirr/add-output-to-upscaling
Make opm-output REQUIRED for opm-upscaling.
2016-04-01 10:47:18 +02:00
Atgeirr Flø Rasmussen
5d57af105e Remove warning-generating semicolon. 2016-04-01 08:06:45 +02:00
Atgeirr Flø Rasmussen
87ca6b4764 Switch dependency order. 2016-04-01 08:06:15 +02:00
Atgeirr Flø Rasmussen
09aa68b90f Merge pull request #101 from OPM/revert-98-fix_opm-material-prereqs.cmake
Revert "opm-material-prereqs.cmake: fix the ordering of the dependencies"
2016-03-31 17:28:45 +02:00
Atgeirr Flø Rasmussen
7dc2b70aac Revert "opm-material-prereqs.cmake: fix the ordering of the dependencies" 2016-03-31 17:27:30 +02:00
Atgeirr Flø Rasmussen
fe8870bb97 Make opm-output REQUIRED for opm-upscaling. 2016-03-31 17:24:42 +02:00
Joakim Hove
6afeebd717 Add opm-parser requirement. 2016-03-31 16:04:31 +02:00
Atgeirr Flø Rasmussen
15addc22b5 Merge pull request #98 from andlaus/fix_opm-material-prereqs.cmake
opm-material-prereqs.cmake: fix the ordering of the dependencies
2016-03-31 15:07:21 +02:00
Andreas Lauser
d48a318401 opm-material-prereqs.cmake: fix the ordering of the dependencies
packages marked REQUIRED must currently preceed optional ones. Also
C99 is not required by opm-material because that module only consists
of c++ code.
2016-03-31 14:50:33 +02:00
Atgeirr Flø Rasmussen
61d3e2011a Merge pull request #92 from joakim-hove/mark-opmcommon-REQUIERED
Mark opm-common as required.
2016-03-31 13:55:24 +02:00
Atgeirr Flø Rasmussen
a75c109c0d Merge pull request #91 from akva2/import_porsol
changed: drop opm-porsol
2016-03-31 13:52:28 +02:00
Atgeirr Flø Rasmussen
dd8af482f2 Merge pull request #89 from kjellkongsvik/opm_autodiff_requires_opm_output
opm-autodiff now dependant on opm-output
2016-03-31 09:42:27 +02:00
Joakim Hove
116d741c89 Merge pull request #97 from atgeirr/experimental-pointerfiddling
Use reference pointers for fast field access.
2016-03-29 13:16:02 +02:00
Atgeirr Flø Rasmussen
52ce54bc47 Use reference pointers for fast field access.
This is necessary in the short term to replace SimulatorState with this
class without performance loss.
2016-03-29 09:44:50 +02:00
Atgeirr Flø Rasmussen
942e90c809 Merge pull request #93 from joakim-hove/add-fPIC
Add global target property: POSITION_INDEPENDENT_CODE
2016-03-29 08:32:59 +02:00
Andreas Lauser
c2d047da0d Merge pull request #96 from andlaus/add_config_macros_for_ewoms
ewoms build files: add HAVE_* variables for all dune modules
2016-03-22 11:59:37 +01:00
Andreas Lauser
06f4603fd3 ewoms build files: add HAVE_* variables for all dune modules
The main reason for this is that it is good style to add HAVE_FOO
config.h variables for everything which was discovered, but it also
turns out that dune-fem is quite picky about the macros which
expects (and I recently fell on my nose because of this)...
2016-03-22 11:55:01 +01:00
Joakim Hove
07266344bc Set target property POSITION_INDEPENDENT_CODE=True 2016-03-22 11:37:03 +01:00
Joakim Hove
7b5d10be22 Merge pull request #95 from joakim-hove/travis-build-common-shared
Added +x for travis build script
2016-03-22 10:18:17 +01:00
Joakim Hove
ddeab7dc69 Added +x for travis build script 2016-03-22 10:17:10 +01:00
Joakim Hove
e3372780c4 Merge pull request #94 from joakim-hove/travis-build-common-shared
Added travis/build-opm-common-shared.sh
2016-03-22 10:11:24 +01:00
Joakim Hove
493fbf95c3 Added travis/build-opm-common-shared.sh 2016-03-22 10:06:22 +01:00
Joakim Hove
b8f1d2164c Mark opm-common as required. 2016-03-21 22:31:05 +01:00
Joakim Hove
985819fb2c Merge pull request #90 from chflo/move_log_functionality
Added log functionality from opm-parser
2016-03-21 22:14:12 +01:00
Arne Morten Kvarving
93a3343b69 changed: drop opm-porsol 2016-03-17 20:11:46 +01:00
chflo
73ad043006 Moved in logfunctionality from opm-parser 2016-03-17 15:23:18 +01:00
Kjell W. Kongsvik
9c825716da opm-autodiff now dependant on opm-output 2016-03-17 14:56:01 +01:00
Joakim Hove
0d3d46e199 Merge pull request #88 from kjellkongsvik/Move_OutputWriter_to_opm-output_safely
Move OutputWriter to opm-output
2016-03-16 13:38:50 +01:00
Kjell W. Kongsvik
855ed76b10 Move OutputWriter to opm-output
Findopm finds opmoutput
2016-03-16 12:42:10 +01:00
Arne Morten Kvarving
5e1a915f76 Merge pull request #85 from joakim-hove/opm-output
Added cmake files for opm-output.
2016-03-14 13:58:25 +01:00
Joakim Hove
b032fc0d05 Added cmake files for opm-output. 2016-03-14 13:43:32 +01:00
Atgeirr Flø Rasmussen
c47d20468f Merge pull request #84 from blattms/make-core-common-required
Make opm-core and opm-common a hard requirement.
2016-03-08 08:40:38 +01:00
Markus Blatt
7d3c1e17ba Make opm-core and opm-common a hard requirement.
Previously, cmake succeeded even if opm-core or opm-common was not found.
The cause for this was that dune-cornerpoint was searched for first. As
it was not required it seems like opm-common and opm-core were treated as
optional too.

This commit moves the opm modules to the opm section of the variable and
changes the order of the modules such that modules listed first do not
depend on modules listed afterwards. Now cmake fails if it cannot finy any
of the required modules.
2016-03-07 17:40:23 +01:00
Atgeirr Flø Rasmussen
03fc74d115 Merge pull request #83 from joakim-hove/non-const-celldata-access
Added non const cellData() access.
2016-03-03 12:43:44 +01:00
Joakim Hove
4958bc55f2 Added non const cellData() access. 2016-03-02 23:20:16 +01:00
Arne Morten Kvarving
812902ff9d Merge pull request #79 from andlaus/do_not_depend_on_boost_iostreams
remove the dependency on boost::iostreams if it is not used
2016-03-01 09:46:37 +01:00
Bård Skaflestad
b833f6c37d Merge pull request #82 from joakim-hove/reference
Added missing &reference symbol.
2016-02-29 09:19:51 -06:00
Joakim Hove
72c8a44dc9 Added missing &reference symbol. 2016-02-29 16:06:59 +01:00
Atgeirr Flø Rasmussen
83b88f143c Merge pull request #81 from joakim-hove/add-iterator
Add iterator
2016-02-29 11:23:01 +01:00
Joakim Hove
5d2469f18e Added global cell data access methods. 2016-02-29 11:17:16 +01:00
Joakim Hove
84a827e847 Added method to query for number of components. 2016-02-29 11:13:06 +01:00
Bård Skaflestad
32dbe00516 Merge pull request #80 from joakim-hove/add-const-overload
Added const overloads
2016-02-25 22:18:35 -06:00
Joakim Hove
5e63006285 Added const overloads 2016-02-25 21:52:08 +01:00
Andreas Lauser
77e7ed97c9 remove the dependency on boost::iostreams if it is not used
as far as I can see, it is not used in any module except opm-upscaling
and it caused the configure stage to fail if I tried to use with a
self-compiled boost 1.60 (which I have to do in order to use clang on
any modern linux distribution.)
2016-02-25 16:40:59 +01:00
Joakim Hove
fb0f00662c Merge pull request #78 from atgeirr/minor-fixes
Minor bugfix and silence a warning.
2016-02-19 14:46:00 +01:00
Atgeirr Flø Rasmussen
70d1831a76 Silence sign mismatch warning. 2016-02-19 14:21:11 +01:00
Atgeirr Flø Rasmussen
4547b5bf82 Bugfix: honor tolerance arguments. 2016-02-19 14:20:44 +01:00
Atgeirr Flø Rasmussen
af24ed82d3 Merge pull request #77 from joakim-hove/template-cmp
Implemented float comparison with templates
2016-02-19 11:41:00 +01:00
Atgeirr Flø Rasmussen
b8d18a6909 Merge pull request #76 from joakim-hove/set-state-component
Added SimulationDataContainer::setCellDataComponent()
2016-02-19 10:43:12 +01:00