Håvard Berland
e0da114593
Implement feature for truncating permeability values from above
...
Enabled by default at 100 Darcy (should be sufficient, but might
bite when someone uses this program for something else than
permeability upscaling)
2011-06-06 11:08:58 +02:00
Håvard Berland
13adc9087b
Truncate permeability values to maximum 20 Darcy (adjustable via option)
2011-06-03 14:28:55 +02:00
Håvard Berland
ab6c3947bd
merge
2011-06-03 13:23:08 +02:00
Håvard Berland
c578c908eb
Allow tweaking of linear solver parameters in upscale_perm
...
Code copied from upscale_relperm.cpp
2011-06-03 13:02:06 +02:00
Atgeirr Flø Rasmussen
bfca08fb52
Rerun the periodic testcase.
2011-06-01 15:36:51 +02:00
Bård Skaflestad
2941d67ee4
Enable silent build rules if available in Automake.
...
Automake 1.11 introduced the concept of "silent build rules" wherein the
build commands are reported as
CC output-file
rather than something along the lines of
bin/bash ../libtool --tag=CC --mode=compile gcc [...] -c -o output-file source-file
libtool: compile: gcc [...] -c source-file [...] -o .libs/output-file
The former is much easier to read and, consequently, more conducive to
visually noticing diagnostics from the toolset (compiler, linker &c).
On the other hand, only fairly recent editions of Automake have the
"silent rule" capability, so enable silent rules only if available. In
particular, Automake 1.10.x (the default Automake version in MacOS X
10.6) does not support the capability. Neither does the default
Automake in CentOS 5.6.
Further details on silent build rules can be found at
http://sources.redhat.com/automake/automake.html#Options
http://www.flameeyes.eu/autotools-mythbuster/automake/silent.html
Thanks to Arne Morten Kvarving in Dune Flyspray issue #922
(http://www.dune-project.org/flyspray/index.php?do=details&task_id=922 )
for the tip on how to preserve "configure.ac" backwards compatibility
with Automake < 1.11 .
2011-05-27 15:22:46 +02:00
Håvard Berland
13a82fc56d
merge
2011-05-26 10:57:24 +02:00
Håvard Berland
1c21d5a55b
avoid warning for possible uninitialized bctype
2011-05-26 10:57:05 +02:00
Håvard Berland
393d6884df
avoid warnings and fix one probable bug, zstart_2 was an int, should be double
2011-05-26 10:55:40 +02:00
Håvard Berland
e3328a19c4
replace all uints by 'unsigned int's
2011-05-26 10:47:57 +02:00
Atgeirr Flø Rasmussen
541446ac38
Replaced uint -> unsigned int (uint is a Linuxism).
2011-05-26 10:03:03 +02:00
Håvard Berland
de9c9ac848
add one missing space in outputted text
2011-05-24 14:47:58 +02:00
Håvard Berland
096c71c5d4
merge
2011-05-23 11:01:07 +02:00
Håvard Berland
6837de1595
warn user if there are unused parameters
2011-05-20 18:02:24 +02:00
Håvard Berland
fb8d1a8466
Add volume-pr-satnum-counting feature to cpchop
2011-05-20 17:33:26 +02:00
Kari B. Skjerve
53c07e65f3
Changed linsolver_*** from double to int
2011-05-20 13:22:26 +02:00
Kari B. Skjerve
2d5241b871
Changed varibale zstart_2 to type double (was int)
2011-05-20 12:28:42 +02:00
Kari B. Skjerve
d1352cba3e
Changed input variables linsolver_type and linsolver_verbosity from
...
double to int (as required by the function init)
2011-05-20 12:26:43 +02:00
Kari B. Skjerve
65be9d671d
Added virtual default destructor
2011-05-20 12:22:35 +02:00
Kari B. Skjerve
daa2a8b153
input arguments linsolver_type and linsolver_verbosity changed to type
...
int to be consistant to upscaler_init function
2011-05-20 12:14:35 +02:00
Håvard Berland
3d594210e3
remove unused vectors in cpchop
2011-05-19 18:43:06 +02:00
Håvard Berland
2cf6aa331e
avoid line breaks on 80-column displays in usage() in cpchop
2011-05-16 14:50:01 +02:00
Håvard Berland
f0cc9bb9a7
Output min and max coordinates in x,y and z-directions in upscale_avg
2011-05-16 14:25:30 +02:00
Kari B. Skjerve
8ad1028409
Periodic BCs for cpchop
2011-05-16 10:45:58 +02:00
Håvard Berland
b295463797
cleanup: avoid compiler warnings in upscale_cond
2011-05-12 21:25:26 +02:00
Håvard Berland
727100e060
cleanup: avoid compiler warnings
2011-05-12 19:55:32 +02:00
Håvard Berland
a15662db2a
Port minPoro-functionality from upscale_relperm to upscale_cond
2011-04-28 12:54:40 +02:00
Håvard Berland
7bed069047
add dip calculation feature to cpchop
2011-04-02 08:36:43 +02:00
Håvard Berland
d5c4087c18
fix usage information for cp* binaries
2011-04-01 22:48:41 +02:00
Håvard Berland
1436a6f50d
print usage for cpchop when no arguments supplied
2011-04-01 22:39:58 +02:00
Håvard Berland
6d04e09b45
remove unused option skiptobottom in grdecldips
2011-04-01 21:50:02 +02:00
Bård Skaflestad
e68d1f19c0
Reimplement cset 4a3ec061d6c3 in dune-upscaling.
2011-04-01 18:11:28 +02:00
Håvard Berland
8ee708bc11
ignore new executable
2011-04-01 14:45:24 +02:00
Håvard Berland
f41fa1841a
fix indentation
2011-04-01 14:38:20 +02:00
Håvard Berland
13bbbfaade
Add a new binary for listing xdips and ydips for cells in models
...
Also averages xdips and ydips. A dip is the slope along cornerpoint
edges on the top and bottom surfaces.
2011-04-01 14:36:29 +02:00
Håvard Berland
7a9988f6de
cleanup in documentation
2011-03-31 21:49:09 +02:00
Håvard Berland
508c1c5a8b
merge
2011-03-30 22:02:41 +02:00
Atgeirr Flø Rasmussen
0acbe77be6
Changed nonstandard uint->unsigned int.
2011-03-24 07:37:46 +01:00
Håvard Berland
a1fdc5f3fe
merg
2011-03-08 20:56:55 +01:00
Håvard Berland
9f01a0d32c
ignoring executables
2011-03-08 20:52:35 +01:00
Bård Skaflestad
08e4a2db2f
Ignore new executables in dune-upscaling module.
2011-03-08 09:42:52 +01:00
Håvard Berland
a62aa37967
spelling error in outputted text
2011-03-07 18:19:30 +01:00
Håvard Berland
915af2d5d2
use zresolution as default value for zlen in cpchop_depthtrend
2011-03-03 18:43:36 +01:00
Håvard Berland
7fbbec6b47
add a cpchop-variant for studying depth trends
2011-03-01 22:27:15 +01:00
Håvard Berland
8182c85b49
Add new program for doing water saturation upscaling
...
Represents a subset of the functionality in upscale_relperm
that can upscale capillary pressure as a function of global
water saturation in model. Also prints out water saturation
pr. rocktype alongside global capillary pressure
2011-03-01 18:22:18 +01:00
Håvard Berland
a6f7372de6
more cleanup; old commented-out code (pre-OPM) removed
2011-03-01 08:11:20 +01:00
Håvard Berland
2c59466971
Cleanup; remove commented out code and fix indendation
2011-03-01 08:06:35 +01:00
Håvard Berland
3ba1abe13f
hg backout of changeset 1fc8598d32fb
...
(it had the wrong commit message and should not have been
committed either)
2011-02-28 19:40:34 +01:00
Håvard Berland
9fedd8de88
allow for non-zero zmin in cpregularize
...
(allows for example grids with only negative numbers, with
zmax at zero instead)
2011-02-28 19:32:47 +01:00
Håvard Berland
ed043a5dfe
some fixes, still a rough script for deb-making
2011-02-23 23:25:18 +01:00