Commit Graph

752 Commits

Author SHA1 Message Date
Arne Morten Kvarving
d0fa9ce9dc changed: remove hack for dunecontrol+autotools compatibility
all supported dune versions have cmake builds which should be used
2018-01-22 11:06:36 +01:00
Atgeirr Flø Rasmussen
27204e3439 Merge pull request #318 from akva2/remove_opm_core
remove opm-core from downstream list
2018-01-17 21:14:00 +01:00
Arne Morten Kvarving
9e72f17453 Merge pull request #317 from akva2/fix_mpi
fixed: we need to do mpi disabling earlier
2018-01-17 17:39:44 +01:00
Arne Morten Kvarving
4340691ff8 added: handle QuadMath support like MPI 2018-01-17 15:57:48 +01:00
Arne Morten Kvarving
de7f4e168d fixed: we need to do mpi disabling earlier
if not, prereqs do not see this file, and the option ends
up not being operational for prereqs looking for MPI.
2018-01-17 15:57:16 +01:00
Atgeirr Flø Rasmussen
14888816f6 Merge pull request #316 from akva2/stfu_static_analyzer
Fix some static analyzer errors
2018-01-17 12:41:44 +01:00
Arne Morten Kvarving
b59eaea633 remove opm-core from downstream list 2018-01-17 11:50:23 +01:00
Arne Morten Kvarving
6f174d910c prefer prefix operators for non-primitives 2018-01-17 10:23:54 +01:00
Arne Morten Kvarving
5bd7d4c6b6 mark constructors explicit 2018-01-17 10:21:46 +01:00
Arne Morten Kvarving
63a308f9f3 remove unused variables 2018-01-17 10:21:10 +01:00
Joakim Hove
d0a973738b Merge pull request #315 from joakim-hove/remove-travis
Removed travis scripts.
2018-01-16 20:27:38 +01:00
Joakim Hove
fdea1b4ef0 Removed travis scripts. 2018-01-16 20:18:02 +01:00
Atgeirr Flø Rasmussen
f4bc748329 Merge pull request #314 from akva2/import_more_utilities
Import more utilities from opm-core
2018-01-16 17:44:52 +01:00
Atgeirr Flø Rasmussen
4c0333ce2b Merge pull request #311 from akva2/mark_explicit
changed: mark single-parameter constructor explicit
2018-01-16 14:37:09 +01:00
Arne Morten Kvarving
0e2c558501 add imported utility classes to build system 2018-01-16 13:57:17 +01:00
Arne Morten Kvarving
fdfda315d3 Import some more generic utilities from opm-core 2018-01-16 13:56:25 +01:00
Atgeirr Flø Rasmussen
bbf700b404 Merge pull request #312 from akva2/import_utilities
Import some generic utility classes from opm-core
2018-01-12 10:42:55 +01:00
Arne Morten Kvarving
af80986d97 add imported utility classes to build system 2018-01-11 16:59:10 +01:00
Arne Morten Kvarving
95f7d62e9e Import some generic utility classes from opm-core 2018-01-11 16:55:53 +01:00
Atgeirr Flø Rasmussen
d16842646e Make constructor generic.
This supports std::vector and Opm::TableColumn (from opm-parser) as before,
but without requiring any OPM includes, making the class independent.
2018-01-11 15:00:49 +01:00
Atgeirr Flø Rasmussen
9419997a16 Remove unused boost include. 2018-01-11 15:00:20 +01:00
Arne Morten Kvarving
3475d45772 changed: mark single-parameter constructor explicit
quells a static analyzer warning
2018-01-11 13:03:27 +01:00
Atgeirr Flø Rasmussen
c91291246c Merge pull request #310 from akva2/remove_build_status
remove travis build status from README.md
2018-01-04 13:00:15 +01:00
Arne Morten Kvarving
3fdd39160b remove travis build status from README.md 2018-01-04 12:07:46 +01:00
Joakim Hove
58ea8da47c Merge pull request #309 from joakim-hove/remove-travis
Removed travis intgeration
2018-01-02 20:33:11 +01:00
Joakim Hove
1d6041b482 Removed travis intgeration 2018-01-02 20:32:26 +01:00
Atgeirr Flø Rasmussen
6bc39f0ed0 Merge pull request #308 from atgeirr/fix-debug-log
Corrected debug log output
2017-12-22 11:14:35 +01:00
hnil
3726641d08 corrected DEBUG log output 2017-12-22 09:21:29 +01:00
Arne Morten Kvarving
8fc5283b05 Merge pull request #306 from blattms/fix-pr-304
Include <module>-prereqs.cmake in <module>-config.cmake to process all dependencies
2017-12-21 14:00:32 +01:00
Markus Blatt
4c0625aa8b Include <module>-prereqs.cmake in <module>-config.cmake for transitive search
Otherwise implicit dependencies are never search for. That was the case
for dune-geometry and dune-grid when configuring opm-core as these are only
transitively required via opm-grid.

