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
Håvard Berland
74a6465be1
Add perm-upscaling on the fly for subsamples. cpchop segfaults for the moment
2010-10-26 13:29:46 +02:00
Håvard Berland
8197d97cfe
Do porosity upscaling on the fly, and output as a list in the end
2010-10-26 13:22:35 +02:00
Håvard Berland
702e3b4201
correct output behaviour, and start sample ids on 1 instead of zero
2010-10-26 12:48:03 +02:00
Håvard Berland
32d59fc002
Only output subsample as grid files if a filebase is supplied
2010-10-26 12:45:17 +02:00
Atgeirr Flø Rasmussen
30a47a1988
Uses default construction of sub-parser instead of copy construction.
2010-10-25 13:56:07 +02:00
Atgeirr Flø Rasmussen
d22e6a86ca
Now a subparser may be returned from the chopper.
2010-10-25 13:37:14 +02:00
Atgeirr Flø Rasmussen
2e1e956a98
Merged typo fix from havb.
2010-10-25 11:45:47 +02:00
Atgeirr Flø Rasmussen
35030358d5
Thresholded uniform_real argument.
2010-10-25 11:43:45 +02:00
Atgeirr Flø Rasmussen
4d4a13aa0a
Added all functionality, not tested yet.
2010-10-25 11:41:24 +02:00
Atgeirr Flø Rasmussen
aa909766ef
Minor mods, following requirements from HB more carefully.
2010-10-25 10:17:33 +02:00
Atgeirr Flø Rasmussen
cfa2e98a1e
Refactored code out of main() into a separate class.
2010-10-25 10:12:40 +02:00
Atgeirr Flø Rasmussen
5eb03b2ed8
Added zmin/zmax check and printout.
2010-10-25 08:59:11 +02:00
Atgeirr Flø Rasmussen
a0fae7c70e
Properly shoeboxing.
2010-10-25 08:31:05 +02:00
Håvard Berland
13bb3faa74
PERMZ typo
2010-10-22 15:01:31 +02:00
Atgeirr Flø Rasmussen
c91099c0f4
Added PERMX and PERMY output.
2010-10-22 11:35:22 +02:00
Atgeirr Flø Rasmussen
cd47dd8c8c
Added first version of cpchop program. Still work in progress.
2010-10-22 11:20:57 +02:00
Atgeirr Flø Rasmussen
5b0b68dfd7
Added ignores.
2010-10-13 14:13:44 +02:00
convert-repo
3bff6b4c6b
update tags
2010-10-13 11:08:31 +00:00
Atgeirr Flø Rasmussen
6a5e338734
Merged things from havb.
2010-10-01 09:11:21 +02:00
Håvard Berland
8ed2b9a342
avoid warning, and add TODO for a function (no issue tracker yet)
2010-09-27 20:45:05 +02:00
Atgeirr Flø Rasmussen
d4caf1a2d4
Fixed silly merge conflict.
2010-09-27 14:03:30 +02:00
Atgeirr Flø Rasmussen
15b20d2c2f
Work in progress on C++ ifsh interface.
2010-09-27 14:01:15 +02:00
Atgeirr Flø Rasmussen
114cd7ab1a
Added new parameter maximum_mobility_contrast (default 1e9) to steady state upscaling.
...
Changed default of relperm_threshold to 1e-8 (was 1e-4).
Combined, the two acts as relative and absolute thresholds for phase mobilities.
2010-09-27 13:59:32 +02:00
Håvard Berland
19daf1a8a6
Output computed relperm to file by default, and output in Voigt notation
2010-09-27 12:32:03 +02:00
Atgeirr Flø Rasmussen
9576b06eb5
Added new parameter same_matrix to the solve() method of IncompFlowSolverHybrid,
...
defaulting to false. If true, we are solving again with the same system matrix,
i.e. only boundary values have changed. Changes to saturation, mobilities, or
boundary condition structure (for example Dirichlet vs. Neumann) change the
matrix, and calling solve() with same_matrix == true will fail in these cases.
The gain from setting same_matrix to true is currently only that the AMG
preconditioner will not be remade.
Added same_matrix parameter to solve() call in UpscalerBase::upscaleEffectivePerm().
This is set to true for Periodic and Linear cases, for the second and third solves.
Added timing data that demonstrate the speed gain for periodic boundary conditions.
2010-09-23 16:34:13 +02:00
Bård Skaflestad
d392b97944
Adjust include paths, link statements and M4 calls.
...
Dunecontrol completes in dune-upscaling.
2010-08-23 13:23:52 +00:00
Bård Skaflestad
2a2f2a95fa
Move upscaling code to separate module .
2010-08-23 09:34:14 +00:00
Bård Skaflestad
cef76ee3e6
Add SVN infrastructure for upscaling solvers.
2010-08-23 08:04:06 +00:00
