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
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
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
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
240d69da57
Separated nonlinear controls for c and s residuals, set bracket fields.
2012-02-08 14:02:46 +01:00
Atgeirr Flø Rasmussen
46f29380b3
Added more (inactive) debug output.
2012-02-08 13:43:22 +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
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
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
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
Bård Skaflestad
08671a1d6d
Coalesce constructors using a default value.
2012-02-01 16:40:15 +01:00
Bård Skaflestad
a785d9488e
Create minimum buildable Polymer module for OPM.
2012-02-01 16:16:30 +01:00
Jostein R. Natvig
37296545a4
1) Move extra fields found in struct CornerpointGrid into struct UnstructuredGrid.
...
2) Remove typedef grid_t
3) Remove struct CornerpointGrid.
4) handle fallout.
2012-02-01 14:56:38 +01:00
Jostein R. Natvig
04f88cee52
Add new version of well datastructure.
2012-02-01 12:16:05 +01:00
Atgeirr Flø Rasmussen
b52370e370
Added IncompPropertiesFromDeck class and its building blocks.
2012-01-31 09:41:53 +01:00
Atgeirr Flø Rasmussen
ae200b7bae
Minor comment typo fix.
2012-01-27 12:46:57 +01:00
Atgeirr Flø Rasmussen
0f8c56d922
Fixed bug in some capPress() implementations (calling wrong function). Doc fix.
2012-01-27 11:42:05 +01:00
Jostein R. Natvig
f56c67081d
Copy modifications to reorder-related codes from MRST repository
...
branches/mrst-reorg/mex/reorder-C, revision 8955.
The changes are: (1) addition of documentation of input arguments in
tarjan.c and (2) an MIT licence header (codes originated in a PhD
project).
2012-01-25 10:49:49 +01:00
Atgeirr Flø Rasmussen
22d269811f
C++ified reordering transport solver facade.
2012-01-24 13:47:00 +01:00
Atgeirr Flø Rasmussen
974b027dbf
Made sure permeability param is read as a double.
2012-01-23 13:43:45 +01:00
Atgeirr Flø Rasmussen
db8681b9ff
Updated files from MRST repository.
2012-01-20 13:09:13 +01:00
Bjørn Spjelkavik
7d6fb03142
Changed namespace Dune -> namespace Opm.
2012-01-19 13:50:57 +01:00
Atgeirr Flø Rasmussen
55102ee23f
Added classes IncompPropertiesInterface and IncompPropertiesBasic.
2012-01-18 18:50:56 +01:00
Atgeirr Flø Rasmussen
51d71c122f
Added sanity checking for number of phases in property classes.
2012-01-18 18:36:20 +01:00
Atgeirr Flø Rasmussen
014cd130a3
Added numPhases() method to SaturationProps* classes.
2012-01-18 18:31:12 +01:00
Bård Skaflestad
ed9b420fb9
Merge from upstream.
2012-01-17 16:10:23 +01:00
Jostein R. Natvig
3d40b45cd7
Add bare-bones implementation of reordering algorithm.
...
Lightly tested.
2012-01-17 14:39:09 +01:00
Atgeirr Flø Rasmussen
5bc77babb4
Documented parameters, and made unit behaviour according to doc (perm in mD etc.)
2012-01-17 14:16:28 +01:00
Atgeirr Flø Rasmussen
2d07dd2062
Added class BlackoilPropertiesBasic.
2012-01-17 12:19:50 +01:00
Atgeirr Flø Rasmussen
bf7b0ce5ec
Added class PvtPropertiesBasic.
2012-01-17 11:17:40 +01:00
Atgeirr Flø Rasmussen
125cb33c36
Added SaturationPropsBasic class.
2012-01-17 10:25:49 +01:00
Atgeirr Flø Rasmussen
c065b8633a
Added RockBasic class.
2012-01-17 09:31:25 +01:00
Atgeirr Flø Rasmussen
e3dc0dfa0e
Minor typo fix.
2012-01-17 09:31:05 +01:00
