Commit Graph

4062 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
249d5af80a Changed interface, taking pointers to data instead of vectors. 2011-06-28 13:49:02 +02:00
Atgeirr Flø Rasmussen
c68372e76b Fixed sizing bugs and more. 2011-06-28 11:17:50 +02:00
Atgeirr Flø Rasmussen
6df82bca1c Made the new compute...() methods const. 2011-06-28 10:27:41 +02:00
Atgeirr Flø Rasmussen
72388ad717 Added AllFluidData struct and its computeNew() method. 2011-06-28 10:17:36 +02:00
Atgeirr Flø Rasmussen
bdcc06782a Added more fine-grained set of methods to BlackoilFluid class. 2011-06-26 13:10:18 +02:00
Atgeirr Flø Rasmussen
f7a9cef129 Added AllFluidStates struct. 2011-06-26 13:08:08 +02:00
Atgeirr Flø Rasmussen
70ad4a00cc Moved equilibrium computations here from FluidSystemBlackoil 2011-06-24 13:28:30 +02:00
Atgeirr Flø Rasmussen
ade7520b98 Added (unused) code collecting 'A' matrix construction for faces. 2011-06-24 12:48:54 +02:00
Atgeirr Flø Rasmussen
9740519e60 Now computeEquilibrium() calls computeSingleEquilibrium(). Minor fixes. 2011-06-22 13:53:19 +02:00
Atgeirr Flø Rasmussen
6b8fabc7bc Reinstate old code that was erroneously #if'ed out. 2011-06-22 11:08:04 +02:00
Atgeirr Flø Rasmussen
bccb052c08 Using FieldMatrix<> now, initial nonworking version. 2011-06-22 10:47:33 +02:00
Bård Skaflestad
5a2739caca Refactor accumulation of fine-scale fluxes.
Specifically, move accumulation out of IFSH_MS and into a separate
function, 'coarse_sys_compute_fs_flux', in the coarse-system module.
This decoupling facilitates independent access to the projection
operation and is more natural.
2011-06-22 09:22:40 +02:00
Bård Skaflestad
b8b56ca955 Merge from upstream. 2011-06-21 22:22:04 +02:00
Bård Skaflestad
aa4f77e0db Implement prototype TPFA discretisation for local problems.
Contingent upon preprocessor symbol "USE_MIM_IP_TPFA" and only a
mimetic two-point discretisation (not cell-centred systems).  Hide
existing discretisation behind preprocessor symbol "USE_MIM_IP_SIMPLE".
2011-06-21 14:02:39 +02:00
Atgeirr Flø Rasmussen
80b268ae1a Added OpenMP pragmas to inner loops (not yet in MiscibilityLiveGas). 2011-06-20 15:15:48 +02:00
Atgeirr Flø Rasmussen
211bb7df8a Ensured that no virtual functions are called in inner loops. 2011-06-20 14:09:56 +02:00
Atgeirr Flø Rasmussen
a9add0f757 Implemented computeNew() [temporary name], which uses the new vectorized interfaces. 2011-06-20 13:30:42 +02:00
Atgeirr Flø Rasmussen
995d6542bd Remember resizing data vectors. 2011-06-20 13:30:08 +02:00
Atgeirr Flø Rasmussen
87d45453de Changed some types to those defined in BlackoilDefs.hpp. 2011-06-20 13:28:13 +02:00
Atgeirr Flø Rasmussen
55a9d82887 Implemented computeManyStates(). 2011-06-20 11:27:47 +02:00
Atgeirr Flø Rasmussen
5859573b86 Fixed typos. 2011-06-20 11:27:24 +02:00
Atgeirr Flø Rasmussen
7cbcad0c3e Implemented computeManyEquilibria() method. 2011-06-20 11:16:46 +02:00
Atgeirr Flø Rasmussen
1f9ed4421e Adapt to change of field name in FluidStateBlackoil. 2011-06-20 11:16:23 +02:00
Atgeirr Flø Rasmussen
aafc500db0 Added ManyFluidStatesBlackoil, corrected name of a field. 2011-06-20 11:15:39 +02:00
Atgeirr Flø Rasmussen
6f31f9978a Added a static assertation and two matrix types. 2011-06-20 11:13:45 +02:00
Atgeirr Flø Rasmussen
b418185aeb Implemented vectorized fluid methods in BlackoilPVT. 2011-06-17 20:27:42 +02:00
Atgeirr Flø Rasmussen
5378d429a2 Add a todo comment. 2011-06-17 15:57:39 +02:00
Atgeirr Flø Rasmussen
abebf165b2 Implemented new interface. 2011-06-17 15:57:18 +02:00
Atgeirr Flø Rasmussen
3e96ed4502 Implemented new interface. 2011-06-17 15:46:01 +02:00
Atgeirr Flø Rasmussen
40d6b42d56 Implemented new interface. 2011-06-17 15:04:37 +02:00
Atgeirr Flø Rasmussen
0ea2c1d754 Implemented new fluid interface. 2011-06-17 15:04:15 +02:00
Atgeirr Flø Rasmussen
9d1d59a570 New abstract interface computing vectors of properties. 2011-06-17 15:03:46 +02:00
Atgeirr Flø Rasmussen
b834757d12 Changed extrapolation behaviour outside tabulated R and pressure values. 2011-06-17 14:05:52 +02:00
Atgeirr Flø Rasmussen
055e0e967d Added program that writes fluid info in the (zg/zo, p) plane to matlab format. 2011-06-17 13:04:20 +02:00
Atgeirr Flø Rasmussen
bdb52341ba Added B and R factors to the state data (for easier debugging). 2011-06-17 12:59:19 +02:00
Bård Skaflestad
e15bdb5d51 Catch debugging code up to field renames in cset cb524598a847. 2011-06-14 18:27:42 +02:00
Atgeirr Flø Rasmussen
22b54326e1 Removed #include "config.h" from headers, added to sources where missing. 2011-06-09 09:21:48 +02:00
Bård Skaflestad
2b8bde1b55 Summarise the fields of struct coarse_topology. 2011-06-05 13:20:15 +02:00
Bård Skaflestad
11ae0c62ae Use (c1,c2) alias rather than neigh[] references where possible. 2011-05-31 23:06:44 +02:00
Bård Skaflestad
1cb20e7637 Increase readability of create_c2c().
Introduce two intermediate variables, c1, and c2, to hold cell numbers
during the building of the cell<->cell neighbourhood.  This reduces
the statement complexity--both for the human reader and the compiler...
2011-05-31 23:04:40 +02:00
Bård Skaflestad
eed3e5bc65 Spelling. 2011-05-28 00:08:33 +02:00
Bård Skaflestad
f825d4e23d Avoid signed/unsigned problem. 2011-05-27 23:17:44 +02:00
Bård Skaflestad
32aaacdbaa Update ignore list.
Include additional, automatically generated Autotool files.
Specifically, condense all 'config.*' files down to a single, glob
pattern.  Also, ignore all of Libtool's M4 macros in the 'm4' directory.
2011-05-27 20:15:15 +02:00
Bård Skaflestad
3d78ab39a7 Enable silent build rules by default if available.
Automake's silent rules report commands as (e.g.,)

  CC facetopology.lo

