Commit Graph

5396 Commits

Author SHA1 Message Date
Kai Bao
64fe376ac5 Adding two more warnings to disable_warnings.h.
-Wpragmas and -Wunused-but-set-variable
2015-06-17 10:57:45 +02:00
Bård Skaflestad
59bcfef5d3 Use <tab> as indentation character in file lists
Mostly for consistency with the rest of the file.
2015-06-17 10:25:30 +02:00
Edvin Brudevoll
8e3d64a8cc OPM-188: Fixup after review comment, removed unnecessary include 2015-06-17 09:41:01 +02:00
Edvin Brudevoll
6ade5b411b OPM-188: Fixed test due to IOConfig now defaults to no restart file written. 2015-06-17 09:41:00 +02:00
Edvin Brudevoll
9ec438f0d1 OPM-188: Fixup after review 2015-06-17 09:41:00 +02:00
Edvin Brudevoll
4f2a364dca OPM-188: Added read/write test of RESTART wellstate data 2015-06-17 09:41:00 +02:00
Edvin Brudevoll
7d9dbaf750 OPM-188: Updated EclipseWriter with write of Restart wellstate data 2015-06-17 09:40:59 +02:00
Edvin Brudevoll
6283a8621b OPM-188: Added EclipseReader class for read of Restart wellstate data 2015-06-17 09:40:59 +02:00
Atgeirr Flø Rasmussen
80dd0ef570 Merge pull request #813 from iLoop2/Add_WPIMULT
Add WPIMULT keyword support
2015-06-16 14:50:55 +02:00
Joakim Hove
b29ea2ae1c Merge pull request #812 from chflo/OPM-206
Opm 206 Use IOConfig from EclipseState to decide which Eclipse output files to write (and when)
2015-06-15 17:30:03 +02:00
chflo
f8df77d222 Changed test and test input deck due to IOConfig in use 2015-06-15 12:04:54 +02:00
chflo
3f06ddd400 Use the IOConfig object from EclipseState to decide whether:
* output is to be formatted or not (FMTOUT keyword, default if keyword not present is unformatted)
* Whether restart file should be written for a specified report step
* whether restart files are to be unified or not (UNIFOUT keyword, default if keyword not present is multiple)
* whether an EGRID file should be written (GRIDFILE, NOGGF keywords)
* whether an INIT file should be written (INIT keyword)

