Commit Graph

248 Commits

Author SHA1 Message Date
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
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
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
Atgeirr Flø Rasmussen
3302c99140 Merge pull request #3 from akva2/master
Integrate the elasticity upscale module
2012-10-01 08:05:32 -07:00
Markus Blatt
f8bc5a37ab Merged AMG optimization changes with latest version of master 2012-09-26 21:36:48 +02:00
Arne Morten Kvarving
dbf0e90913 fix: update library the application links to 2012-09-26 14:37:02 +02:00
Arne Morten Kvarving
d1f6508d7a fix: compile without superlu 2012-09-26 14:03:40 +02:00
Arne Morten Kvarving
7dea98b2d5 fix: Make libelasticityupscale a normal library 2012-09-26 10:43:49 +02:00
Arne Morten Kvarving
fbf45bfc73 fix: put elasticity code in the Opm::Elasticity namespace 2012-09-26 09:39:32 +02:00
Arne Morten Kvarving
465c92bef9 fix: pop the language in autoconf 2012-09-26 09:39:07 +02:00
Markus Blatt
3e03dab67f Added missing semicolon. 2012-09-25 16:36:15 +02:00
Arne Morten Kvarving
e186c0a543 added: integrate dune_elasticity_upscale
this merges the elasticity upscale module with the
opm upscale module. summary of changes:
 - add a new subfolder dune/elasticity with the helper classes
 - add the main program as examples/upscale_elasticity
2012-09-25 15:51:05 +02:00
Arne Morten Kvarving
43d7d886fd added: OpenMP support to build system 2012-09-25 15:04:08 +02:00
Markus Blatt
cd6ff80fd2 - Added the possibility to set the factor used to scale the prolongation
- Added the possibility to set the number of iterations A.M() make no sense for large matrices.
- Added the possibility to set the number of smoother steps to use.
- Added upscaling_relperm binaries for anisotropic criterion and for different smoothers:
  upscale_relperm: default criterion with ILU0 smoother
  upscale_relperm_aniso: Use settings for anisotropic problems with ILU0 smoother
  upscale_relperm_ssor: default criterion with SSOR smoother
  upscale_relperm_aniso_ssor: default criterion with SSOR smoother
  upscale_relperm_bgs: default criterion with Block Gauss-Seidel smoother
  upscale_relperm_aniso_bgs: default criterion with block Gauss-Seidel smoother
2012-09-25 14:31:58 +02:00
Alf Birger Rustad
f77742c79b Merge pull request #2 from blattms/master
facilitate out of source builds
2012-09-06 05:25:20 -07:00
Markus Blatt
9f2d90072b Added $(top_srcdir) to AM_CPPFLAGS to facilitate out of source builds. 2012-09-06 14:00:13 +02:00
Bård Skaflestad
22b1be3d50 Merge pull request #1 from laods/master
Enable parallel feature of upscale_relperm
2012-07-17 00:59:26 -07:00
Lars Vingli Odsæter
38165f3ab7 Renamed macro USEMPI to HAVE_MPI in upscale_relperm.cpp so that the parallel implementation can be built in the DUNE setting 2012-07-16 08:23:34 +02:00
Bård Skaflestad
70a908c0fa Override Dune-ISTL's HAVE_BOOST symbol.
Use OPM-Core's `have_boost_redef.hpp' facility to effect the symbol
overriding.  Using Boost in OPM-Uscaling is non-optional.
2012-07-12 15:38:20 +02:00
Bård Skaflestad
43ce65464f Don't include <config.h> in headers.
The conventional wisdom is to include <config.h> only in
implementation (i.e., ".cpp") files.  Especially if we're producing
a header-based library and not installing <config.h>.
2012-07-12 14:10:26 +02:00
Roland Kaufmann
c4d99e3ea1 Specify namespace of math functions to avoid name clashes
In the 4.6.x range of GNU compilers, the cmath header include math.h, adding
isinf() and isnan() to the global namespace as well as std. When used in if
statements, there is then an ambiguity between the std version which returns
bool and the global function which returns int; for more details see:
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48891>

If we qualify the functions explicitly with their namespace, this error goes
away.
2012-06-27 15:04:41 +02:00
Roland Kaufmann
8bb70d9300 Update documentation directory to reflect change in branding
This really should have been done as part of commit b6d492.
2012-06-27 14:55:34 +02:00
Roland Kaufmann
b6d4921f86 Change branding from DUNE to OPM
Only the configuration files where the library name is mentioned are changed.
Renaming the directory dune/ to opm/ would require massive change through-out
the code.
2012-06-26 01:42:58 +02:00
Roland Kaufmann
35607f5623 Convert ignore file from Mercurial to Git 2012-06-25 23:25:45 +02:00