Commit Graph

13563 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
9901d20721 Added satRange() method to Incomp* classes and Saturation* classes.
So far not yet added to BlackoilPropertiesInterface.
2012-02-17 14:15:25 +01:00
Atgeirr Flø Rasmussen
75731efa9a Added lots of (inactive) experimental code.
The code attempts to improve #iterations in the Gauss-Seidel-like
multicell solver by improving ordering. In general, experiment failed
to improve #iterations, except for one: totally random order was the
best (for the 100x100 case tried)!
2012-02-17 09:39:45 +01:00
Atgeirr Flø Rasmussen
b5eb8543aa Added compute_sequence_graph(), which also returns the upwind graph. 2012-02-17 09:29:56 +01:00
Atgeirr Flø Rasmussen
d041c98f21 Added solveMultiCell() method to match change in interface. Currently throwing. 2012-02-15 22:52:32 +01:00
Atgeirr Flø Rasmussen
42413c6a35 Merge. 2012-02-15 22:44:15 +01:00
Atgeirr Flø Rasmussen
5a2d26360b Made reordersequence a C++ source file, in order to use std::sort().
This is for the experimental change of the graph topology, putting the
connections in the graph sorted by flux magnitude. Currently the
changes are in the file, but commented out until further experiments
have been done.
2012-02-15 22:42:07 +01:00
Atgeirr Flø Rasmussen
5b9e67518d Added solveMultiCell() interface and implementation.
- Added solveMultiCell() virtual method.
  - TransportModelInterface::reorderAndTransport() now calls solveMultiCell()
    instead of aborting if encountering multi-cell components.
  - Implemented solveMultiCell() in TransportModelTwophase by solving
    each cell individually with solveSingleCell() and repeating until
    saturation change is small (hardcoded 1e-9 for now).
2012-02-15 22:38:45 +01:00
Bård Skaflestad
232c84ff70 Reference per-cell fluid matrix when calculating phase densities.
This change repeats change-set f3bd5169811e of sibling class
BlackoilPropertiesBasic .
2012-02-15 15:37:02 +01:00
Bård Skaflestad
a8b7dc1fbb Reference per-cell fluid matrix when calculating phase densities. 2012-02-14 20:23:13 +01:00
Atgeirr Flø Rasmussen
6b60550f6e Add parameter "new_code" to switch between old and new structuring of transport solver. 2012-02-12 23:46:42 +01:00
Atgeirr Flø Rasmussen
a3dfdad3a6 Use PolymerData struct as moved to namespace Opm and defined in TransportModelPolymer.hpp. 2012-02-12 23:45:43 +01:00
Atgeirr Flø Rasmussen
8cb2af77e7 Added TransportModelPolymer class. 2012-02-12 23:30:57 +01:00
Atgeirr Flø Rasmussen
b30e64630f Moved saturation copying out of transport time measurement. 2012-02-12 23:30:28 +01:00
Atgeirr Flø Rasmussen
ddc53646d5 Catch up to header file removal in opm-core. 2012-02-12 23:29:56 +01:00
Bård Skaflestad
095dedfe41 Refactor inflow tests and flux assignments. 2012-02-10 11:40:21 +01:00
Bård Skaflestad
670e95b147 Fix spelling (interiour -> interior). 2012-02-10 11:26:48 +01:00
Bård Skaflestad
869ce15a44 Remove #include<> statement that refers to file removed in cset b4feb4a932de. 2012-02-10 11:14:35 +01:00
Atgeirr Flø Rasmussen
c279224e41 TransportModel* classes are now expected to have a custom solve() method. More:
- Using new solve() method in spu_2p.
 - solve() implemented in terms of protected superclass method reorderAndTransport().
 - Removed unused code being replaced by solve().
2012-02-10 10:48:18 +01:00
Atgeirr Flø Rasmussen
b45c42e209 Removed legacy blackoil fluid code. Further information:
- These classes were imported (copied) from the dune-porsol repository,
   and copies remain there for the time being.
 - Some of the black oil fluid classes that are in opm-core, such as the
   SinglePvt* classes, are direct descendants of the Miscibility* classes
   that have been removed.
 - At some point, we may modify dune-porsol to use the new fluid interfaces
   from opm-core, but for now we keep using the existing code as-is.
2012-02-10 09:28:05 +01:00
Atgeirr Flø Rasmussen
7de03af4c1 Made grid argument of compute_sequence() const. 2012-02-09 23:28:47 +01:00
Atgeirr Flø Rasmussen
4f0d501ac6 Refactored internals, now using modifiedRegulaFalsi() template for performance. 2012-02-09 23:17:08 +01:00
Atgeirr Flø Rasmussen
ed9cb9924e Added classes TransportModelInterface and TransportModelTwophase. 2012-02-09 16:07:53 +01:00
Xavier Raynaud
fede5f4c5f Merge from upstream. 2012-02-09 14:16:37 +01:00
Xavier Raynaud
69a08f7177 Fix build issues with static libraries on Ubuntu 11.10
Specifically, add BLAS and LAPACK routines into
${LIBS} and add checks for UMFPACK and
UMFPACK-related libraries.  OPM-Core might be
installed and fully functional, but if it depends
on UMFPACK, the AC_SEARCH_LIBS call might still fail.

