Bård Skaflestad
2de58be3fd
Fix code on platforms for which sizeof(double)!=sizeof(double*).
2012-02-06 12:52:41 +01:00
Atgeirr Flø Rasmussen
da16edf8bc
Removed unnecessary (potentially misleading) assignment.
2012-02-06 10:45:21 +01:00
Bård Skaflestad
32f5ae1030
Implement basic memory management for new well interface.
...
Hook up to build, but actual location is likely to change...
2012-02-03 21:35:19 +01:00
Jostein R. Natvig
9def4966cc
Remove old function "create_cart_grid", please use "create_cart_grid_3d".
2012-02-03 10:56:28 +01:00
Atgeirr Flø Rasmussen
41f9f06df4
Fallout from removal of grid_t typedef.
2012-02-01 20:29:05 +01:00
Atgeirr Flø Rasmussen
3c3db99076
Include necessary header for free_grid().
2012-02-01 15:57:02 +01:00
Jostein R. Natvig
7439640098
Unify grid destructors: new common function is called free_grid(...).
2012-02-01 15:45:13 +01:00
Jostein R. Natvig
98919ced76
Merge.
2012-02-01 14:57:20 +01:00
Jostein R. Natvig
fb99d7bdaf
1) Move extra fields found in struct CornerpointGrid into struct UnstructuredGrid.
...
2) Remove typedef grid_t
3) Remove struct CornerpointGrid.
4) handle fallout.
2012-02-01 14:56:38 +01:00
Bård Skaflestad
b5ebdd41b6
Use explicit string constructor for keywords SWFN, SOF2, and TUNING.
...
Keywords are supposed to be strings anyway, and it's better to enforce
this restriction explicitly rather than to rely on implicit conversion
from character literals.
2012-02-01 14:55:49 +01:00
Jostein R. Natvig
e577b74a48
Add new version of well datastructure.
2012-02-01 12:16:05 +01:00
Atgeirr Flø Rasmussen
9a51f77538
Merged.
2012-01-31 22:36:03 +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
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
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
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
3424e0211b
C++ified reordering transport solver facade.
2012-01-24 13:47:00 +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
61be43bfb6
Made sure permeability param is read as a double.
2012-01-23 13:43:45 +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
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
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
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
a8d5302cc7
Merge.
2012-01-19 13:58:47 +01:00
Bjørn Spjelkavik
e697fb72e3
Changed namespace Dune -> namespace Opm.
2012-01-19 13:50:57 +01:00
Atgeirr Flø Rasmussen
b7ae30491c
Newton iteration initial guess policy is now controlled by a
...
constructor parameter instead of a macro.
2012-01-19 13:23:55 +01:00
Bård Skaflestad
ff1edbe363
Merge from upstream.
2012-01-19 10:51:22 +01:00
Bjørn Spjelkavik
7560f3b9a4
Add missing field in welspec printout.
2012-01-19 09:20:06 +01:00
Bård Skaflestad
7f02860e11
Support switching off syntax check in constructor.
...
This is useful if a set of parameters can all be defaulted in which
case launching the executable *should* be a simple as
./a.out
but the constructor requirement leads to using
./a.out a=b
or something similar.
2012-01-19 09:13:05 +01:00
Atgeirr Flø Rasmussen
805d5a6ba5
Added classes IncompPropertiesInterface and IncompPropertiesBasic.
2012-01-18 18:50:56 +01:00
Atgeirr Flø Rasmussen
9508680baf
Added sanity checking for number of phases in property classes.
2012-01-18 18:36:20 +01:00
Atgeirr Flø Rasmussen
c60fd2b82f
Added numPhases() method to SaturationProps* classes.
2012-01-18 18:31:12 +01:00
Bård Skaflestad
7f157109d0
Merge from upstream.
2012-01-17 16:10:23 +01:00
Bård Skaflestad
1a1c87f17c
Interface change: Don't return a value.
...
We currently cannot provide a meaningful return value, so don't
pretend that there is one [%]. Also, make compilable as strict C90.
[%]: Sanctioned by original author.
2012-01-17 16:07:40 +01:00
Bård Skaflestad
e768af68ca
Various cleanups.
...
Specifically: Remove debugging output and unused variables.
2012-01-17 16:05:44 +01:00
Bård Skaflestad
Atgeirr Flø Rasmussen
Jostein R. Natvig
Bjørn Spjelkavik