which is a lot easier to read than the more verbose default output.
Enable this report mode, but only if we're being processed by an
Automake implementation that offers this particular capability.
2011-05-27 20:07:18 +02:00
Bård Skaflestad
f316c730d0 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     cfsh.lo

rather than something along the lines of

  bin/bash ../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../../../../opmpressure/src -I..   -DMATLAB_MEX_FILE=1 -I/work/opt/matlab/R2009b/extern/include/  -O3 -DNDEBUG -std=c99 -Wall -Wextra -pedantic -march=native -mtune=native -MT cfsh.lo -MD -MP -MF .deps/cfsh.Tpo -c -o cfsh.lo ../../../../../opmpressure/src/cfsh.c
  libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../../../../opmpressure/src -I.. -DMATLAB_MEX_FILE=1 -I/work/opt/matlab/R2009b/extern/include/ -O3 -DNDEBUG -std=c99 -Wall -Wextra -pedantic -march=native -mtune=native -MT cfsh.lo -MD -MP -MF .deps/cfsh.Tpo -c ../../../../../opmpressure/src/cfsh.c  -fPIC -DPIC -o .libs/cfsh.o

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:09:58 +02:00
Bård Skaflestad
f8f6bba0cd 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     spu_explicit.lo

rather than something along the lines of

  /bin/bash ../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../../../../opmtransport/src -I..     -O3 -DNDEBUG -Wall -Wextra -std=c99 -pedantic -march=native -mtune=native -MT spu_explicit.lo -MD -MP -MF .deps/spu_explicit.Tpo -c -o spu_explicit.lo ../../../../../opmtransport/src/spu_explicit.c
  libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../../../../opmtransport/src -I.. -O3 -DNDEBUG -Wall -Wextra -std=c99 -pedantic -march=native -mtune=native -MT spu_explicit.lo -MD -MP -MF .deps/spu_explicit.Tpo -c ../../../../../opmtransport/src/spu_explicit.c  -fPIC -DPIC -o .libs/spu_explicit.o
  libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../../../../opmtransport/src -I.. -O3 -DNDEBUG -Wall -Wextra -std=c99 -pedantic -march=native -mtune=native -MT spu_explicit.lo -MD -MP -MF .deps/spu_explicit.Tpo -c ../../../../../opmtransport/src/spu_explicit.c -o spu_explicit.o >/dev/null 2>&1

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:05:02 +02:00
Bård Skaflestad
4eeb70e016 Delete trailing whitespace. 2011-05-11 15:14:34 +02:00
Bård Skaflestad
298034ea98 Consistently refer to "half-transmissibilities" as "one-sided".
While here, remove a comment that only describes the mechanics of the
following loop and does not provide any more insight.
2011-05-11 15:14:19 +02:00
Bård Skaflestad
79b5e95bc4 Merge from upstream. 2011-05-11 14:24:47 +02:00
Atgeirr Flø Rasmussen
70ff7a1b99 Three changes:
1. Changed calculation of face pressures to avoid using mobilities.
2. Added 'scratch_f' array to cfs_tpfa_impl struct (for use by above routine).
3. Changed interface of cfs_tpfa_fpress() to pass the data struct.
2011-05-11 14:17:30 +02:00