With this commit we include <module>-prereqs.cmake in <module>-config.cmake
and thus trigger searches for all modules that this module depends on.

We also install the file now <module>-prereqs.cmake as we need it for
installed modules, too.
2017-12-21 12:52:33 +00:00
Arne Morten Kvarving
390bf74f66 Merge pull request #307 from akva2/stupid_test_code
fixed: this test code slipped through
2017-12-21 13:10:15 +01:00
Arne Morten Kvarving
3a60e567bb fixed: this test code slipped through in 9737538708
sorry about that
2017-12-21 13:05:00 +01:00
Arne Morten Kvarving
f730e9bc80 Merge pull request #304 from akva2/pure_config_prereqs_in_repos
changed: get rid of find modules for opm modules
2017-12-20 15:18:36 +01:00
Arne Morten Kvarving
9737538708 changed: get rid of find modules for opm modules
use pure config mode.

we no longer compile a test application for the libraries,
however checks have been tightened by making sure version of
all opm modules are the same.

this allows for putting prereqs directly in the module repositories
2017-12-20 11:12:01 +01:00
Arne Morten Kvarving
58f5115c71 Merge pull request #303 from andlaus/update_dune.module
add dune-common to the list of modules depended on by dune.module
2017-12-13 11:04:13 +01:00
Andreas Lauser
7ab3cee7a7 add dune-common to the list of modules depended on by dune.module
since dune.module is primarily required for dunecontrol support and
you cannot run dunecontrol without dune-common anyway, nothing changes
for dunecontrol users.

for users who do not use dunecontrol, nothing changes either because
the dependencies are specified in opm-common-prereqs.cmake which stays
untouched by this commit.
2017-12-13 11:02:06 +01:00
Arne Morten Kvarving
1ca9533862 Merge pull request #294 from akva2/fix_jenkins_install_at_end
fixed: perform installation at end of main module
2017-12-05 17:32:46 +01:00
Arne Morten Kvarving
68cbdc7397 fixed: perform installation at end of main module
not only if we build downstreams
2017-12-05 11:02:27 +01:00
Atgeirr Flø Rasmussen
006cccf5b7 Merge pull request #288 from andlaus/add_ConditionalStorage
add a simple helper class that allows to store data members conditionally
2017-11-30 21:15:11 +01:00
Andreas Lauser
43cf644c78 add a simple unit test for the ConditionalStorage class 2017-11-30 11:40:08 +01:00
Andreas Lauser
0b097b60f4 add a simple helper class that allows to store data members conditionally
the class takes a boolean parameter as its first template parameter
and a type name as the second. if the boolean parameter is false,
nothing is stored, else an object of the type of the second template
parameter gets created. this mechanism allows to disable member
attributes based on compile time conditions.

The usage semantics of that class are that of a smart pointer class, i.e.,
the equivalent of

```
Foo foo;
foo.bar()
```

is

```
Opm::ConditionalStorage<true, Foo> foo;
foo->bar();
```

If the condition argument for the ConditionalStorage is false, that
code will still compile but an exception is thrown at runtime.
2017-11-30 11:36:57 +01:00
Atgeirr Flø Rasmussen
a346cf5e16 Merge pull request #285 from akva2/add_ndebug_option
added: option to not define NDEBUG for release builds
2017-11-28 07:30:42 +01:00
Atgeirr Flø Rasmussen
2204a160cf Merge pull request #291 from akva2/fix_core_test_program
fixed: do not use ParameterGroup code in opm-core test program
2017-11-27 13:21:38 +01:00
Atgeirr Flø Rasmussen
78173581ee Merge pull request #290 from andlaus/remove_configure
remove the configure wrapper script
2017-11-24 13:10:58 +01:00
Arne Morten Kvarving
af503d2c48 fixed: do not use ParameterGroup code in opm-core test program
it now sits in opm-common. yields confusing output as test
program compilation will succeed even if opm-common but not opm-core
is available
2017-11-24 12:44:03 +01:00
Andreas Lauser
2c6db2a109 remove the configure wrapper script
this used to provide autotools compatibility, but it has not been working for a while. Thus it is IMO better to remove it in order not to mislead people.
2017-11-24 10:37:40 +01:00
Atgeirr Flø Rasmussen
c55885633c Merge pull request #286 from akva2/import_param_group
Import ParameterGroup code from opm-core
2017-11-18 09:14:07 +01:00
Arne Morten Kvarving
933b28ab7b add ParameterGroup code to build system 2017-11-17 13:10:06 +01:00
Arne Morten Kvarving
8f637064c4 changed: remove embedded 'parameters' namespace in ParamGroup
inconsistent and unnecessary.

this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
2017-11-17 13:10:06 +01:00
Arne Morten Kvarving
3a54a224cf changed: remove XML support for ParameterGroup 2017-11-17 13:10:06 +01:00