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
223 Commits 23 Branches 76 Tags 14 MiB
ab0b9e94e9
Commit Graph

223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingeborg Ligaarden
e47cf2632b Merge. 2011-12-13 11:19:37 +01:00
Ingeborg Ligaarden
41212d5acd Catch exception if initialisation of capillary limit fails and then initialize by uniform distribution (thresholded by saturation limits). Also move check/correction of saturation limits (max/min saturation). 2011-12-13 10:49:11 +01:00
Bård Skaflestad
44d8ecdb88 Hook new example 'upscale_relpermvisc' up to build. 2011-12-12 21:23:08 +01:00
Kari B. Skjerve
bb9c657d16 added upscale_relpermvisc.cpp - relperm upscaling in viscous 
limit. Not tested yet, committed due to structural changes in repo
 2011-12-12 12:14:08 +01:00
Kari B. Skjerve
1810dfc754 added relative permeability upscaling in viscous limit (not testet, 
checked in due to structural changes in repo)
 2011-12-12 12:12:10 +01:00
Ingeborg Ligaarden
a9d30e2143 Changed default init_stepsize and max_stepsize. 2011-12-09 14:49:38 +01:00
Atgeirr Flø Rasmussen
ae6cd9723f Changed name of executable. 2011-12-09 13:34:35 +01:00
Atgeirr Flø Rasmussen
6ae03765f8 Added new method setToCapillaryLimit() and parameter start_from_cl. 2011-12-09 12:56:38 +01:00
Atgeirr Flø Rasmussen
bdfe8c8884 Removed "uint" linuxism, changed isnan() and friends into std::isnan() etc. 2011-12-06 10:43:34 +01:00
Ingeborg Ligaarden
5dd9ea32b4 Merged changes. 2011-11-25 15:08:48 +01:00
Ingeborg Ligaarden
a8b5c886e4 Fix indentation. 2011-11-23 18:13:31 +01:00
Ingeborg Ligaarden
a787904dfa Initalize with s_min+1e-4 and s_max-1e-4. 2011-11-23 18:09:53 +01:00
Ingeborg Ligaarden
cf96539d7b Initialize system with s_min < s < s_max. 2011-11-18 17:51:25 +01:00
Kari B. Skjerve
91510ba38a Fixed bug in output print 2011-10-27 10:43:40 +02:00
Halvor M. Nilsen
865a342306 changed to only compiling two tests 2011-10-24 11:10:28 +02:00
Halvor M. Nilsen
5d5b6dd344 fixed spu_2p.cpp after change of interface of implicit transport 2011-10-24 10:33:34 +02:00
Halvor M. Nilsen
eaefebf8ab corrected initial timestep setting; corrected mistake with not 2011-10-18 15:21:11 +02:00
Halvor M. Nilsen
fc8d2bf2c2 checking after getting things to run, I do not trust the results 2011-10-14 16:46:09 +02:00
Bård Skaflestad
3612b52d58 Restore build of all examples. 
Disable 'test_array' programme.  Sources missing.
 2011-10-13 15:52:34 +02:00
Halvor M. Nilsen
19d8233a53 checking after changing back to grid interface euler in traits and adding boundary conditions for fixed, the code finialy does something 2011-10-13 10:26:51 +02:00
Halvor M. Nilsen
f2389aa9be mearge from upstream 2011-10-12 13:23:20 +02:00
Halvor M. Nilsen
c615044a20 removed error chekin 2011-10-12 13:20:42 +02:00
Halvor M. Nilsen
7e3ac791ae changes to try to make upscaling work with implicit solver 2011-10-12 13:18:48 +02:00
Halvor M. Nilsen
746e84a3ce things compile with out using implicit 2011-10-12 09:31:26 +02:00
Bård Skaflestad
0e14a4f0f1 Ignore executable added in cset 8bbebabdf00c . 2011-10-11 17:46:26 +02:00
Halvor M. Nilsen
31688c75da modifications to introduce implicite upscaler: does nothing 2011-10-11 11:43:29 +02:00
Halvor M. Nilsen
582d28a12f Update for sub-repo state changes. 2011-10-07 16:21:34 +02:00
Halvor M. Nilsen
983ec49a22 added cpp file to test intended to test the implicit solver 2011-10-07 15:52:15 +02:00
Halvor M. Nilsen
ddddfe2a98 added traits definition intended to be implicit traits 2011-10-07 15:51:21 +02:00
Håvard Berland
3ff84b947a Bugfix upscale_cap: Crashed due to division by zero 
upscale_cap crashed if there were unused SATNUM values, e.g
you only used SATNUM 1 and 3 in your grid. Then it would crash
trying to calculate Sw-values for the rocktype with zero
porevolume.
 2011-09-29 14:35:23 +02:00
Kari B. Skjerve
155fe8d685 Changed output for dips. Added option for azimuth displacement 2011-08-30 14:48:01 +02:00
Kari B. Skjerve
07779105ad Added capillary pressure upscaling option 2011-08-15 13:26:46 +02:00
Kari B. Skjerve
9f3abcb74e added saturation endpoint option to cpchop 2011-07-05 14:22:57 +02:00
Håvard Berland
ec721b8f96 Change handling of non-monotoneness in upscale_cap versus upscale_relperm 
(revert of two last commits)

We now allow for pc vs sw to be non-strictly-monotone, because all
we need it for is to print a table.

Even better solution would be to use chopFlatEndpoints() and
shrinkFlatAreas() as in upscale_relperm.cpp, but this requires more
bookkeeping in upscale_cap.cpp due to watersaturation_rocktype[satidx]
 2011-06-29 14:48:41 +02:00
Håvard Berland
43d5d59c5a fix bug in last commit (did not compile, it was only a partial port) 2011-06-29 13:33:14 +02:00
Håvard Berland
5bd47a9ba4 increase robustness of upscale_cap similarly to upscale_relperm 2011-06-29 13:30:01 +02:00
Håvard Berland
05cd8a3750 merge 2011-06-27 10:54:53 +02:00
Håvard Berland
35ba9a81da include the used seed in cpchop output 
might come in handy for debugging strange upscaling values that may
arise.
 2011-06-27 10:52:53 +02:00
Håvard Berland
51d764b93e cleanup in version strings that has not been updated since svn-times 2011-06-24 14:13:40 +02:00
Håvard Berland
a427a2840e decrease saturationThreshold in upscale_relperm with factor 10 
Avoids some visible minor output changes that we prefer not to see
 2011-06-24 14:03:44 +02:00
Håvard Berland
0105984a5f fix regression on SI units handling in upscale_cap 2011-06-24 14:00:55 +02:00
Atgeirr Flø Rasmussen
9ba891b7cc Update substate. 2011-06-08 08:56:32 +02:00
Håvard Berland
65c02051a7 Increase maxPerm to 100 Darcy by default 2011-06-07 08:06:54 +02:00
Håvard Berland
35a3176693 Backed out changeset 076a86d8b803, it segfaults 
The use of setPermeability did not work for upscale_perm as it did for
upscale_relperm. Deep down in ReservoirPropertyCommon it says
'use with caution', there might be something to it
 2011-06-07 08:05:23 +02:00
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