Bård Skaflestad
f10c91bbfb
Join two short lines. Type conversion previously removed.
2010-11-19 14:49:32 +01:00
Bård Skaflestad
0a2abcae81
Merge from upstream.
2010-11-19 14:36:12 +01:00
Bård Skaflestad
6f3b1b3f16
Complete transition to all-int topology in CSRMatrix structure.
...
Having a 'MAT_SIZE_T' that is sometimes an int and sometimes an
mwSignedIndex is asking for trouble. The practical impact for OPM is
low, though, as this issue affects only the MEX interface.
2010-11-19 14:35:39 +01:00
Atgeirr Flø Rasmussen
c6198d463e
Removed unnecessary variable.
2010-11-19 14:05:03 +01:00
Jostein R. Natvig
9e3bf5ebe2
Implement simple Newton iteration.
2010-11-19 13:32:36 +01:00
Bård Skaflestad
c3b1763f55
Explicitly define all grid members. Reduces confusion.
...
This imports the opmtransport 'grid.h' changes from cset 10bf99595a6f
and cset 56cb71329d4f.
2010-11-19 10:51:16 +01:00
Bård Skaflestad
98a26c5322
Terminate struct member definition.
2010-11-19 10:39:21 +01:00
Jostein R. Natvig
15d598091a
Remove Matlab binding.
2010-11-19 10:20:48 +01:00
Jostein R. Natvig
ec27ae5707
Remove bindings to mex/matlab/mrst...
2010-11-19 10:13:27 +01:00
Jostein R. Natvig
1c86849ffc
Add basic code needed for an implicit upwind mobility-weighted solver
...
for incompressible twophase flow.
2010-11-18 18:37:00 +01:00
Atgeirr Flø Rasmussen
6ee73daad8
Initial attempt at C++ interface for compressible TPFA solver.
2010-11-18 16:02:48 +01:00
Atgeirr Flø Rasmussen
80597ffda4
Const-ified data members of compr_quantities.
2010-11-18 16:02:11 +01:00
Bård Skaflestad
c20c45bd0d
Promote MEX fluid matrix impl. to official status.
...
Specifically, move the evaluation of cell transmissibilities into
cfs_tpfa module (from original MEX implementation), and create a new
structure, 'struct compr_quantities', to hold the 'RB^{-1}' data and
(upwind) phase mobilities &c.
2010-11-18 14:37:36 +01:00
Atgeirr Flø Rasmussen
036eb373ff
Moved common enums for phase names etc. to BlackoilDefs helper class.
2010-11-15 20:11:45 +01:00
Atgeirr Flø Rasmussen
db6da9443b
Done accounting for units in PVT, relperm and pc tables.
2010-11-15 12:48:10 +01:00
Atgeirr Flø Rasmussen
01424b12bf
Working on proper units.
2010-11-15 12:41:21 +01:00
Bård Skaflestad
aab23261d7
Accommodate existing source terms in accumulation term.
2010-11-15 12:26:44 +01:00
Bård Skaflestad
652acb4e1e
Evaluate cell pressure in an existing cell rather than outside...
2010-11-15 12:25:43 +01:00
Atgeirr Flø Rasmussen
532c6c5652
Work in progress on ensuring units are done correctly.
2010-11-15 11:36:26 +01:00
Bård Skaflestad
0e190f8630
Upwind mobility strategy for computing flux/if-pressures.
...
Derive interface pressure values from fluxes rather than the other way
around.
Suggested by: Jostein R. Natvig
2010-11-15 10:29:23 +01:00
Atgeirr Flø Rasmussen
d835d4fbb6
Added proper copyright notice to files imported from samcode.
2010-11-15 07:57:36 +01:00
Atgeirr Flø Rasmussen
9a1f4180d2
Now FluidSystemBlackoil uses the BlackoilPVT class for implementation.
2010-11-12 13:35:11 +01:00
Atgeirr Flø Rasmussen
6893452661
Removed, PVT functionality now in BlackOilPVT.
2010-11-12 13:29:46 +01:00
Atgeirr Flø Rasmussen
00673d9367
Changed namespace to Opm.
2010-11-12 13:28:55 +01:00
Atgeirr Flø Rasmussen
bc1c40a03a
Fixed to account for move in last commit.
2010-11-12 13:21:46 +01:00
Atgeirr Flø Rasmussen
f942d63bd4
Moved remaining fluid files to subdirectory.
2010-11-12 13:20:46 +01:00
Atgeirr Flø Rasmussen
45bf24c9b1
Added lots of stuff originally from the samcode repository.
2010-11-12 13:18:27 +01:00
Atgeirr Flø Rasmussen
99e398a826
Added a fluid system class.
2010-11-11 15:18:18 +01:00
Bård Skaflestad
afeda5a95a
Use pure htrans strategy for computing fluxes/if-pressures.
...
Still wrong. Wrong: R-O-N-G. Wrong.
2010-11-11 14:47:17 +01:00
Bård Skaflestad
112c4503f3
Merge from upstream.
2010-11-11 09:41:16 +01:00
Atgeirr Flø Rasmussen
777f3129e0
Updated after nf parameter was removed.
2010-11-11 09:16:49 +01:00
Bård Skaflestad
15dee31a1e
Ignore Autotools output.
2010-11-10 15:28:51 +01:00
Bård Skaflestad
1ffc7449f0
Compute real Darcy flux in cfs_tpfa_press_flux().
...
The previous edition made the grave mistake of summing the mass fluxes
per face. This does not make sense.
Pointed out by: Jostein.R.Natvig@sintef.no
2010-11-10 14:31:30 +01:00
Atgeirr Flø Rasmussen
4f4e837a87
Implemented FluidMatrixInteractionBlackoil init(), kr() and a test prog.
2010-11-10 13:31:32 +01:00
Atgeirr Flø Rasmussen
e8a9b6767b
Implemented FluidMatrixInteractionBlackoil init(), kr() and a test prog.
2010-11-10 13:31:32 +01:00
Jostein R. Natvig
3513df0975
Add m4 directory with BLAS and LAPACK checks.
2010-11-10 10:39:48 +01:00
Jostein R. Natvig
ac71f1092f
* Move source code to src directory.
...
* Add autotools build system for opmtransport library.
2010-11-10 10:29:41 +01:00
Bård Skaflestad
5600f8d505
Add flux and face-pressure computations.
...
Specifically, introduce utilities compute_fpress() and
compute_flux(). The former is needed to implement the latter across
external boundary faces. Moreover, interface pressure values are
needed to evaluate fluid properties on faces (specifically R/B).
Add small gateway routine, cfs_tpfa_fpress(), to allow callers to
recover interface pressure values. Re-implement cfs_tpfa_press_flux()
in terms of compute_fpress() and compute_flux().
Also, add fields 'fpress' and 'fpaccum' to struct cfs_tpfa_impl.
2010-11-09 12:52:31 +01:00
Bård Skaflestad
7d668267cf
Remove unused variable.
2010-11-09 10:03:42 +01:00
Bård Skaflestad
d7a80b1082
Merge from jrn.
2010-11-08 14:13:09 +01:00
Atgeirr Flø Rasmussen
df226cc2a4
Created a new utility class, UniformTableLinear.
2010-11-08 14:12:10 +01:00
Bård Skaflestad
fbed044c94
Don't enforce p[0]=0 for non-Neumann problems.
2010-11-06 19:16:23 +01:00
Jostein R. Natvig
43ec21e382
Remove unnecessary argument in mim_ip_simple_all; fix affected code;
...
as suggested by bska.
2010-11-05 22:05:55 +01:00
Bård Skaflestad
223681b8c4
Use a 'P' sign that is somehow related to the equation we're solving
...
The former definition was inherited from the hybrid solver in MRST and
not really applicable to compressible TPFA.
2010-11-05 16:58:19 +01:00
Bård Skaflestad
8780df0a55
Tentatively add boundary condition support.
...
We currently handle only Dirichlet (pressure) BC's, and the feature is
largely untested. More work remaining.
2010-11-04 19:05:41 +01:00
Bård Skaflestad
7b692205ae
Merge from upstream sources.
2010-11-03 18:50:45 +01:00
Bård Skaflestad
08ae534fa5
Correct silly mistake in defining hface phase contribs.
...
We were only advancing the phase contrib once per cell, but need a
different contribution for each face for each cell...
2010-11-03 18:08:02 +01:00
Bård Skaflestad
1640925cd1
Move compressible support utilities to cfs_tpfa module.
...
We may wish to generalise this part into real utility functions but
for now, leave the functionality where it is most directly needed.
Rename the functions to highlight relationship to compr. tpfa.
2010-11-03 14:55:23 +01:00
Bård Skaflestad
a0208b30dc
Add compressible TPFA solver to build.
2010-11-03 14:50:26 +01:00
Atgeirr Flø Rasmussen
d6fd317c66
Added code to check the grid adapter, normals in C now area-weighted.
2010-11-02 14:25:29 +01:00