Bård Skaflestad
7ee28e1daa
Merge from upstream.
2012-05-21 19:27:58 +02:00
Bård Skaflestad
9bbeec19d0
Add doxygen documentation of compute_sequence*().
2012-05-21 19:20:32 +02:00
Bård Skaflestad
4588c40a30
Assert that the number of strongly connected components is in [1 .. nc].
2012-05-21 18:53:08 +02:00
Atgeirr Flø Rasmussen
b5d3615fa5
Some initial testing of CompressibleTpfa done.
...
Fixed bug in pressure update from increments.
Change injection wellperf_phasemob_ to be same as cell mobilities.
Improve iteration reporting.
2012-05-21 16:42:03 +02:00
Atgeirr Flø Rasmussen
4245c97536
Update to match WellState::init() interface change.
2012-05-21 16:39:39 +02:00
Atgeirr Flø Rasmussen
2bce30d9f7
Initialize WellState::bhp() to cell pressures of first perforation.
2012-05-21 16:39:05 +02:00
Bård Skaflestad
81b8a3437c
White-space adjustments. Mostly splitting long lines in declarations.
2012-05-21 16:37:06 +02:00
Bård Skaflestad
0b2ce3d69b
M-x whitespace-cleanup
2012-05-21 15:27:32 +02:00
Bård Skaflestad
eb16fe77c6
Remove long-disabled code.
2012-05-21 15:27:19 +02:00
Bård Skaflestad
b5a5c74cf6
Prefer std::vector<> over explicit malloc()s.
2012-05-21 15:26:46 +02:00
Bård Skaflestad
27bb7a4854
Implement compute_sequence*() in terms of compute_reorder_sequence_graph().
...
While here, insert various white-space adjustments.
2012-05-21 15:23:36 +02:00
Bård Skaflestad
7645733fb9
Clean up implementation.
...
Specifically: Remove an unused header (stdio.h), replace <stdlib.h> by
its C++ counterpart (<cstlib>), and reference malloc() and free() from
the std:: namespace.
2012-05-21 15:01:53 +02:00
Bård Skaflestad
f7fa8b74fd
Partly doxygenise the tarjan() function.
2012-05-21 14:49:51 +02:00
Atgeirr Flø Rasmussen
57fe2cf237
Update comments in implementation file.
2012-05-21 14:48:09 +02:00
Atgeirr Flø Rasmussen
6be6b9fb59
Improve solver output in Newton iterations.
2012-05-21 14:08:38 +02:00
Atgeirr Flø Rasmussen
5deeed1dac
Added initBlackoilSurfvol() function.
2012-05-21 14:03:56 +02:00
Atgeirr Flø Rasmussen
3419e6e92b
Bugfix: set nphases properly.
2012-05-21 14:03:33 +02:00
Atgeirr Flø Rasmussen
83856a47ef
Initialize size of wellperf_gpot_ properly.
2012-05-21 13:13:13 +02:00
Atgeirr Flø Rasmussen
9296e3056e
Make proper calls to pressure solver. Work in progress.
2012-05-21 13:08:48 +02:00
Atgeirr Flø Rasmussen
88f77e8dd6
Finished untested version of CompressibleTpfa.
2012-05-21 12:58:42 +02:00
Atgeirr Flø Rasmussen
f8b3a8d343
Added loop control and reporting to CompressibleTpfa.
2012-05-21 12:48:54 +02:00
Atgeirr Flø Rasmussen
521827c9d1
Added tolerance and maxiter arguments to CompressibleTpfa.
2012-05-21 11:24:12 +02:00
Atgeirr Flø Rasmussen
3342424a50
Fixed a bug in non-linear Gauss-Seidel column segregation solver.
...
With columns containing an odd number of cells, middle cell would
get solved twice, and the second time with incorrect s0.
We still solve twice, but with correct s0.
2012-05-21 11:11:06 +02:00
Atgeirr Flø Rasmussen
6d07dd9e10
Sending *dynamic* pressures to assembly function...
2012-05-21 10:47:21 +02:00
Atgeirr Flø Rasmussen
2add19a2e1
Sending initial pressures to assembly function.
2012-05-21 10:36:10 +02:00
Atgeirr Flø Rasmussen
af76b390d2
Added initialization of face pressures.
2012-05-21 10:19:12 +02:00
Atgeirr Flø Rasmussen
96c92284a3
Added initFacePressure() function.
2012-05-21 10:10:52 +02:00
Atgeirr Flø Rasmussen
91cbc6bb72
Evaluation of dynamic properties for CompressibleTpfa.
2012-05-21 10:10:35 +02:00
Atgeirr Flø Rasmussen
2bab1acdb6
Work in progress on CompressibleTpfa.
...
- Changed contstruction, now takes property object.
- Well potentials done.
2012-05-18 11:10:31 +02:00
Atgeirr Flø Rasmussen
fac1c24fba
Added support for pressure-dependent viscosity to SinglePvtConstComp class.
...
This is the class that handles PVTW and PVCDO inputs.
2012-05-18 11:08:51 +02:00
Kjetil Olsen Lye
bfcc856d4b
merge.
2012-05-16 17:00:09 +02:00
Kjetil Olsen Lye
415c6b650f
created first draft of well tutorial
2012-05-16 16:58:05 +02:00
Xavier Raynaud
b7139e07b5
Added necessary #include.
2012-05-16 16:08:48 +02:00
Atgeirr Flø Rasmussen
a1665d9902
Suppressed some warnings.
2012-05-16 15:56:04 +02:00
Atgeirr Flø Rasmussen
e57ef29fae
Work in progress on compressible pressure solver.
2012-05-16 15:49:02 +02:00
Atgeirr Flø Rasmussen
30218d84ea
Started adding necessary parameters to pressure solver. Work in progress.
2012-05-16 14:38:55 +02:00
Atgeirr Flø Rasmussen
9ad4272bc2
Start using WellState class.
2012-05-16 14:38:17 +02:00
Atgeirr Flø Rasmussen
7bb007f526
Added WellState class.
2012-05-16 14:37:55 +02:00
Atgeirr Flø Rasmussen
bd5b8e9d29
Added necessary #include.
2012-05-16 14:37:39 +02:00
Atgeirr Flø Rasmussen
3740242d7a
Removed macro disabling initialization code.
2012-05-16 14:16:12 +02:00
Atgeirr Flø Rasmussen
cc0097d8b9
Fix bug related to arithmetic if operator ( ? : ).
2012-05-16 14:15:50 +02:00
Atgeirr Flø Rasmussen
61f5343b9d
Merged.
2012-05-16 12:55:05 +02:00
Atgeirr Flø Rasmussen
79cdeaa5df
Added initStateBasic() overload taking BlackoilPropertiesInterface props.
2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
3d44427065
Follow changes to TwophaseState class and initState*() functions.
2012-05-16 12:54:12 +02:00
Atgeirr Flø Rasmussen
99330b219e
Silence a warning.
2012-05-16 12:52:58 +02:00
Atgeirr Flø Rasmussen
4c37676338
Renamed initTwophaseStateBasic() -> initStateBasic().
2012-05-16 12:33:42 +02:00
Atgeirr Flø Rasmussen
9379263646
Renamed initStateTwophaseFromDeck() -> initStateFromDeck().
...
- Made initStateFromDeck() into a template taking arbitrary properties.
Implementation detail:
- initWaterOilContact() was also templatized on props.
- initHydrostaticPressure() is now overloaded on prop interface types.
2012-05-16 11:37:31 +02:00
Bård Skaflestad
f619d1d909
Don't #include EclipseGridInspector for the side effect of <tr1/array>
2012-05-16 11:13:38 +02:00
Atgeirr Flø Rasmussen
58756f0ba5
Remove unneeded debug output.
2012-05-16 09:24:34 +02:00
Bård Skaflestad
aaeedd8679
WCONINJE: Distinguish injectors based on first character only.
...
This is the completion of change-set e6015b19c4e8 from WellsGroup.cpp .
2012-05-16 00:50:23 +02:00
