Roland Kaufmann
1e83943da1
Ignore generated class doc. when building in-tree
2013-03-07 10:56:27 +01:00
Atgeirr Flø Rasmussen
09c2b76288
Merge pull request #29 from rolk/029_zerosatnumcells
...
Remove unused variable from example
2013-03-07 01:33:38 -08:00
Roland Kaufmann
2e578426e9
Remove unused variable from example
...
The value set to this variable is never used, not even in comments
describing what one could do with it. Thus, it has no value as an
example. I want remove it to avoid the unnecessary warning when
compiling the project (currently the only one).
2013-03-07 10:28:54 +01:00
Atgeirr Flø Rasmussen
46a78df3cd
Merge pull request #28 from rolk/028_cmakeupd
...
Update CMake scripts to commit 11bf7bf3 from opm-core
2013-03-05 06:46:36 -08:00
Roland Kaufmann
d2d842c270
Remove make execution wrapper
2013-03-05 14:46:20 +01:00
Roland Kaufmann
6d26126754
Only regenerate config var file if actually changed
2013-03-05 14:45:37 +01:00
Roland Kaufmann
8ee3058af9
Various improvements in the build process
...
Allow uppercase alternatives, fix whitespace bug, allow empty pre-
compiled header, find OpenMP
2013-03-05 14:43:03 +01:00
Roland Kaufmann
3af27c2130
Specify source files explicitly rather than with glob
2013-03-05 14:37:42 +01:00
Roland Kaufmann
4877f9048f
List files that are needed to build the library
...
This list will be picked up by the modules at a later commit.
2013-03-05 14:34:37 +01:00
Roland Kaufmann
a627e6416e
Remove remnants of the Autotools build system
2013-02-22 23:25:45 +01:00
Roland Kaufmann
adbf45c492
Ignore output from CMake build
2013-02-22 23:25:45 +01:00
Roland Kaufmann
15f3246ea5
Search and replace opm-core with opm-upscaling
...
Add dependencies that are specific for this library as well as doing
the textual replacement in the configuration file.
2013-02-22 23:25:45 +01:00
Roland Kaufmann
9b8fe95846
Remove opm-core specific customizations
2013-02-22 23:25:45 +01:00
Roland Kaufmann
2b1c1c70b9
Import cmake/ from commit 5f82198c in opm-core
2013-02-22 23:25:21 +01:00
Roland Kaufmann
d2d0c52176
Use path references from the root of the project
...
This means that it becomes harder to move this directory around, but
that gain is relatively small anyway. It is however necessary to do
this if we are not going to do a recursive build style.
2013-02-22 19:37:59 +01:00
Roland Kaufmann
a6e035d9c6
Move tests out of the source tree
2013-02-22 19:37:59 +01:00
Bård Skaflestad
64e6952c9a
Merge pull request #26 from andlaus/dune_to_opm
...
change namespace from 'Dune' to 'Opm'
2013-02-05 07:39:36 -08:00
Andreas Lauser
c4f0bb5680
change namespace from 'Dune' to 'Opm'
...
everything still compiles.
2013-02-05 16:05:02 +01:00
Bård Skaflestad
3f6322c236
Merge pull request #25 from akva2/santiy_check_isotropic_materials
...
sanity check (rock-list) specified isotropic materials in elasticity upscaling code
2013-01-31 12:28:57 -08:00
Arne Morten Kvarving
8d6213ea0c
added: sanity check specified isotropic materials
...
if we end up with too small/large poisson's ratio,
bail with an error message rather than crashing with a segfault
2013-01-31 17:31:02 +01:00
Bård Skaflestad
9fb2bfebc4
Merge pull request #23 from blattms/bugfix/issue-22
...
Patch includes config.h and fixes issue #22
2013-01-21 05:58:29 -08:00
Markus Blatt
dcfe96f49b
Include config.h if present
2013-01-18 14:52:20 +01:00
Bård Skaflestad
ffadae0f34
Merge pull request #19 from akva2/high_order_multipliers
...
Elasticity upscaling - autumn update
2013-01-07 06:32:54 -08:00
Arne Morten Kvarving
42b271cfd1
changed: certain elements do not like pragma once
2013-01-07 10:01:20 +01:00
Arne Morten Kvarving
b3b547a4f1
changed: get rid of case-insensitive comparisons in command line parameter parsing
...
the paramgroup parser is case sensitive, the data may as well be as well
2013-01-07 09:54:34 +01:00
Arne Morten Kvarving
cd8dfb11b7
fixed: don't rely on a patched istl
2013-01-07 09:43:35 +01:00
Arne Morten Kvarving
eaca1c97ad
added: improve the linear algebra
...
- change linsolver_type=cg to linsolver_type=iterative
- rename linsolver_type=slu to linsolver_type=direct
- adds a schur based preconditioner for the mortar system
- can use a symmetric iterative scheme (minres) or an asymmetric (gmres)
- allows employing a uzawa approach (mostly for debugging)
the elasticity block and (through schur-decomposition) multiplier
blocks are both preconditioned using an AMG. a diagonal preconditioner
for the multipliers are also available.
2013-01-02 14:02:09 +01:00
Bård Skaflestad
1a9c883bc2
Merge pull request #18 from atgeirr/master
...
Some gravity effects
2012-12-07 07:51:25 -08:00
Atgeirr Flø Rasmussen
59197c6f58
Fixed missing member, parameter name and changed gravity sign.
...
Assumes now that gravity should be positive in the z direction.
2012-12-07 16:26:49 +01:00
Atgeirr Flø Rasmussen
86130c187e
Merge remote-tracking branch 'hnil/master'
2012-12-07 16:02:24 +01:00
Atgeirr Flø Rasmussen
bf5f8c56d2
Merge pull request #17 from berland/master
...
Postpone incorporation of user-supplied surface tension to the end
2012-12-02 23:44:08 -08:00
Atgeirr Flø Rasmussen
77ff7dc121
Merge pull request #15 from atgeirr/master
...
Add eclipse format output to SteadyStateUpscalerImplicit
2012-11-26 05:04:56 -08:00
Arne Morten Kvarving
a7dc718f2c
changed: use human friendly 1 based loadcase numbering
2012-11-26 12:53:06 +01:00
Arne Morten Kvarving
cd6c93a28b
fixed: warn and exit instead of segfault if model uses more materials than is in rock list
2012-11-26 12:53:06 +01:00
Arne Morten Kvarving
29ec9824e9
added: warn if volume cell is degenerated
...
also gives the collapse tolerance that will get rid of the cell
2012-11-26 12:53:06 +01:00
Arne Morten Kvarving
9c56c926f7
fixed: make sure we load vectors
2012-11-26 12:53:06 +01:00
Arne Morten Kvarving
343411cc9b
quell compiler warnings (sign/unsigned mismatch, unused variables)
2012-11-26 12:53:06 +01:00
Arne Morten Kvarving
6f1e511531
added: method=none
...
use this to apply no periodicity approach. useful for debugging
2012-11-26 12:53:06 +01:00
Arne Morten Kvarving
da7729c54f
changed: refactor method setting into an enum instead of a set of bools
2012-11-26 12:53:05 +01:00
Arne Morten Kvarving
499f5092ab
added: support for higher order lagrangian multipliers
...
- add PN shape function support
- make the way we group boundary elements into pillars more robust
- use the new shape functions in mortar matrix assembly
- add options to specify multiplier order (defaults to linears for now)
2012-11-26 12:53:05 +01:00
Arne Morten Kvarving
fce2056abf
fixed: make sure we do not dereference null ptrs
2012-11-26 12:53:05 +01:00
Arne Morten Kvarving
c02d4ffeb8
added: MatrixOps::saveAsc
...
save a matrix as a dense asc file for easy import into e.g. octave
note this is only useful for debugging small systems, as the asc
files grow very big and unmanageable
2012-11-26 12:53:05 +01:00
Arne Morten Kvarving
e4ad0d62df
added: MatrixOps::extractDiagonal
...
extracts the diagonal of a matrix as a new matrix
2012-11-26 12:53:05 +01:00
Arne Morten Kvarving
12a5638ab4
fixed: move Vector type under the correct namespace
2012-11-26 12:53:05 +01:00
Arne Morten Kvarving
6bd2461217
added: utilities to find complex eigenvalues of dyn and field matrices
...
this is missing in dune.
process has been started to get this integrated upstream
http://www.dune-project.org/flyspray/index.php?do=details&task_id=1186&project=1
2012-11-26 12:53:05 +01:00
Atgeirr Flø Rasmussen
a814aa618d
Add eclipse format output to SteadyStateUpscalerImplicit.
...
Option activated with output_ecl=true.
Requires libert support in opm-core. If opm-core has not been compiled
with the necessary --with-ert=</usr/local or similar> option, the program
should abort upon trying to write the output. Hopefully this enables to
keep ERT-detection macros and the like out of this module.
2012-11-26 11:04:23 +01:00
Håvard Berland
fa1f87c98d
Postpone incorporation of user-supplied surface tension to the end
...
Zero or negative user-supplied surface tension made the code
crash. Kr(Sw) is indifferent to this value, so it is
a valid fix to postpone the multiplication of surface-tension
to the vector of pressure data to the end of the code,
right before it is printed.
2012-11-25 22:08:12 +01:00
Håvard Berland
eb45f1e34d
remove debugging statement
2012-11-25 21:35:23 +01:00
Atgeirr Flø Rasmussen
26873393af
Merge pull request #14 from atgeirr/master
...
Output during upscaling run
2012-11-21 04:47:29 -08:00
Atgeirr Flø Rasmussen
ca0c3eb5f2
Write output during run. Fix init order.
...
Init order fixed so that the "unused parameters" message is correct.
2012-11-21 13:41:44 +01:00