* Removed former setting for interval writes to disk (from params)
2015-06-15 12:04:53 +02:00
Bård Skaflestad
34d4dc4ec6 Merge pull request #818 from joakim-hove/mem-leak
Added missing free( ) to malloc() memory.
2015-06-12 11:02:43 +02:00
Joakim Hove
c52ac33dfa Added missing free( ) to malloc() memory. 2015-06-10 22:53:51 +02:00
Fredrik Gundersen
8cf9703d25 Added support for WPIMULT 2015-06-02 13:24:37 +02:00
Fredrik Gundersen
d751b25abb update ignore file 2015-06-02 12:18:10 +02:00
Atgeirr Flø Rasmussen
901209a723 Merge pull request #811 from atgeirr/fix-warnings
Silence multiple warnings.
2015-05-29 15:39:47 +02:00
Joakim Hove
6af549dce0 Merge pull request #804 from iLoop2/OPM-203
Added suport for converting of Metric grid values
2015-05-29 09:21:43 +02:00
Bård Skaflestad
6d55f313ed Merge pull request #810 from akva2/shared_check_commits
changed: use common check-commits target from opm-cmake
2015-05-28 16:38:57 +02:00
Atgeirr Flø Rasmussen
a645c82a00 Silence multiple warnings.
Also add more warnings to the disabling list of disable_warnings.h.
2015-05-28 14:05:09 +02:00
Arne Morten Kvarving
cce99878d5 changed: use common check-commits target from opm-cmake 2015-05-28 10:05:23 +02:00
Atgeirr Flø Rasmussen
e5e6a191f5 Merge pull request #809 from blattms/fix-mask-to-min
Fix mask to min (completes PR PR #805)
2015-05-27 17:45:40 +02:00
Markus Blatt
bc0e842ac8 Fix creation of initial value for computing the max (Fixes PR #805).
Bård spotet a bug after PR #805 was merged. Indead returning
-numeric_limits<type>::min() does not make sense for integral
values. This commit resorts to returning numeric_limits<type>::min().

Kudos to Bård for his attention.
2015-05-27 15:03:28 +02:00
Markus Blatt
91fcd61d55 Test the global reductions for more types.
Previously, we only tested with int which left at least
one bug unreveiled. Now we test with unsigned integers
and floating point values in addition.
2015-05-27 14:49:30 +02:00
Bård Skaflestad
4545ab5b31 Merge pull request #808 from atgeirr/fix-warning
Suppress a warning in serial mode.
2015-05-27 12:49:46 +02:00
Atgeirr Flø Rasmussen
3f99037825 Merge pull request #807 from akva2/use_config_mode
changed: locate opm-cmake using config mode
2015-05-27 12:32:37 +02:00
Arne Morten Kvarving
3a6d83fe49 added: look for opm-cmake in sibling directory 2015-05-27 11:47:20 +02:00
Atgeirr Flø Rasmussen
06e7286443 Suppress a warning in serial mode. 2015-05-27 11:41:52 +02:00
Atgeirr Flø Rasmussen
0a8a1b687c Merge pull request #805 from blattms/parallel-time-stepping
Make adaptive time stepping parallel
2015-05-27 11:37:43 +02:00
Markus Blatt
494ab71924 Update copyright 2015-05-27 11:07:16 +02:00
Markus Blatt
347d1a8e23 Makes the time step control parallel.
The only stage where parallelism changes the adaptive time
stepping is when some inner products on the saturation and
pressure are computed.
This commit makes this part parallel by added an additonal boost::any
parameter to the time stepping and the controller. Per default this
is empty. In a parallel run it contains a ParallelIstlInformation object
encapsulating the information about the parallelisation. This then used
to compute the parallel inner product.
2015-05-27 11:07:16 +02:00
Markus Blatt
95fa515a5a Adds the possibility to compute a parallel inner product. 2015-05-27 11:07:15 +02:00
Markus Blatt
3224450b5d Do not use the masked value of the first container entry as initial value.
This behaviour does not work for computing a global inner product.
Therfore this commit introduces a new function to the functor that
returns an appropriate initial value.
2015-05-27 11:07:15 +02:00
Markus Blatt
83798c9f3a Use correct type get the maximum value.
Previously we hardcoded float. Now we use the result_type of
the binary_function without any qualifiers. With any cv or reference
qualifiers std::numeric_limits uses a default implementation which
produces nonesense (e.g. numeric_limits<const int>::max() returns 0).
2015-05-27 11:07:15 +02:00
Arne Morten Kvarving
f409555b89 changed: locate opm-cmake using config mode 2015-05-27 09:59:39 +02:00
Atgeirr Flø Rasmussen
189177723f Merge pull request #806 from blattms/deactivate-parallel-wells-in-manager
[bugfix,parallel] Deactivate non-existing wells in manager.
2015-05-27 09:53:47 +02:00
Markus Blatt
18f504344a Removes well debugging output. 2015-05-27 09:22:54 +02:00
Markus Blatt
9e20efc4be [bugfix,parallel] Deactivate non-existing wells in manager.
Previously, we used the setStatus method to set wells that do not
exist on the local grid to SHUT. Or at least this is what I thought
that ```well.setStatus(timestep, SHUT)```. Unfortunately, my
assumption was wrong. This was revealed while testing a parallel run
with SPE9 that threw an expeption about "Elements must be added in
weakly increasing order" in Opm::DynamicState::add(int, T). Seems like
the method name is a bit misleading.

As it turns out the WellManager has its own complete list of active
wells (shut wells are simply left out). Therefore we can use this
behaviour to our advantage: With this commit we not only exclude shut
wells from the list, but also the ones that do not exist on the local
grid. We even get rid of an ugly const_cast.

Currently, I have running a parallel SPE9 test that has not yet
aborted.
2015-05-26 21:01:16 +02:00
Fredrik Gundersen
01282a49f2 OPM-203 Added supoort for converting of Metric grid values 2015-05-21 12:32:44 +02:00
Atgeirr Flø Rasmussen
32b3aff8ea Merge pull request #803 from blattms/allow-for-multiple-equations
Allow to create the correct communication information for several unknowns.
2015-05-19 20:32:53 +02:00
Markus Blatt
9da18a14e1 Use more accurate name for the size of the global components.
The new name is num_global_components, which actually is an upper bound
for the the number of global components (1 plus the maximum global index).
2015-05-19 19:58:05 +02:00
Markus Blatt
f0a71e8898 Add spaces around binaries and explicit braces. 2015-05-19 19:56:37 +02:00
Markus Blatt
40fec324d5 Rename no_components to num_components. 2015-05-19 19:53:37 +02:00
Markus Blatt
3b359df534 Update copyright information. 2015-05-19 16:20:57 +02:00
Markus Blatt
e8ebf0840b Allow to create the correct communication information if there are several unknowns.
In this case the parallel index set might represent N entries (this might be the number of
cells of grid). Nevertheless, there several (n) equations/unknowns attached to each index.
In this case we construct a larger index set representing N*n unknows, where each unknown
is attached to an index.

This change only affects parallel runs.
2015-05-19 16:18:14 +02:00
Joakim Hove
356f50bc50 Merge pull request #770 from joakim-hove/external-cmake
External cmake
2015-05-15 14:37:54 +02:00
Joakim Hove
73b6422001 Merge pull request #3 from andlaus/fix_opm-cmake_build
fix the opm-cmake duncontrol support
2015-05-15 09:07:05 +02:00
Atgeirr Flø Rasmussen
bf5d842aea Merge pull request #802 from atgeirr/fix-readme
Update to notify user of known problem.
2015-05-13 14:47:03 +02:00
Atgeirr Flø Rasmussen
ef10ef7a79 Change wording on dune-istl. 2015-05-13 14:46:06 +02:00
Atgeirr Flø Rasmussen
99137ecf9b Merge pull request #800 from blattms/parallel-verbose-only-on-master
Allow to prevent printing to std::cout.
2015-05-13 14:42:37 +02:00