Commit Graph

1657 Commits

Author SHA1 Message Date
Robert K
fbb78323e8 fix metis check for gentoo installed METIS version. 2015-04-10 15:09:18 +02:00
Andreas Lauser
50ec899a3d eWoms: silence an annoying bogous deprecation warning on Dune 2.4 2015-04-10 15:09:17 +02:00
Andreas Lauser
fa04799855 remove the obsolete 'm4' subdirectory
as far as I can see, it provided M4 macros for autotools based
projects which wanted to use OPM. I have severe doubts that this was
used by anyone because it most likely does not even work. (e.g. the M4
macros does not seem to specify the ERT and opm-parser prerequisites.)

Note that I'm not 100% sure of the above, so if I'm wrong, state so
loudly and I'll close the PR...
2015-04-10 15:09:16 +02:00
Jørgen Kvalsvik
5630710986 Simplifcations in FindPetsc logic
Removes a lot of the conditionals in the makefile. As reflected in the
comments, find_* won't run if the target variable is already set, and appending
empty list elements changes nothing. In order to make reading the file easier
these conditionals have mostly been removed.
2015-04-10 15:09:15 +02:00
Jørgen Kvalsvik
4a2adec53a PETSC_ROOT now sets NO_DEFAULT_PATH
Allows a specific PETSC_ROOT to override and replace default search paths. Now,
if PETSC_ROOT is passed and the find_library calls cannot find the libraries,
the makefile will only search in user provided directories.
2015-04-10 15:09:15 +02:00
Jørgen Kvalsvik
a76363a7f7 FindPetsc uses system-provided MPI if available
When building with USE_MPI=ON the FindPetsc now uses the system provided
MPI if available. Falls back to looking for the PETSc provided unimpi for
sequential builds.
2015-04-10 15:09:14 +02:00
Jørgen Kvalsvk
92af07ae85 FindPets searches default paths w/ general namings
Removed the NO_DEFAULT_PATH flag as this really isn't working for most systems
(where PETSc will be installed from a repository and in /usr or /). Path suffix
parameters extended to accept more version-less configs too, to be compatible
with a default PETSc (debian style) install.
2015-04-10 15:09:13 +02:00
Jørgen Kvalsvk
33914bcceb Removes broken conditional check.
The FindPetsc module would check for a PETSC_ROOT and not attempt to look for
mpi and the petsc header if this was not set, which it in most cases won't be.
If the variable is set then the conditional include is redundant, as it will
search the explicitly passed paths first anyways.
2015-04-10 15:09:13 +02:00
Jørgen Kvalsvk
2de1568a33 Fixes status message when PETSc couldn't be found. 2015-04-10 15:09:12 +02:00
Liu Ming
975d161359 add HAVE_PETSC for config.h 2015-04-10 15:09:11 +02:00
Liu Ming
a8387f67dc Fix duplication errors. 2015-04-10 15:09:10 +02:00
Liu Ming
c7cd3c80b5 Let opm-core find Petsc if PETSC_ROOT is specified. 2015-04-10 15:06:08 +02:00
Liu Ming
38d3f29e2a cmake Module for finding Petsc. 2015-04-10 15:06:07 +02:00
Andreas Lauser
87afe12cda Finddune-grid.cmake: always enable the experimental grid extensions
this is now done by a config.h macro. The reason is that quite a bit
of code depends on boundary IDs which are only available as an
"experimental" grid extension in recent Dune releases...
2015-04-10 15:06:06 +02:00
Atgeirr Flø Rasmussen
07063063cf Merge pull request #348 from dr-robertk/PR/make-compile-with-dune2.2
CPRPreconditioner: make compile with DUNE 2.2.
2015-04-08 16:26:22 +02:00
Robert Kloefkorn
a73c725b9d CPRPreconditioner: make compile with DUNE 2.2. 2015-04-08 14:23:35 +02:00
Atgeirr Flø Rasmussen
2b1c9ae719 Merge pull request #346 from atgeirr/fix-output
Fix convergence table labels (water, oil swapped).
2015-04-08 13:35:16 +02:00
Atgeirr Flø Rasmussen
78ea73fa0a Fix convergence table labels (water, oil swapped). 2015-04-08 13:33:42 +02:00
Atgeirr Flø Rasmussen
2ce8abcdb8 Merge pull request #345 from dr-robertk/PR/fix-uninitialized-parameter
NewtonIterationBlackoilCPR: fix uninitialized parameter
2015-04-08 12:37:41 +02:00
Robert Kloefkorn
1ccf74eb4e NewtonIterationBlackoilCPR: fix uninitialized parameter and make the parameters const. 2015-04-08 11:48:16 +02:00
Atgeirr Flø Rasmussen
72ec98f94b Merge pull request #343 from atgeirr/fix-flow-cp
Bugfix: distribute only if comm size is strictly > 1.
2015-04-08 10:18:30 +02:00
Atgeirr Flø Rasmussen
656e5de331 Bugfix: distribute only if comm size is strictly > 1. 2015-04-08 10:16:25 +02:00
Atgeirr Flø Rasmussen
62d3f37b1d Merge pull request #342 from dr-robertk/PR/some-improvemnts-on-solvers
More parameter for solvers.
2015-03-31 18:00:40 +02:00
Atgeirr Flø Rasmussen
170dbb58eb Merge pull request #341 from andlaus/use_EclipseState_for_summary_units
Revert "also pass the deck to the output writer"
2015-03-31 17:45:17 +02:00
Robert Kloefkorn
1b23de0b1c CPR: add verbosity as a parameter. 2015-03-31 12:54:26 +02:00
Robert Kloefkorn
632bc7a809 CPR: FastAMG seems not to be faster, so use regular AMG. 2015-03-31 12:42:58 +02:00
Robert Kloefkorn
adac4a7995 CPRPreconditioner: added tolerance and max iter as a parmeter.
Parameters are now a separate class to avoid long constructor parameter list.
2015-03-31 12:15:54 +02:00
Andreas Lauser
ba4fca5a77 Revert "also pass the deck to the output writer"
This reverts commit 88730e855f.
2015-03-31 12:11:45 +02:00
Robert Kloefkorn
90a7faf1a8 FullyIBOS: added parameter for minimal number of newton iterations, default stays at 0.
Also, don't throw an exception when the solver did not converge, just return -1
indicating that there was a problem.
2015-03-31 11:16:44 +02:00
Robert Kloefkorn
20316e0a8e NewtonBOCPR: allow to use either GMRes or BiCGStab. This will be revised once the new
linear solver interface is in place.
2015-03-31 11:04:31 +02:00
Atgeirr Flø Rasmussen
05bee313d3 Merge pull request #339 from andlaus/use_deck_units_for_summary_output
also pass the deck to the output writer
2015-03-27 12:30:20 +01:00
Andreas Lauser
88730e855f also pass the deck to the output writer 2015-03-26 17:33:13 +01:00
Atgeirr Flø Rasmussen
061e1bcbd7 Merge pull request #324 from andlaus/implement_temperature_dependent_density
Implement temperature dependent density
2015-03-26 15:10:28 +01:00
Atgeirr Flø Rasmussen
c524be454a Merge pull request #338 from flikka/add-output-header-file
Added SimulatorFullyImplicitBlackoilOutput.hpp to public headers, now us...
2015-03-25 12:54:03 +01:00
Kristian Flikka
fd2023a60f Added SimulatorFullyImplicitBlackoilOutput.hpp to public headers, now used by opm-polymer 2015-03-25 12:17:13 +01:00
Bård Skaflestad
7fa2d53db5 Merge pull request #337 from atgeirr/improve-helpers
Add new vertcatCollapseJacs() helper and use it
2015-03-24 17:13:47 +01:00
Atgeirr Flø Rasmussen
059bfaf036 Fix error in test for vertcatCollapseJacs(). 2015-03-24 15:05:05 +01:00
Atgeirr Flø Rasmussen
9af3296aa9 Add test for vertcatCollapseJacs().
The test case is non-trivial in that it concatenates elements with a mix of
empty() and non-empty jacobian vectors.
2015-03-24 09:50:34 +01:00
Atgeirr Flø Rasmussen
eb9b62697e Make vertcatCollapseJacs() handle constants properly.
With this, any or all of the input vector element may have
an empty jacobian vector. Any element with a non-empty
jacobian vector must still have the same block pattern.
2015-03-24 09:48:31 +01:00
Atgeirr Flø Rasmussen
085c279a0a Use vertcatCollapseJacs() for improved performance. 2015-03-20 11:19:42 +01:00
Atgeirr Flø Rasmussen
07258f0249 Add function vertcatCollapsJacs(). 2015-03-20 11:19:42 +01:00
dr-robertk
f288719e07 Merge pull request #334 from atgeirr/use-move-semantics
Use move semantics to gain performance
2015-03-20 10:47:07 +01:00
Tor Harald Sandve
388ce7548e Averaging multiple layers of NTG values 2015-03-19 12:27:08 +01:00
Atgeirr Flø Rasmussen
ad3da1d946 Re-add copying overload of AutoDiffBlock::function(). 2015-03-19 11:46:48 +01:00
Tor Harald Sandve
65199735e2 Use average NTG values for merged cells due to MINPV algorithm
The volume weighted averaged NTG values are used to get more
reasonable x and y transmissibilities for the cells effected by the
MINPV grid processing algorithm.

This commit starts the process of supporting the MINPV-FILL keyword
where upscaled properties are used for the merged/filled cells.
2015-03-19 11:37:03 +01:00
Andreas Lauser
f0c3a6f892 add glue code needed for thermal gas PVT 2015-03-17 13:34:29 +01:00
Andreas Lauser
924818f445 add glue code needed for thermal oil PVT 2015-03-17 13:34:29 +01:00
Andreas Lauser
debb8a1a04 add glue code needed for thermal water PVT 2015-03-17 13:34:29 +01:00
Atgeirr Flø Rasmussen
0a76af1b14 Include <utility> for std::move(). 2015-03-17 09:46:15 +01:00
Atgeirr Flø Rasmussen
f0ba4a5797 Use swap() and move() to reduce copying in formEllipticSystem(). 2015-03-16 14:22:32 +01:00