Atgeirr Flø Rasmussen
48cd13228f
Vtk output for general grids. Grid read from deck can use DIMENS or SPECGRID.
2012-01-31 22:33:48 +01:00
Atgeirr Flø Rasmussen
7eb2d297bf
Fix error message.
2012-01-31 22:30:24 +01:00
Bård Skaflestad
89fcb2d082
Merge from upstream.
2012-01-31 10:21:08 +01:00
Bård Skaflestad
b93709a8ba
Implement read support for "RS" keyword (initial gas/oil solution ratio).
2012-01-31 10:20:37 +01:00
Atgeirr Flø Rasmussen
02a94c1f79
Work in progress on reading all props and grid from deck. No output yet.
2012-01-31 09:44:52 +01:00
Atgeirr Flø Rasmussen
d3ded4160b
Added IncompPropertiesFromDeck class and its building blocks.
2012-01-31 09:41:53 +01:00
Atgeirr Flø Rasmussen
7c9f6019aa
Minor comment typo fix.
2012-01-27 12:46:57 +01:00
Atgeirr Flø Rasmussen
4470ac6cb5
Now the non-reorder transport solver also uses new fluid props.
2012-01-27 11:43:14 +01:00
Atgeirr Flø Rasmussen
a00e8bba3e
Fixed bug in some capPress() implementations (calling wrong function). Doc fix.
2012-01-27 11:42:05 +01:00
Atgeirr Flø Rasmussen
ae98a1c9c3
Removed extra occurrence of grid.h header file.
2012-01-27 09:43:28 +01:00
Atgeirr Flø Rasmussen
a120cdc80f
Moved typedefs, refined output.
2012-01-27 09:19:59 +01:00
Bård Skaflestad
1b7a2fa9ac
Add appropriate Boost libraries needed in specific executables.
2012-01-26 21:34:16 +01:00
Bård Skaflestad
4ab4dc7543
Convert Tabs to spaces where appropriate.
2012-01-26 10:41:58 +01:00
Jostein R. Natvig
a92b7a1b0c
Copy modifications to reorder-related codes from MRST repository
...
branches/mrst-reorg/mex/reorder-C, revision 8955.
The changes are: (1) addition of documentation of input arguments in
tarjan.c and (2) an MIT licence header (codes originated in a PhD
project).
2012-01-25 10:49:49 +01:00
Jostein R. Natvig
80beabc3e9
Remove unnecessary include statement.
2012-01-25 10:44:37 +01:00
Atgeirr Flø Rasmussen
12f8b6b4a1
Reorder solver now uses new fluid props.
2012-01-24 21:51:24 +01:00
Atgeirr Flø Rasmussen
63942cbd1d
Now reorder code requires new property object, not using it yet (work in progress).
2012-01-24 16:17:05 +01:00
Atgeirr Flø Rasmussen
45d603939d
C++ified twophase model code.
2012-01-24 16:01:15 +01:00
Atgeirr Flø Rasmussen
a3662637c1
Always warn about unused parameters, even if no solution output requested.
2012-01-24 16:00:16 +01:00
Atgeirr Flø Rasmussen
148c5a27d3
Added "output_dir" param, unused parameter warning and output of parameters used.
2012-01-24 15:22:51 +01:00
Atgeirr Flø Rasmussen
3424e0211b
C++ified reordering transport solver facade.
2012-01-24 13:47:00 +01:00
Atgeirr Flø Rasmussen
9e0a018103
Modify example viscosity to match (temporarily) hardcoded reorder fluid.
2012-01-24 13:20:41 +01:00
Atgeirr Flø Rasmussen
b0ab8d093a
Default stepsize now 1 day.
2012-01-24 10:07:10 +01:00
Atgeirr Flø Rasmussen
72db3627d0
Added test code (#ifdef'ed out) for linear relperm.
2012-01-24 10:05:18 +01:00
Atgeirr Flø Rasmussen
9faafdbf73
Correct mistake in transport source initialization.
2012-01-24 09:58:24 +01:00
Atgeirr Flø Rasmussen
e797a81108
Gave new, more-or-less reasonable default rates and timesteps.
2012-01-24 09:52:15 +01:00
Atgeirr Flø Rasmussen
98ab0cabfd
Replaced Rock class with IncompPropertiesBasic, preserving behaviour.
2012-01-23 13:47:00 +01:00
Atgeirr Flø Rasmussen
61be43bfb6
Made sure permeability param is read as a double.
2012-01-23 13:43:45 +01:00
Atgeirr Flø Rasmussen
ffcb9e0748
Reorganized and commented initialization section to prepare for change.
2012-01-23 13:06:25 +01:00
Atgeirr Flø Rasmussen
38cbdf5121
Re-introduced reorder functionality.
2012-01-23 12:43:37 +01:00
Atgeirr Flø Rasmussen
80ec53241f
Merged.
2012-01-23 12:41:06 +01:00
Bård Skaflestad
0a8df0e33d
Back out reorder option. We're not ready to begin using this.
2012-01-23 00:57:13 +01:00
Bård Skaflestad
a07f5b3eee
Suppress warnings about missing previous function declarations.
2012-01-23 00:32:59 +01:00
Atgeirr Flø Rasmussen
efcd191ea1
Added "output" parameter for turning file output on/off.
2012-01-20 15:51:29 +01:00
Atgeirr Flø Rasmussen
da0bcc13a4
Added "use_reorder" parameter and implemented the option.
2012-01-20 15:36:52 +01:00
Atgeirr Flø Rasmussen
e6ebc9961b
Made header includable from C++.
2012-01-20 15:36:03 +01:00
Atgeirr Flø Rasmussen
7cb74b09cf
Use user-supplied tolerance also for endpoints.
2012-01-20 14:38:29 +01:00
Atgeirr Flø Rasmussen
ba61341cab
Squash warnings.
2012-01-20 14:37:58 +01:00
Atgeirr Flø Rasmussen
136a494ccb
Include fluid.h.
2012-01-20 14:37:38 +01:00
Atgeirr Flø Rasmussen
30d70fd0f8
Fix compilation error due to change in twophasetransport() prototype.
2012-01-20 14:07:56 +01:00
Atgeirr Flø Rasmussen
29cdeedde3
Build fluid.c and make it into a quadratic Corey fluid.
2012-01-20 14:07:23 +01:00
Atgeirr Flø Rasmussen
68c6936cbd
Updated files from MRST repository.
2012-01-20 13:09:13 +01:00
Atgeirr Flø Rasmussen
54a9d038c9
New parameters "guess_old_solution", "verbosity", "max_it" and "max_it_ls".
2012-01-19 23:51:09 +01:00
Atgeirr Flø Rasmussen
4f7c1fd77c
A few changes to out-of-range warning and clamping:
...
- instead of hardcoding a constant (1e-5), use named
variable (sat_tol_).
- in finishStep(), allow s to be within sat_tol_ of
[s_min, s_max] range, and clamp to range.
- in initIteration(), only warn once if any cells' s
values were clamped.
2012-01-19 23:49:45 +01:00
Atgeirr Flø Rasmussen
7107ef2161
Refined output of NRReport.
2012-01-19 16:58:20 +01:00
Atgeirr Flø Rasmussen
b2ce765133
Now writes output in vtk format.
2012-01-19 16:48:27 +01:00
Atgeirr Flø Rasmussen
47a0c65c64
Changed default behaviour to match old behaviour.
2012-01-19 16:48:11 +01:00
Atgeirr Flø Rasmussen
df31c95197
Moved output of report struct into dedicated operator<<().
2012-01-19 14:24:39 +01:00
Atgeirr Flø Rasmussen
2f5bba3835
Now a primitive simulator.
2012-01-19 14:12:53 +01:00
Atgeirr Flø Rasmussen
a8d5302cc7
Merge.
2012-01-19 13:58:47 +01:00
