Commit Graph

5678 Commits

Author SHA1 Message Date
Bård Skaflestad
3094159bd6 Expand 'ignore' list with a few more auto-generated files. 2011-09-28 14:28:40 +02:00
Bård Skaflestad
ef0bac2fc0 Add gravity contributions in flux calculations.
Credit:
  Jostein R. Natvig <jostein.r.natvig@sintef.no>
2011-09-20 13:18:33 +02:00
Bård Skaflestad
e077cf6ca4 Suppress warnings about unused parameters. 2011-09-10 16:48:31 +02:00
Bård Skaflestad
2c89db5f87 Add companion output utilities based on already opened streams.
Functions csrmatrix_write_stream() and vector_write_stream() subsume
the output responsibilities of csrmatrix_write() and vector_write(),
respectively, but do not deal with opening or closing streams.  This
allows, e.g., a call such as

    csrmatrix_write_stream(A, stderr);

for debugging purposes.

Re-implement csrmatrix_write() and vector_write() in terms of
csrmatrix_write_stream() and vector_write_stream(), respectively.
2011-09-07 23:14:47 +02:00
Bård Skaflestad
7d3d468ed0 Comment copy editing.
Remove comments that bring no new information, and formalise
descriptions in a few other cases.
2011-09-06 10:14:02 +02:00
Bård Skaflestad
cdea6504b9 Merge from upstream. 2011-09-01 10:37:00 +02:00
Bård Skaflestad
035dca2b8c Merge from upstream. 2011-09-01 10:33:06 +02:00
Bård Skaflestad
03a1d1feca Silence warnings about "signed vs. unsigned" comparisons. 2011-09-01 10:28:27 +02:00
Bård Skaflestad
a56d8a7b25 Implement cset c450ec75621e wherever applicable. 2011-08-30 14:34:27 +02:00
Bård Skaflestad
abc87e170f Adapt to removal of 'const' in struct compr_quantities.
The members cannot be 'const' in C lest the structure be impossible to
create using traditional C idioms (a sequence of malloc() calls).  If
the library is to be usable in a more general context, we cannot impose
C++ specific conveniences.
2011-08-30 10:32:19 +02:00
Bård Skaflestad
c723f7d4f7 Add a simple QFS for testing from C.
Not integrated into Autotools build system.  Compile as

  gcc -g -Wall -ansi -pedantic -Wextra test_cfs_tpfa.c cfs_tpfa.c \
          well.c flow_bc.c trans_tpfa.c sparse_sys.c compr_quant.c \
      -lumfpack -llapack -lblas -lm

(or variants thereof).
2011-08-26 15:30:20 +02:00
Bård Skaflestad
85c05fc31c Free the 'dof2conn' mapping in _destroy().
This memory leak existed for a long time.
2011-08-21 21:09:25 +02:00
Atgeirr Flø Rasmussen
6138255d42 Removed unused class FluidSystemBlackoil. 2011-06-29 14:50:57 +02:00
Atgeirr Flø Rasmussen
79778eb7f6 Removed unused class FluidSystemBlackoil. 2011-06-29 14:50:57 +02:00
Atgeirr Flø Rasmussen
d326b5ca5f Added FaceFluidData. Further restructuring of fluid computations. 2011-06-29 14:20:50 +02:00
Atgeirr Flø Rasmussen
1cfc197551 Removed unused code. 2011-06-28 18:08:37 +02:00
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