See also: dune-cornerpoint commit 3a6be2aa9a45.
2012-02-09 14:16:02 +01:00
Xavier Raynaud
bba74b7182 Move Boost libraries to LDADD. 2012-02-09 14:08:17 +01:00
Atgeirr Flø Rasmussen
4a5c3d704d Added AdHocProps and changed defaults to reproduce matlab case, bugfix. 2012-02-09 09:39:43 +01:00
Atgeirr Flø Rasmussen
094ede0855 Set minimum s to 0.2 for s-iterations (temporary measure). 2012-02-09 09:05:49 +01:00
Atgeirr Flø Rasmussen
f35ef18492 Added "init_sat" parameter and made injection concentration reflect the standard testcase. 2012-02-08 15:43:06 +01:00
Atgeirr Flø Rasmussen
31e84a25cd Added parameters "dx", "dy", "dz" and "injection_rate_per_day". 2012-02-08 15:30:29 +01:00
Atgeirr Flø Rasmussen
40eb6bc889 Added cartesian grid constructor with dx, dy, dz. 2012-02-08 15:29:52 +01:00
Atgeirr Flø Rasmussen
c54fa3448f Added straightforward (more matlab-friendly) output. 2012-02-08 14:40:22 +01:00
Atgeirr Flø Rasmussen
240d69da57 Separated nonlinear controls for c and s residuals, set bracket fields. 2012-02-08 14:02:46 +01:00
Atgeirr Flø Rasmussen
d91baec858 Made two changes:
1) Use refactored vtk output, also output concentration.
   2) Make default polymer behaviour mimic matlab testcase.
2012-02-08 13:44:53 +01:00
Atgeirr Flø Rasmussen
46f29380b3 Added more (inactive) debug output. 2012-02-08 13:43:22 +01:00
Atgeirr Flø Rasmussen
e998753236 Refactored writeVtkDataGeneralGrid() to take arbitrary fields for output. 2012-02-08 13:41:58 +01:00
Xavier Raynaud
ee3335dddd Added necessary BOOST libs to build polymer_reorder program. 2012-02-07 12:32:04 +01:00
Atgeirr Flø Rasmussen
37ce9d0db3 Improved treatment of inflow (source) polymer concentration:
- solver now takes parameter for inflow_c
 - simulator calls polymerInflowAtTime(double time) for its value
 - currently starts polymer injection after 4 days (0.4 pv)
Also added some (inactive) debug printouts.
Still not working when injecting polymer.
2012-02-07 09:09:34 +01:00
Atgeirr Flø Rasmussen
493ee753b4 Change adsorption default value to something more reasonable. 2012-02-06 21:45:21 +01:00
Atgeirr Flø Rasmussen
d17cfd1372 First compiling version of full polymer residual. Not yet working. 2012-02-06 14:01:56 +01:00
Bård Skaflestad
c711133b45 Fix code on platforms for which sizeof(double)!=sizeof(double*). 2012-02-06 12:52:41 +01:00
Atgeirr Flø Rasmussen
0ad4fab860 Minor bugfix, now reproducing non-polymer results. 2012-02-06 10:45:54 +01:00
Atgeirr Flø Rasmussen
a5e1339aac Minor output fixes. 2012-02-06 09:38:44 +01:00
Atgeirr Flø Rasmussen
3828a2f630 Added timers. 2012-02-06 09:10:11 +01:00
Atgeirr Flø Rasmussen
70bf9f0373 Merge. 2012-02-06 08:54:54 +01:00
Atgeirr Flø Rasmussen
f46587bf3c Structure for c-solve in place, still not implemented residual_c(). 2012-02-06 08:54:38 +01:00
Bård Skaflestad
6b8e89e098 Implement basic memory management for new well interface.
Hook up to build, but actual location is likely to change...
2012-02-03 21:35:19 +01:00
Atgeirr Flø Rasmussen
143861745a Initial work on supporting polymer transport. Work in progress. 2012-02-03 16:39:55 +01:00
Bård Skaflestad
6ba84fa5da Split a long line to fit in eighty columns. 2012-02-03 12:38:54 +01:00
Atgeirr Flø Rasmussen
e1df60c04d Copied and renamed files and functions from opm-core as base for polymer reorder solver. 2012-02-02 16:35:55 +01:00
Atgeirr Flø Rasmussen
11b4c91d2e Reorganized and cleaned up in prep for polymer work. 2012-02-02 16:03:50 +01:00