Bård Skaflestad
4b6b8c0def
Realign function prototypes. No functional changes.
2012-05-24 14:36:53 +02:00
Bård Skaflestad
7970d426ef
csc_deallocate(): Remove useless non-NULL checks. Free(NULL) is a no-op.
2012-05-24 13:23:38 +02:00
Atgeirr Flø Rasmussen
5c15895e74
Implemented more error policies for regula falsi solver. Use in reorder code.
...
We have switched to WarnAndContinueOnError instead of ThrowOnError,
to reduce the annoyance factor when suffering from a minor error in
a long simulation run.
2012-05-24 10:21:38 +02:00
Atgeirr Flø Rasmussen
733129a1a9
Policy-based design enables custom error handling in scalar regula falsi.
2012-05-24 10:02:14 +02:00
Bård Skaflestad
664e0eadef
initBlackoilSurfvol(): Use loop order consistent with column-major ordering.
2012-05-21 21:03:43 +02:00
Bård Skaflestad
36d21ec747
Fix spelling: Furhtermore -> Furthermore.
2012-05-21 20:04:04 +02:00
Bård Skaflestad
e53ec76d78
Re-adjust comment white-space.
2012-05-21 20:01:55 +02:00
Bård Skaflestad
fa2d0904b5
Enforce singular agreement.
2012-05-21 20:00:08 +02:00
Bård Skaflestad
71a3ac9e17
Fix misprint concerning the valid components.
...
These are 0..*ncompoents-1, not 0..*ncomponents inclusive.
2012-05-21 19:58:02 +02:00
Bård Skaflestad
5b9ff02633
Mention that the flux parameter is assumed to include the boundary.
2012-05-21 19:56:46 +02:00
Bård Skaflestad
8b979e3c44
Merge from upstream.
2012-05-21 19:27:58 +02:00
Bård Skaflestad
c99a9a798a
Add doxygen documentation of compute_sequence*().
2012-05-21 19:20:32 +02:00
Bård Skaflestad
7c7c4f1b31
Assert that the number of strongly connected components is in [1 .. nc].
2012-05-21 18:53:08 +02:00
Atgeirr Flø Rasmussen
c6c92c0466
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
780a47f651
Initialize WellState::bhp() to cell pressures of first perforation.
2012-05-21 16:39:05 +02:00
Bård Skaflestad
1eeafa1918
White-space adjustments. Mostly splitting long lines in declarations.
2012-05-21 16:37:06 +02:00
Bård Skaflestad
874e6f6bce
M-x whitespace-cleanup
2012-05-21 15:27:32 +02:00
Bård Skaflestad
0b19ec6370
Remove long-disabled code.
2012-05-21 15:27:19 +02:00
Bård Skaflestad
dea3741c1b
Prefer std::vector<> over explicit malloc()s.
2012-05-21 15:26:46 +02:00
Bård Skaflestad
7d57530df5
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
2e02731ed8
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
2006f3e3f8
Partly doxygenise the tarjan() function.
2012-05-21 14:49:51 +02:00
Atgeirr Flø Rasmussen
bc8d3160d0
Update comments in implementation file.
2012-05-21 14:48:09 +02:00
Atgeirr Flø Rasmussen
182c4718b0
Improve solver output in Newton iterations.
2012-05-21 14:08:38 +02:00
Atgeirr Flø Rasmussen
bccb7381fd
Added initBlackoilSurfvol() function.
2012-05-21 14:03:56 +02:00
Atgeirr Flø Rasmussen
7e9690ece3
Bugfix: set nphases properly.
2012-05-21 14:03:33 +02:00
Atgeirr Flø Rasmussen
f9436a1bef
Initialize size of wellperf_gpot_ properly.
2012-05-21 13:13:13 +02:00
Atgeirr Flø Rasmussen
857d6b774d
Finished untested version of CompressibleTpfa.
2012-05-21 12:58:42 +02:00
Atgeirr Flø Rasmussen
39eab74dc8
Added loop control and reporting to CompressibleTpfa.
2012-05-21 12:48:54 +02:00
Atgeirr Flø Rasmussen
5ed467f441
Added tolerance and maxiter arguments to CompressibleTpfa.
2012-05-21 11:24:12 +02:00
Atgeirr Flø Rasmussen
fb5113836c
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
5abf755e2d
Sending *dynamic* pressures to assembly function...
2012-05-21 10:47:21 +02:00
Atgeirr Flø Rasmussen
9aa0c89603
Sending initial pressures to assembly function.
2012-05-21 10:36:10 +02:00
Atgeirr Flø Rasmussen
18a0d0cf9f
Added initialization of face pressures.
2012-05-21 10:19:12 +02:00
Atgeirr Flø Rasmussen
cd72a50977
Added initFacePressure() function.
2012-05-21 10:10:52 +02:00
Atgeirr Flø Rasmussen
2ad94fc573
Evaluation of dynamic properties for CompressibleTpfa.
2012-05-21 10:10:35 +02:00
Atgeirr Flø Rasmussen
fa0d166f14
Work in progress on CompressibleTpfa.
...
- Changed contstruction, now takes property object.
- Well potentials done.
2012-05-18 11:10:31 +02:00
Kjetil Olsen Lye
5fb14c94cb
merge.
2012-05-16 17:00:09 +02:00
Xavier Raynaud
f252f59e5c
Added necessary #include.
2012-05-16 16:08:48 +02:00
Atgeirr Flø Rasmussen
1d1755bafe
Work in progress on compressible pressure solver.
2012-05-16 15:49:02 +02:00
Atgeirr Flø Rasmussen
fd25a20b9d
Started adding necessary parameters to pressure solver. Work in progress.
2012-05-16 14:38:55 +02:00
Atgeirr Flø Rasmussen
ac1e43b643
Added WellState class.
2012-05-16 14:37:55 +02:00
Atgeirr Flø Rasmussen
07b04825fd
Fix bug related to arithmetic if operator ( ? : ).
2012-05-16 14:15:50 +02:00
Atgeirr Flø Rasmussen
a6c71288aa
Merged.
2012-05-16 12:55:05 +02:00
Atgeirr Flø Rasmussen
d15a952cdd
Added initStateBasic() overload taking BlackoilPropertiesInterface props.
2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
af8a32c560
Silence a warning.
2012-05-16 12:52:58 +02:00
Atgeirr Flø Rasmussen
cb03044d62
Renamed initTwophaseStateBasic() -> initStateBasic().
2012-05-16 12:33:42 +02:00
Atgeirr Flø Rasmussen
f6efbf386c
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
e29364e3cc
Don't #include EclipseGridInspector for the side effect of <tr1/array>
2012-05-16 11:13:38 +02:00
Atgeirr Flø Rasmussen
203ebe6273
Remove unneeded debug output.
2012-05-16 09:24:34 +02:00