Bård Skaflestad
47241e458f
Reorder sections for greater internal cohesion. No functional changes.
...
While here, add a few comments to outline the purpose of each section,
particularly the "libopmcore_la_LDFLAGS".
2012-04-10 18:02:33 +02:00
Xavier Raynaud
f9af5b12f5
Fixed bug in python script. Remove vtu files used to generate figures.
2012-04-10 17:54:50 +02:00
Xavier Raynaud
490f312821
Fixed configure.ac file to take into account tutorials
2012-04-10 17:46:52 +02:00
Xavier Raynaud
3d06f3eb9d
Added python script to generate the figures.
2012-04-10 17:24:20 +02:00
Xavier Raynaud
18a4d47afd
Added doxygen configuration files (remove Doxyfile from .hgignore).
2012-04-10 17:22:14 +02:00
Xavier Raynaud
820b5d25a7
merge.
2012-04-10 17:18:38 +02:00
Xavier Raynaud
f7d934249d
Added first tutorial.
2012-04-10 17:18:19 +02:00
Xavier Raynaud
bf6caa9dd0
Added first tutorial.
2012-04-10 17:16:25 +02:00
Bård Skaflestad
ac34424424
Refine inter-library dependency build specification.
...
Specifically, the "CPPFLAGS" are for users only. We must never modify
these flags to build a product. The appropriate system-internal flags
are the "AM_CPPFLAGS".
Moreover, the "LIBS" variable is an implementation detail that should
not be directly modified by a particular build system. Inter-library
link dependencies should be specified in the <library>_LDFLAGS. See,
for instance,
http://www.gnu.org/software/automake/manual/html_node/Libtool-Flags.html
2012-04-10 16:13:12 +02:00
Atgeirr Flø Rasmussen
b5fd4551f5
Merged.
2012-04-10 15:47:28 +02:00
Atgeirr Flø Rasmussen
d0aeeb780c
Disabled OpenMP pragmas in low-level fluid evaluations.
...
This is done to reduce risk of misuse, considering two cases:
- These functions are often called with a single data point,
making the thread setup and teardown time prohibitively expensive.
- This may conflict with higher-level use of OpenMP.
2012-04-10 15:46:24 +02:00
Atgeirr Flø Rasmussen
fa5143abad
Removed unused code.
2012-04-10 15:42:47 +02:00
Kjetil Olsen Lye
b1bce20707
Fixed some warnings
2012-04-10 15:01:52 +02:00
Kjetil Olsen Lye
071233f38a
added missing include
2012-04-10 14:53:02 +02:00
Kjetil Olsen Lye
b39d5c823f
merge
2012-04-10 14:48:35 +02:00
Kjetil Olsen Lye
84b5041487
Fixed namespacing issue
2012-04-10 14:47:29 +02:00
Xavier Raynaud
f56f78289d
Added cmath library so that fabs can be used.
2012-04-10 14:32:56 +02:00
Atgeirr Flø Rasmussen
6a042bdefe
Do not write denormal values to vtk files.
...
Workaround for a bug in Paraview, at least on Mac.
2012-04-10 14:09:32 +02:00
Atgeirr Flø Rasmussen
b5c8b21bee
Minor edit.
2012-04-02 15:42:28 +02:00
Atgeirr Flø Rasmussen
82120322e8
Added state-related headers for distribution.
2012-04-02 15:42:14 +02:00
Atgeirr Flø Rasmussen
06bfd72f9e
Made state before init() valid (0.0 water sat, 1.0 oil sat).
2012-04-02 15:41:13 +02:00
Atgeirr Flø Rasmussen
89bf3c934b
Changed single-cell solver call.
...
- Using [0,1] interval instead of [smin, smax] interval to handle compressible case.
- Using new version of Regula Falsi function which exploits initial guess.
2012-04-02 13:24:57 +02:00
Atgeirr Flø Rasmussen
aa3728346c
Added new variant of Regula Falsi solver, which checks an initial guess first.
2012-04-02 13:23:14 +02:00
Atgeirr Flø Rasmussen
196ec80785
Corrected keyword for turning off gravity in deck input (NOGRAV).
2012-04-02 11:21:56 +02:00
Atgeirr Flø Rasmussen
40b4fcb7ac
Merge.
2012-03-30 16:11:27 +02:00
Atgeirr Flø Rasmussen
5e57cb6041
Minor modification of residual formula (equivalent to the old).
2012-03-30 16:11:07 +02:00
Kjetil Olsen Lye
d02e8e8651
Some comments
2012-03-30 10:51:31 +02:00
Atgeirr Flø Rasmussen
c53fb7eb15
New parameter 'injected_porevolumes_per_day' implemented.
...
- Only used if no wells present.
- Defaults to 0.0 if gravity is present.
- Otherwise defaults to 0.1.
These defaults are intended to preserve behaviour from before the
initialisation code changed away from using the 'scenario' parameter.
2012-03-29 21:16:45 +02:00
Atgeirr Flø Rasmussen
5b8d060b1a
Bugfix: ensure all cells have a valid saturation initially.
2012-03-29 21:10:14 +02:00
Kjetil Olsen Lye
6d2b487cb7
merge
2012-03-29 18:35:00 +02:00
Kjetil Olsen Lye
6e23dcab17
Added WellCollection as a forest of Well group trees. Did parsing of group control input data into this forest format
2012-03-29 18:34:51 +02:00
Atgeirr Flø Rasmussen
06d5755c29
Multiple changes dealing with initialization. Work in progress.
...
- Moved simulator state class into its own file.
- Using new initState...() methods in spu_2p.cpp
- No longer controlled by 'scenario' parameter.
2012-03-29 13:05:59 +02:00
Atgeirr Flø Rasmussen
e65f1e7bbf
Minor bugfix.
2012-03-29 12:50:18 +02:00
Atgeirr Flø Rasmussen
b1fa736174
Added correct documentation to initStateTwophaseBasic().
2012-03-29 11:09:13 +02:00
Atgeirr Flø Rasmussen
d97917ca6f
Added functions initStateTwophaseBasic() and initStateTwophaseFromDeck().
2012-03-29 11:06:05 +02:00
Atgeirr Flø Rasmussen
6370906f8c
Suppressed multiple warnings.
2012-03-28 16:39:04 +02:00
Kjetil Olsen Lye
6b20238c13
merge
2012-03-28 15:49:48 +02:00
Kjetil Olsen Lye
5a74a3f322
Prettification of code
2012-03-28 15:49:39 +02:00
Bård Skaflestad
4b47096368
tests/Makefile.am: Sort individual tests alphabetically.
2012-03-28 15:10:04 +02:00
Atgeirr Flø Rasmussen
b966369c73
Moved small cartesian grid test to tests/test_cartgrid.cpp.
2012-03-28 15:02:27 +02:00
Atgeirr Flø Rasmussen
8fd1e68fb9
Merged.
2012-03-28 14:41:56 +02:00
Kjetil Olsen Lye
c8210a3a9a
Fixed some warnings and added GCONPROD reading for the eclipse parser
2012-03-28 12:38:48 +02:00
Atgeirr Flø Rasmussen
9d7a3fd4d4
Merge.
2012-03-28 11:57:25 +02:00
Atgeirr Flø Rasmussen
4db93c418c
Suppressed multiple warnings.
2012-03-28 11:56:20 +02:00
Kjetil Olsen Lye
1b7862504c
Added reading of Gconinje
2012-03-28 10:55:43 +02:00
Kjetil Olsen Lye
89f1b6399f
Fixed gruptree reading
2012-03-28 09:35:49 +02:00
Kjetil Olsen Lye
1e9072b019
merge
2012-03-27 16:57:12 +02:00
Kjetil Olsen Lye
ef6e444eb1
Started reading the gruptree
2012-03-27 16:57:01 +02:00
Atgeirr Flø Rasmussen
234836d9ef
Merge.
2012-03-27 13:15:15 +02:00
Bård Skaflestad
8fb200aeea
solveGravity(): Don't compare signed and unsigned expressions.
2012-03-27 11:19:13 +02:00
