Atgeirr Flø Rasmussen
502215832d
Fix erroneous includes again.
2012-06-13 21:59:11 +02:00
Atgeirr Flø Rasmussen
7a40153e51
Added IncompTpfaPolymer class.
2012-06-13 19:56:44 +02:00
Atgeirr Flø Rasmussen
ba4ba17736
Merged.
2012-06-13 19:45:32 +02:00
Atgeirr Flø Rasmussen
29a400d622
Enable inheritance from IncompTpfa for limited purposes.
2012-06-13 19:45:23 +02:00
Xavier Raynaud
60f2fd2795
updated profiling branch.
2012-06-13 17:55:33 +02:00
Xavier Raynaud
23580678dc
merge
2012-06-13 17:54:20 +02:00
Xavier Raynaud
a7e91a0bbc
cleaned up TransportModelPolymer (default branch)
2012-06-13 17:52:07 +02:00
Xavier Raynaud
56ef0105af
fixed wrong include.
2012-06-13 17:51:47 +02:00
Bård Skaflestad
43d9d6235e
Restore build in case-sensitive file-systems.
2012-06-13 17:38:48 +02:00
Xavier Raynaud
f04f80e696
cleaned up TransportModelPolymer (profiling branch)
2012-06-13 17:36:36 +02:00
Bård Skaflestad
cc054d474d
computeFractionalFlow(): Reuse the output array in all intermediate calculations.
...
This eliminates a number of free-store operations and data movements.
2012-06-13 17:07:56 +02:00
Xavier Raynaud
ab1591df40
fixed computation of derivatives in PolymerProperties.cpp (default branch)
2012-06-13 17:07:08 +02:00
Xavier Raynaud
4732ca3bbc
Fixed computation of derivatives in PolymerProperties (profiling branch).
2012-06-13 17:01:23 +02:00
Xavier Raynaud
564ab4bc44
Removed some standard output messages.
2012-06-13 16:13:26 +02:00
Xavier Raynaud
20b87da8d5
Removed some standard output messages (profiling branch)
2012-06-13 16:12:32 +02:00
Xavier Raynaud
7257c0fe05
merge.
2012-06-13 16:08:44 +02:00
Xavier Raynaud
342d4a6c0d
merge.
2012-06-13 16:01:56 +02:00
Xavier Raynaud
acaaada2d0
merge.
2012-06-13 15:56:44 +02:00
Xavier Raynaud
4c7c439dd7
merge.
2012-06-13 15:56:09 +02:00
Atgeirr Flø Rasmussen
005cda508c
Improved docs.
2012-06-13 15:55:23 +02:00
Xavier Raynaud
cab3652c49
Added corey fluid class.
2012-06-13 15:48:09 +02:00
Atgeirr Flø Rasmussen
876335908d
Added class SimulatorPolymer.
2012-06-13 15:46:15 +02:00
Atgeirr Flø Rasmussen
bc963a2333
Removed class PolymerInflow (moved to PolymerUtilities.hpp).
2012-06-13 15:45:27 +02:00
Atgeirr Flø Rasmussen
42e862e7ec
Added TransportModelPolymer::setPreferredMethod().
2012-06-13 15:44:46 +02:00
Xavier Raynaud
ce6e21c0d6
updated polymer_reorder (profiling branch).
2012-06-13 15:44:34 +02:00
Atgeirr Flø Rasmussen
b6001c8dac
Added helper class PolymerInflow (moved from polymer_reorder.cpp).
2012-06-13 15:44:12 +02:00
Xavier Raynaud
9637906a35
Make compatible with incomptpfa (default branch).
2012-06-13 15:33:31 +02:00
Xavier Raynaud
a5de5341c5
Make compatible with incomptpfa interface.
2012-06-13 15:31:49 +02:00
Xavier Raynaud
6033527a82
Added pure Newton single cell method. Correction of Jacobi. sc formulation.
2012-06-13 15:11:30 +02:00
Atgeirr Flø Rasmussen
9766b36cf2
Removed more unused code.
2012-06-13 14:51:53 +02:00
Atgeirr Flø Rasmussen
a795166ee8
Remove unused code (wdp data now lives within IncompTpfa).
2012-06-13 14:46:19 +02:00
Atgeirr Flø Rasmussen
1e4db53e7f
Bugfix: use water saturation vector where it is expected, not full saturation.
2012-06-13 14:35:18 +02:00
Atgeirr Flø Rasmussen
ffd33be55d
Changed interface of TransportModelPolymer to expect full saturation, not just water.
2012-06-13 14:18:32 +02:00
Atgeirr Flø Rasmussen
c4b81d8da5
Removed two unnecessary arguments from TransportModelPolymer constructor.
2012-06-13 12:46:57 +02:00
Atgeirr Flø Rasmussen
07130c55f7
Updated to match change in IncompTpfa interface.
2012-06-13 10:54:00 +02:00
Atgeirr Flø Rasmussen
b1baed3ead
Initialise state variables.
2012-06-13 10:34:45 +02:00
Atgeirr Flø Rasmussen
e041407c81
Bugfixes: correct sign for pressure increment, initialise rock_comp.
2012-06-13 10:34:15 +02:00
Atgeirr Flø Rasmussen
bad5614ced
Examples and tutorials follow change to IncompTpfa interface.
2012-06-12 15:28:53 +02:00
Atgeirr Flø Rasmussen
f01622bd09
Examples and tutorials follow change to IncompTpfa interface.
2012-06-12 15:28:53 +02:00
Atgeirr Flø Rasmussen
4e4e652279
Added constructor for incompressible cases.
...
Also added computeStaticData() helper called by both constructors.
It is still possible to use the other constructor for an incompressible case,
by passing a null pointer for the rock_comp argument.
2012-06-12 15:24:31 +02:00
Atgeirr Flø Rasmussen
c7a9e84be6
Reindent.
2012-06-12 15:22:23 +02:00
Xavier Raynaud
69d0ceb9a2
merge.
2012-06-12 14:50:38 +02:00
Xavier Raynaud
41ed948c1c
Added Corey relative permeability.
2012-06-12 14:48:24 +02:00
Xavier Raynaud
2c1b7a6c66
merge
2012-06-12 14:27:34 +02:00
Xavier Raynaud
c583f4b4cd
Added corey relative permeabilities.
2012-06-12 14:07:31 +02:00
Atgeirr Flø Rasmussen
cc1038bcdc
Merged.
2012-06-12 11:17:02 +02:00
Atgeirr Flø Rasmussen
88c7b84f4e
Removed unused code.
2012-06-12 11:16:43 +02:00
Atgeirr Flø Rasmussen
14f560a295
Major simplification of IncompTpfa interface.
...
Most significant changes:
- Single solve() call used for all cases (with or without gravity,
with or without rock compressibility). This is intentionally
similar to CompressibleTpfa::solve().
- Constructor take a property object and computation of necessary total
mobilities etc. moved inside class.
- Optional constructor args for rock compressibility, gravity, wells,
boundary conditions (null pointer accepted) and source terms (empty
vector accepted).
- Nonlinear iterations for the compressible rock case now handled inside
IncompTpfa. This part intentionally made similar to CompressibleTpfa.
2012-06-12 10:27:48 +02:00
Atgeirr Flø Rasmussen
59db0f7ca9
Fix comment.
2012-06-12 10:14:26 +02:00
Bård Skaflestad
3864afe8e2
Constructor: Move common failure mode to end of if-else chain.
...
While here, add a failure mode pertaining to solvers that are
supported by the system but disabled at configure time.
2012-06-11 17:54:23 +02:00
