Commit Graph

1066 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
2061e7fcd8 Added timers. 2012-02-09 23:15:14 +01:00
Atgeirr Flø Rasmussen
909007942e Re-added necessary include files. 2012-02-09 23:14:50 +01:00
Atgeirr Flø Rasmussen
660a45440d Using new reorderTransportTwophase() function. 2012-02-09 16:09:24 +01:00
Atgeirr Flø Rasmussen
c51d9f1a6c Added new top-level reorder free function, reorderTransportTwoPhase(). 2012-02-09 16:08:53 +01:00
Atgeirr Flø Rasmussen
54c89db47b Added classes TransportModelInterface and TransportModelTwophase. 2012-02-09 16:07:53 +01:00
Atgeirr Flø Rasmussen
ba13070a74 Added new function create_hexa_grid_3d(). 2012-02-08 15:00:56 +01:00
Atgeirr Flø Rasmussen
30ec82a02c Fix order of arguments for error messages. 2012-02-08 13:52:19 +01:00
Atgeirr Flø Rasmussen
be308f8bd5 Improved bracketing error message from nonlinear solvers. 2012-02-08 13:50:08 +01:00
Atgeirr Flø Rasmussen
c0ded27f8d Put brackets for nonlinear solvers into NonlinearSolverCtrl struct. 2012-02-08 13:37:52 +01:00
Bjørn Spjelkavik
08fb3df82c bugfix 2012-02-07 10:22:47 +01:00
Bård Skaflestad
2566bbc01f Solidify checks for maths-related functions.
Specifically, bring in maths library through AC_SEARCH_LIBS and add
checks for sqrt() and pow() only after we've established which library
might contain these functions.  Similarly, rely on AC_SEARCH_LIBS
adding -lamd to ${LIBS} if needed in which case it is not necessary to
manually bring these libraries in while searching for UMFPACK.

Finally, add check for memset().  Needed by Tarjan implementation.
2012-02-07 00:25:40 +01:00
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
bdd7bcb50f Fixed saturation initialization and updating of total mobilities. 2012-02-02 14:24:49 +01:00
Atgeirr Flø Rasmussen
41f9f06df4 Fallout from removal of grid_t typedef. 2012-02-01 20:29:05 +01:00
Atgeirr Flø Rasmussen
a3eb09032b Catch up with unified grid construction/destruction, simplifying grid management. 2012-02-01 15:58:32 +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
7711b3920c Now using reorder solver by default. 2012-01-31 22:35:50 +01:00
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