Håvard Berland
bb7d0904b0
fix bug when only one Jfunction-file were provided for all rocktypes
...
also remove subversion keyword substitution id's
2011-02-23 18:44:58 +01:00
Atgeirr Flø Rasmussen
58d0399d5c
More test runs.
2011-02-08 12:54:30 +01:00
Håvard Berland
89044d7f73
Follow up change in EclipseGridParser with regard to unit handling
...
upscale_avg should be unit-agnostic, so we ask EclipseGridParser
not to convert from SI.
2011-02-07 19:31:23 +01:00
Atgeirr Flø Rasmussen
929d06f524
Modified programs to account for parser changes. A summary:
...
- Code using the ...Upscaler classes must supply an SI-converted parser.
- Code manipulating arrays of PERMX values (for example) must take care
to use the non-converted values, as it is usually written with millidarcies.
2011-02-04 11:18:12 +01:00
Håvard Berland
b50b13c5c9
cpchop: Do not add counter to outputted filenames if subsamples=1
...
also fix a compiler warning
2010-12-08 14:08:19 +01:00
Bård Skaflestad
16d78abd41
Update ignore list for recent executable.
2010-12-07 20:00:19 +01:00
Håvard Berland
ac474f52d8
cpregularize: change default for z_tolerance to more than zero
...
Tests show that this has a huge effect on helping
upscaling to converge for subsamples, while still being
small enough to be negligible in the grid dimensions.
2010-12-07 19:24:03 +01:00
Håvard Berland
a8b1c6eddc
fix bug: the code did not properly spread 20 cells onto 11 coarse cells
2010-12-07 15:19:36 +01:00
Håvard Berland
ed50289c3b
cpregularize: fix Makefile.am following namechange
2010-11-24 08:36:14 +01:00
Håvard Berland
a6854ab841
merge
2010-11-24 08:23:46 +01:00
Håvard Berland
7a39f78611
add new user program, cpregularize, to regularize cornerpoint grids
2010-11-24 08:22:14 +01:00
Håvard Berland
3e51abf6e3
For subsamples that fail to converge, just ignore them for now.
2010-11-24 08:12:19 +01:00
Håvard Berland
cd061a6d4f
specify minperm unit in usage()
2010-11-24 08:11:32 +01:00
Håvard Berland
934188d6c5
first version of cpregularize that might work (also changed name)
2010-11-23 23:04:17 +01:00
Håvard Berland
8aa583bfad
merge
2010-11-20 13:22:01 +01:00
Håvard Berland
15380b89c2
add minperm as an option (and a sensible default)
2010-11-20 13:13:55 +01:00
Håvard Berland
240cff0403
fix bug: convert minperm from Darcy to SI
2010-11-20 09:18:20 +01:00
Håvard Berland
7c8635d292
support minperm in cpchop and exp_variogram
...
If not, permeability upscaling will not converge for grids with
cells with zero permeability
2010-11-20 08:59:56 +01:00
Håvard Berland
78fa8166b4
more work on cp_regularize, does not compile
2010-11-17 22:34:37 +01:00
Håvard Berland
09bfdf23a3
merge
2010-11-17 21:40:42 +01:00
Håvard Berland
46648edad7
new user program, to regularize cornerpoint grids with proper upscaling. WIP!
2010-11-17 21:40:15 +01:00
Atgeirr Flø Rasmussen
fa3bc15cff
Added test result.
2010-11-11 09:54:03 +01:00
Håvard Berland
8558ba8107
reinstate two copyright lines
...
not to be considered as full shared copyright of the entire file
2010-11-09 14:01:10 +01:00
Håvard Berland
2e465a5f7b
remove copyright-line, as copyright is distributed
2010-11-08 18:19:25 +01:00
Håvard Berland
9084982db0
merge
2010-11-08 18:14:46 +01:00
Håvard Berland
5506e1b9b2
fix hgignore for exp_variogram
2010-11-08 18:05:53 +01:00
Atgeirr Flø Rasmussen
001e1ce9e7
Fixed cpchop ignore.
2010-11-08 14:33:11 +01:00
Håvard Berland
c202ce4507
first version of code for experimental variogram
2010-11-07 21:08:34 +01:00
Håvard Berland
d5edccb576
fabs is probably smarter to use than abs on floats.
2010-11-07 21:07:55 +01:00
Håvard Berland
033274edb0
allow resettoorigin to be set from command line (still WIP)
2010-11-05 18:44:45 +01:00
Håvard Berland
37ff52a502
Validate user input before chopping
2010-11-05 18:41:14 +01:00
Håvard Berland
c3b4578c8c
merge
2010-11-05 16:32:26 +01:00
Håvard Berland
3144801bdb
Removed file (moved to dune-cornerpoint repository)
2010-11-05 16:32:13 +01:00
Atgeirr Flø Rasmussen
e8c4755527
Fixed uint->size_t issues, added ignore for executables.
2010-11-05 13:03:29 +01:00
Håvard Berland
08e0ec9686
CornerpointChopper moved to dune-cornerpoint modeule
2010-11-05 12:24:07 +01:00
Håvard Berland
6faee22573
Move cpchop to examples-directory
2010-11-05 08:24:54 +01:00
Håvard Berland
680d5fb32c
fix compile errors and some warnings
2010-11-04 21:59:27 +01:00
Håvard Berland
35eff1629a
Makefiles for examples-directory. Does not compile.
2010-11-04 21:21:33 +01:00
Håvard Berland
4b538aeeb4
Add Statoils facade code for singlephase upscaling
...
Extends singlephase upscaling code to relative permeability
in capillary limit, and to conductivity upscaling based on Archie's law
2010-11-04 13:19:47 +01:00
Bård Skaflestad
cb2cd7b40f
Ignore anything named 'config.*', rather than listing ind. utils.
2010-11-01 14:59:13 +01:00
Bård Skaflestad
18927aa51e
Ignore 'cpchop' executable
2010-11-01 12:48:38 +01:00
Atgeirr Flø Rasmussen
40c2bbbbdd
Merge from havb.
2010-10-29 15:07:56 +02:00
Atgeirr Flø Rasmussen
ec5cfa7d0e
Added alternative upscaling test using the new pressure solver (not working).
2010-10-29 15:02:26 +02:00
Håvard Berland
ed95818089
Add seed to command line options (warning, zero cannot be used as seed with this implementation)
2010-10-29 14:49:13 +02:00
Håvard Berland
5fe8c02605
output position of chopped subsamples while chopping
2010-10-29 09:40:02 +02:00
Håvard Berland
8b392b262c
Add optiion to not do upscaling while chopping
2010-10-29 09:35:36 +02:00
Atgeirr Flø Rasmussen
7bd12b35bd
Added more parameters for the upscaler call.
2010-10-28 12:14:35 +02:00
Håvard Berland
518f1091ec
seed the random number generator with current time
2010-10-27 15:48:43 +02:00
Håvard Berland
98721958bd
polish textual output from cpchop, add option to output tabulated results to file
2010-10-27 12:44:23 +02:00
Atgeirr Flø Rasmussen
15e9b5154d
Fixed bug in chopper (empty fields), modified cpchop.cpp.
2010-10-26 16:27:03 +02:00
