OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity
269 Commits 23 Branches 76 Tags 14 MiB
9fb2bfebc4
Commit Graph

269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
37e0d2148b Use input parameters outputOil and outputWater earlier. 
Avoid aborting due to lack of these paramteters at the end of a long run.
 2012-11-21 10:55:22 +01:00
Atgeirr Flø Rasmussen
668f5d63a8 Comment and formatting improvements. 2012-11-21 10:54:10 +01:00
Bård Skaflestad
a101cf61a4 Merge pull request #13 from blattms/upscale-relperm-mpi 
Initialise MPI in upscale_perm
 2012-11-19 09:46:56 -08:00
Markus Blatt
b1a516cbf1 To get rid off the whitespace changes, I moved the code in main to a new methods upscale. 2012-11-19 16:15:26 +01:00
Markus Blatt
56c00513d2 Cornerpoint grid does initiate mpi calls when compiled with MPI support. 
Therefore upscale_perm needs to initialise MPI. This is now done in the DUNE way.
 2012-11-19 15:29:34 +01:00
Atgeirr Flø Rasmussen
4f7bd9805a Merge pull request #12 from blattms/init-relperm 
Progate arguments of flowsolver to examples.
 2012-11-19 04:59:56 -08:00
Markus Blatt
74ec1b66ec Make number of iterations, prolongation factor, and number of smoothing adjustable 2012-11-19 13:44:21 +01:00
Markus Blatt
6de11bb38e Update upscale_perm.cpp and /SteadyStateUpscaler to new init method. 2012-11-19 13:09:42 +01:00
Atgeirr Flø Rasmussen
d8077112d3 Merge pull request #11 from atgeirr/master 
Fix argument order for init().
 2012-11-19 03:19:39 -08:00
Atgeirr Flø Rasmussen
b4bf9876a6 Made argument order for init() consistent. 
Related to issue #9.
 2012-11-19 12:15:26 +01:00
Bård Skaflestad
ce06b10221 Merge pull request #10 from atgeirr/master 
Adapt to change in solve() argument order.
 2012-11-16 01:17:43 -08:00
Atgeirr Flø Rasmussen
5dc9c471f3 Merge branch 'master' of github.com:atgeirr/opm-upscaling 2012-11-16 00:00:29 +01:00
Atgeirr Flø Rasmussen
2d09c43b26 Adapt to changed argument order for a method. 
IncompFlowSolverHybrid::solve() argument order has been restored, this is
the only place the new argument order (with some new arguments placed in
between old arguments) were used correctly, so it has to be changed back.
 2012-11-15 23:53:51 +01:00
Atgeirr Flø Rasmussen
3451464d46 Merge pull request #6 from bska/master 
Restore OPM-Upscaling (elasticity) Build on RHEL5 (CentOS5)
 2012-10-10 04:51:00 -07:00
Bård Skaflestad
1abdc007e3 Override Dune's notion of the HAVE_BOOST facility. 
This restores the build of opm-upscaling on systems using older
versions of Autoconf (e.g., 2.59 on RHEL5 or CentOS 5).

See commit 82369f9 in opm-core for additional details.
 2012-10-09 11:11:12 +02:00
Bård Skaflestad
ab0b9e94e9 Don't include config.h in headers. 
The config.h header is not for external consumption.  It must only
be used in programs (or .cpp files) which adapt to the local
system.  In particular, installing (as in "make install") a header
that contains an #include directive for "config.h" is always an
error.
 2012-10-09 10:59:52 +02:00
Halvor Møll Nilsen
3f6862bbd7 Removed the forcing of gravity to be zero. Added option use_gravity. The gravity is set to the standard value 2012-10-04 13:13:40 +02:00
Bård Skaflestad
077f66eaa9 Merge pull request #4 from blattms/amg-opt-march2012 
Amg opt march2012

Works as advertised.  Merged.  Thanks a lot.
 2012-10-03 10:56:34 -07:00
Atgeirr Flø Rasmussen
7f843ed800 Merge pull request #5 from bska/master 
Fix elasticity_upscale linking in presence of SuperLU
 2012-10-02 09:31:19 -07:00
Bård Skaflestad
451d6f612a Fix upscale_elasticity linking 
The per-target primary overrides the correspondingly named global
primary.  In the case of '*_LDADD' we need to include the global value
lest we miss SuperLU libraries.
 2012-10-02 18:17:02 +02:00