Xavier Raynaud
6fd14bd76a
Update surface volume in transport solver.
2012-08-22 10:11:32 +02:00
Xavier Raynaud
a8eefa4a4c
Merge remote-tracking branch 'atgeirr/rock_comp_tpfa' into rock_comp_tpfa
2012-08-21 17:14:06 +02:00
Xavier Raynaud
c949319bf1
Corrected bug (residual should not be divided by dt).
2012-08-21 17:12:07 +02:00
Xavier Raynaud
22fa63e6c4
Changed way to get total number of cells.
2012-08-21 17:10:49 +02:00
Xavier Raynaud
c431df3d77
Corrected typo in comment.
2012-08-21 17:09:19 +02:00
Atgeirr Flø Rasmussen
80bba295ce
Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa
2012-08-21 12:49:08 +02:00
Xavier Raynaud
cbffe7203a
Merge remote-tracking branch 'atgeirr/rock_comp_tpfa' into rock_comp_tpfa
2012-08-21 10:42:35 +02:00
Xavier Raynaud
6db144ec65
Fixed sign error and replaced porevol->porevol0.
2012-08-21 10:20:59 +02:00
Atgeirr Flø Rasmussen
98c8e6a294
Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa
2012-08-20 16:09:20 +02:00
Atgeirr Flø Rasmussen
1678bcad7f
Merge branch 'master' into rock_comp_tpfa
2012-08-20 16:08:15 +02:00
Atgeirr Flø Rasmussen
1170727f1e
Renamed SimulatorTwophase -> SimulatorIncompTwophase.
2012-08-20 15:45:05 +02:00
Xavier Raynaud
9e480cd997
Fix initialization bug.
2012-08-20 15:18:24 +02:00
Xavier Raynaud
f15a6e03f0
Added common root name for vtk file names.
2012-08-20 15:14:01 +02:00
Atgeirr Flø Rasmussen
bbf2b4f369
Changed name of parameter output file to 'simulation.param'.
2012-08-20 14:46:51 +02:00
xavier
d706f4ea36
Merge remote-tracking branch 'atgeirr/rock_comp_tpfa' into rock_comp_tpfa
2012-08-20 11:04:56 +02:00
Bård Skaflestad
9a44eababc
Merge pull request #16 from atgeirr/master
...
Added parameter output_vtk.
2012-08-17 05:14:56 -07:00
Atgeirr Flø Rasmussen
427fb67e9b
Merge remote-tracking branch 'upstream/master'
2012-08-17 13:58:13 +02:00
Atgeirr Flø Rasmussen
a23f8d1706
Added parameter output_vtk.
...
Defaults to true, if false do not write .vtu output.
2012-08-17 13:54:19 +02:00
Atgeirr Flø Rasmussen
f3169d7dc5
Merge branch 'master' into rock_comp_tpfa
2012-08-17 12:55:41 +02:00
Bård Skaflestad
21b33e40d7
Merge pull request #15 from atgeirr/master
...
Modifications to compressible transport solver, other minor mods.
2012-08-17 03:49:30 -07:00
Atgeirr Flø Rasmussen
9a1bcaf496
Whitespace cleanup.
2012-08-17 12:40:15 +02:00
Atgeirr Flø Rasmussen
8fa0140e66
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
opm/core/simulator/SimulatorTwophase.cpp
2012-08-17 11:31:59 +02:00
Atgeirr Flø Rasmussen
f582627f2a
Merge pull request #14 from hnil/master
...
Corrected use of boost header.
2012-08-17 02:26:51 -07:00
Atgeirr Flø Rasmussen
08e966eff1
Small improvements, outputs unused params at the correct time.
2012-08-17 11:20:42 +02:00
Halvor Møll Nilsen
bdad2c449c
Changed header for boost.
2012-08-17 10:59:26 +02:00
Atgeirr Flø Rasmussen
48acb816ff
Merge remote-tracking branch 'upstream/master'
2012-08-17 10:58:12 +02:00
Atgeirr Flø Rasmussen
6e778b9641
Bugfix: call *comprock* method only if active rock compressibility.
2012-08-17 10:56:27 +02:00
Atgeirr Flø Rasmussen
6ed0b0a817
Merge pull request #13 from hnil/master
...
Changed output to be easier to read from matlab.
2012-08-17 01:55:18 -07:00
Atgeirr Flø Rasmussen
dec8ed5760
Class CompressibleTpfa now handles rock compressibility.
2012-08-17 10:38:41 +02:00
Atgeirr Flø Rasmussen
aa49d56d9c
Added function cfs_tpfa_res_comprock_assemble().
...
This is intended to handle cases with both fluid and rock compressibility.
2012-08-17 10:36:57 +02:00
Halvor Møll Nilsen
b0cbc3d7f4
Reintroduced writing of param.
2012-08-16 16:10:28 +02:00
Halvor Møll Nilsen
5a05af55eb
Merge remote-tracking branch 'upstream/master'
2012-08-16 16:01:52 +02:00
Halvor Møll Nilsen
2da6650b97
Moved output of quantities to separate directoirs inside the outdir.
...
This is done to get a cleaner putput.
2012-08-16 15:29:57 +02:00
Atgeirr Flø Rasmussen
b427125a4f
Merge remote-tracking branch 'upstream/master'
2012-08-14 15:27:30 +02:00
Atgeirr Flø Rasmussen
d89395f486
Merge pull request #12 from bska/master
...
Coding Style and Diagnostics Clean-up.
2012-08-14 05:01:08 -07:00
Bård Skaflestad
7ccf0350bc
Tighten grammar of "HAVE_AGMG" symbol description.
2012-08-14 12:55:57 +02:00
Bård Skaflestad
05410ac950
Always #define "HAVE_DUNE_ISTL".
...
Define the symbol to zero (false) if unavailable. This prevents a
diagnostic message concerning an undefined preprocessor symbol when used
in the form
#if HAVE_DUNE_ISTL
/* ... */
#endif
2012-08-14 12:49:56 +02:00
Bård Skaflestad
736020e6fe
Always #define "HAVE_AGMG".
...
Define the symbol to zero (false) if unavailable or unwanted. This
prevents a diagnostic message concerning an undefined preprocessor
symbol (i.e., "HAVE_AGMG") when used in the form
#if HAVE_AGMG
/* ... */
#endif
2012-08-14 12:42:47 +02:00
Atgeirr Flø Rasmussen
17383ca91f
Merge remote-tracking branch 'upstream/master'
2012-08-14 11:31:54 +02:00
Bård Skaflestad
f8825976f0
Restore original method spacing.
...
No functional changes.
2012-08-14 11:26:07 +02:00
Atgeirr Flø Rasmussen
a81df458e3
Gravity segregation column solver for compressible case implemented.
2012-08-14 11:25:59 +02:00
Bård Skaflestad
0841cea042
Restore coding conventions.
...
Inadvertently lost in commit 064184b
2012-08-14 11:05:09 +02:00
Bård Skaflestad
5986b4a24d
Re-adjust Doxygen layout for commit 9d9691a.
2012-08-14 11:03:33 +02:00
Bård Skaflestad
9d9691a927
Fix misprints in Doxygen comment.
2012-08-14 11:01:39 +02:00
Bård Skaflestad
56cd291080
Replace <tab>s by eight spaces.
...
While here, fix a misprint in comment.
2012-08-14 11:00:47 +02:00
Bård Skaflestad
7a48d13424
Remove an unused header.
...
We don't need <string> to define the public interface of
LinearsSolverAGMG.
2012-08-14 10:57:06 +02:00
Bård Skaflestad
624d6177df
Restore coding conventions.
...
Inadvertently lost in commit 064184b
2012-08-14 10:44:17 +02:00
Bård Skaflestad
b4175e5c2b
Merge pull request #11 from hnil/master
...
Changes: Poromult extapolate outside table. Facetages add to grid. Default of fluid is linear.
2012-08-14 01:13:40 -07:00
Halvor Møll Nilsen
064184bd0c
Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear.
2012-08-14 09:36:19 +02:00
Bård Skaflestad
3d45ca3512
Merge pull request #10 from atgeirr/master
...
Improvements in grid creation and compressible solvers.
2012-08-10 01:34:44 -07:00
