OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,128 Commits 9 Branches 35 Tags 15 MiB
master
Commit Graph

2983 Commits

Author SHA1 Message Date
Bjørn Spjelkavik
4c1ae099aa Added reading of polymer related keywords. 2012-02-27 11:13:08 +01:00
Bård Skaflestad
2bc15fb31b Generate 2D normals of length equal to face area. 2012-02-27 10:09:06 +01:00
Bård Skaflestad
53f05d3eab Don't assume that num_phases==2 when calculating total mobility. 2012-02-27 10:07:00 +01:00
Atgeirr Flø Rasmussen
8a0d5728a8 Moved simulator utility functions to opm/core/utility/miscUtilities.hpp. 
We want to avoid having hundreds of files with a single function, therefore
these functions have been lumped together. With time, a more sophisticated
organization of such free functions may be in order.
 2012-02-26 21:05:19 +01:00
Atgeirr Flø Rasmussen
85f321fc44 Added experimental code guarded by EXPERIMENT_GAUSS_SEIDEL #define. 2012-02-26 00:30:36 +01:00
Atgeirr Flø Rasmussen
0abaa508aa Adding data for experiments, left alone if unused. 2012-02-26 00:29:39 +01:00
Atgeirr Flø Rasmussen
e939202760 Added more inactive experimental code. 2012-02-25 22:39:01 +01:00
Atgeirr Flø Rasmussen
ccda9308ce Proper vtk output of multicomponent fields (i.e. saturation, velocity). 2012-02-25 22:36:07 +01:00
Xavier Raynaud
e36c5bd46f Decrease tolerance requirement for x1-x0 in modifiedregularFalsi 2012-02-24 17:17:05 +01:00
Bård Skaflestad
203a384324 Merge from upstream. 2012-02-22 23:53:34 +01:00
Bård Skaflestad
9f74500a9f Generate 3D normals of length equal to face area. 2012-02-22 01:58:45 +01:00
Bård Skaflestad
4c5f982811 Add support for variable top-node depths in 3D tensor grid. 2012-02-22 01:56:24 +01:00
Atgeirr Flø Rasmussen
b863ac37fd Removed copied text accidentally left in. 2012-02-21 22:02:16 +01:00
Atgeirr Flø Rasmussen
fe91b1ba70 Fixed class comments, LinearSolverUmfpack::solve() properly returns a report. 2012-02-21 21:54:46 +01:00
Atgeirr Flø Rasmussen
8d74253c64 IncompTpfa now takes a linear solver as a constructor argument. 2012-02-21 21:45:04 +01:00
Atgeirr Flø Rasmussen
d9ed7cadad Made the solve() methods const. 2012-02-21 21:36:09 +01:00
Atgeirr Flø Rasmussen
5d502f1c46 Using LinearSolverUmfpack for the linear solver. 2012-02-21 21:32:11 +01:00
Atgeirr Flø Rasmussen
af260d3d75 Added LinearSolverInterface and two subclasses, using Umfpack and Istl. 2012-02-21 21:27:15 +01:00
Atgeirr Flø Rasmussen
4839b56e98 Remove #include "config.h". 
- Since many other files don't.
  - We may want to establish a policy on this, that works with CMake.
An alternative (not chosen) could have been to wrap the #include in
#ifdef HAVE_CONFIG_H etc.
 2012-02-21 13:53:54 +01:00
Atgeirr Flø Rasmussen
6165fa2ba6 Bugfix: must always initialize gpress_omegaweighted_, even if no gravity. 2012-02-20 17:05:28 +01:00
Atgeirr Flø Rasmussen
4ba285ec21 Ensuring gravity feature is used consistently. 2012-02-20 13:39:40 +01:00
Atgeirr Flø Rasmussen
b2e390aef2 Throws if it fails to initialise grid. 2012-02-20 13:35:47 +01:00
Atgeirr Flø Rasmussen
2fa1f1b5f2 Added class IncompTpfa. 2012-02-20 13:23:01 +01:00
Atgeirr Flø Rasmussen
13e4e0fb15 Added GridManager class. 2012-02-20 11:34:27 +01:00
Atgeirr Flø Rasmussen
f1502b722b Renamed function that was already renamed in header. 2012-02-19 21:31:58 +01:00
Atgeirr Flø Rasmussen
0395d7725e Moved writeVtkData() functions to utility/, added a test program. 2012-02-19 21:24:59 +01:00
Bård Skaflestad
a3a45519a2 Fill_geometry_3d(): Support tensor product of variable cell sizes. 
Also: Re-implement create_hexa_grid_3d() in terms of
create_tensor_grid_3d().
 2012-02-18 00:36:37 +01:00
Atgeirr Flø Rasmussen
93d4bd80f7 Added tol and maxit arguments. Using Incomp*::satRange() for initial s-bracket. 2012-02-17 14:17:16 +01:00
Atgeirr Flø Rasmussen
153a656539 Added satRange() method to Incomp* classes and Saturation* classes. 
So far not yet added to BlackoilPropertiesInterface.
 2012-02-17 14:15:25 +01:00
Atgeirr Flø Rasmussen
ccdacb791c Added lots of (inactive) experimental code. 
The code attempts to improve #iterations in the Gauss-Seidel-like
multicell solver by improving ordering. In general, experiment failed
to improve #iterations, except for one: totally random order was the
best (for the 100x100 case tried)!
 2012-02-17 09:39:45 +01:00
Atgeirr Flø Rasmussen
8a2a3c3ff8 Added compute_sequence_graph(), which also returns the upwind graph. 2012-02-17 09:29:56 +01:00
Bård Skaflestad
e6649ad25d Remove two instances of EOL whitespace. 2012-02-16 02:19:10 +01:00
Bård Skaflestad
eb86ac92ad Use a sane definition of areas and volumes in 2D tensor grid. 2012-02-16 02:12:49 +01:00
Bård Skaflestad
911ce3b145 Fill_geometry_2d(): Support tensor product of variable cell sizes. 
Also: Re-implement create_cart_grid_2d() in terms of
create_tensor_grid_2d().
 2012-02-16 01:58:57 +01:00
Bård Skaflestad
a609175f79 Change grid creation semantics: Return NULL in case of allocation failure. 
Let caller handle out of memory conditions.  We are in no business to
enforce a particular failure handling policy.
 2012-02-16 01:12:46 +01:00
Bård Skaflestad
ddfcd4a1e3 Extract Cartesian dimensions from grid when filling topology/geometry. 
The dimensions are already set in the grid structure during allocation.
 2012-02-16 01:04:35 +01:00
Atgeirr Flø Rasmussen
af1dc247d5 Merge. 2012-02-15 22:44:15 +01:00
Atgeirr Flø Rasmussen
541813ace5 Made reordersequence a C++ source file, in order to use std::sort(). 
This is for the experimental change of the graph topology, putting the
connections in the graph sorted by flux magnitude. Currently the
changes are in the file, but commented out until further experiments
have been done.
 2012-02-15 22:42:07 +01:00
Atgeirr Flø Rasmussen
c8e0d59611 Added solveMultiCell() interface and implementation. 
- Added solveMultiCell() virtual method.
  - TransportModelInterface::reorderAndTransport() now calls solveMultiCell()
    instead of aborting if encountering multi-cell components.
  - Implemented solveMultiCell() in TransportModelTwophase by solving
    each cell individually with solveSingleCell() and repeating until
    saturation change is small (hardcoded 1e-9 for now).
 2012-02-15 22:38:45 +01:00
Bård Skaflestad
f3f261b9a2 Reference per-cell fluid matrix when calculating phase densities. 
This change repeats change-set f3bd5169811e of sibling class
BlackoilPropertiesBasic .
 2012-02-15 15:37:02 +01:00
Bård Skaflestad
ba7b0f05b9 Reference per-cell fluid matrix when calculating phase densities. 2012-02-14 20:23:13 +01:00
Bård Skaflestad
3a004d21ac Include <gridinterface.h> for free_grid(), compute_geometry() and preprocess(). 2012-02-10 14:12:19 +01:00
Bård Skaflestad
8a2d216a83 Refactor inflow tests and flux assignments. 2012-02-10 11:40:21 +01:00
Bård Skaflestad
deb868c233 Fix spelling (interiour -> interior). 2012-02-10 11:26:48 +01:00
Bård Skaflestad
24ceea4ad0 Remove #include<> statement that refers to file removed in cset b4feb4a932de. 2012-02-10 11:14:35 +01:00
Atgeirr Flø Rasmussen
a48b261a3c TransportModel* classes are now expected to have a custom solve() method. More: 
- Using new solve() method in spu_2p.
 - solve() implemented in terms of protected superclass method reorderAndTransport().
 - Removed unused code being replaced by solve().
 2012-02-10 10:48:18 +01:00
Atgeirr Flø Rasmussen
11e5f76813 Removed legacy blackoil fluid code. Further information: 
- These classes were imported (copied) from the dune-porsol repository,
   and copies remain there for the time being.
 - Some of the black oil fluid classes that are in opm-core, such as the
   SinglePvt* classes, are direct descendants of the Miscibility* classes
   that have been removed.
 - At some point, we may modify dune-porsol to use the new fluid interfaces
   from opm-core, but for now we keep using the existing code as-is.
 2012-02-10 09:28:05 +01:00
Atgeirr Flø Rasmussen
da1159061a Removed unused files. 2012-02-09 23:39:18 +01:00
Atgeirr Flø Rasmussen
05ac35ed14 Cleaned up and removed unused code. 2012-02-09 23:35:43 +01:00
Atgeirr Flø Rasmussen
c076a8a6b9 Made grid argument of compute_sequence() const. 2012-02-09 23:28:47 +01:00
Atgeirr Flø Rasmussen
7767e1cc81 Refactored internals, now using modifiedRegulaFalsi() template for performance. 2012-02-09 23:17:08 +01:00
Atgeirr Flø Rasmussen
909007942e Re-added necessary include files. 2012-02-09 23:14:50 +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
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
d0be980727 Make compilable as strict C90. 2012-01-17 16:04:53 +01:00
Jostein R. Natvig
71f6bac21e Add bare-bones implementation of reordering algorithm. 
Lightly tested.
 2012-01-17 14:39:09 +01:00
Atgeirr Flø Rasmussen
dea88cbc28 Documented parameters, and made unit behaviour according to doc (perm in mD etc.) 2012-01-17 14:16:28 +01:00
Atgeirr Flø Rasmussen
860d9623dc Added class BlackoilPropertiesBasic. 2012-01-17 12:19:50 +01:00
Atgeirr Flø Rasmussen
7619cb6061 Added class PvtPropertiesBasic. 2012-01-17 11:17:40 +01:00
Atgeirr Flø Rasmussen
185ec1a816 Added SaturationPropsBasic class. 2012-01-17 10:25:49 +01:00
Atgeirr Flø Rasmussen
9b49b0d089 Added RockBasic class. 2012-01-17 09:31:25 +01:00
Atgeirr Flø Rasmussen
9b6aabd284 Minor typo fix. 2012-01-17 09:31:05 +01:00
Atgeirr Flø Rasmussen
5dc31a5806 Added operators += and *= for SmallVec. 2012-01-17 09:30:43 +01:00
Jostein R. Natvig
3ba7623d41 Remove debug output. 2012-01-16 13:36:09 +01:00
Jostein R. Natvig
3b32089890 Whitespace cleanup. 2012-01-16 13:32:32 +01:00
Jostein R. Natvig
5e049918b7 Do not check monotonicity of ZCORN in inactive cells. 2012-01-16 13:31:39 +01:00
Bård Skaflestad
96b9ab737e Fix corner case in neighbour definition. 2012-01-13 13:36:36 +01:00
Bård Skaflestad
ed7b7e5dab Catch up to removal of grid.h from cart_grid.h . 
Forgotten in change-set c503348e6d54 .
 2012-01-13 12:23:37 +01:00
Bård Skaflestad
e2095a250c Forward-declare "struct UnstructuredGrid" to eliminate grid.h dependency. 2012-01-13 12:21:44 +01:00
Atgeirr Flø Rasmussen
b0bdd2e422 Added missing method implementations. 2012-01-05 21:55:19 +01:00
Atgeirr Flø Rasmussen
0c15624617 Implemented matrix() method. 2012-01-05 21:39:33 +01:00
Atgeirr Flø Rasmussen
f278f87f14 Now initializes rock properties. 2012-01-05 16:43:57 +01:00
Atgeirr Flø Rasmussen
8e627bf820 Implemented init() function. 2012-01-05 16:43:36 +01:00
Atgeirr Flø Rasmussen
aabc457c4c Implemented rock interface in terms of RockFromDeck. 2012-01-05 15:39:13 +01:00
Atgeirr Flø Rasmussen
8bec1ad1cf Implemented trivial parts of RockFromDeck, init() remains. 2012-01-05 15:38:50 +01:00
Bård Skaflestad
22f909d9c2 Implement numPhases() to fix link errors. 2012-01-05 13:12:27 +01:00
Atgeirr Flø Rasmussen
762a414bd4 Now implemented with new pvt and satprop classes. 2012-01-05 11:41:52 +01:00
Atgeirr Flø Rasmussen
f6408d9083 Minor typo fix. 2012-01-05 11:40:58 +01:00
Atgeirr Flø Rasmussen
3d30d615cd Changed behaviour of surfaceDensities(), now only returns densities of active components. 2012-01-05 11:40:29 +01:00
Atgeirr Flø Rasmussen
536d58fe4e Added class SaturationPropsFromDeck. 2012-01-05 11:17:52 +01:00
Atgeirr Flø Rasmussen
91e7b75a2d Added inline keyword for correct linkage. 2012-01-05 11:17:29 +01:00
Atgeirr Flø Rasmussen
88379706a3 Moved active phase determination into own function. 2012-01-05 09:34:05 +01:00
Atgeirr Flø Rasmussen
1c4a621ea5 Moved phase configuration state into PhaseUsage struct. 2012-01-05 09:28:57 +01:00
Atgeirr Flø Rasmussen
7ad68f93e0 Disabling copying of BlackoilPvtProperties class. 2012-01-04 23:32:21 +01:00
Atgeirr Flø Rasmussen
7548172cdf Added BlackoilPvtProperties class. 2012-01-04 23:28:54 +01:00
Atgeirr Flø Rasmussen
6b797c66c0 Documentation improvements. 2012-01-04 23:28:13 +01:00
Atgeirr Flø Rasmussen
a8f7e79b7b Merged. 2012-01-04 22:17:06 +01:00
Atgeirr Flø Rasmussen
0ba5699d0a Made all the SinglePvt* classes conform to new, more bare-bones interface. 2012-01-04 22:15:26 +01:00
Ingeborg Ligaarden
355f9ebee7 Correct cart_grid fields face_nodepos for 2D/3D and facepos for 2D. 2012-01-04 18:19:25 +01:00
Atgeirr Flø Rasmussen
f8ad8b8bf0 Copied and renamed basic building blocks for black oil pvt. 2012-01-04 15:44:53 +01:00
Atgeirr Flø Rasmussen
dd4c0c2b1b Adding class BlackoilPropertiesFromDeck and test program. 2012-01-04 14:44:55 +01:00
Atgeirr Flø Rasmussen
44eb3cf277 Adding virtual destructor. 2012-01-04 14:43:48 +01:00
Atgeirr Flø Rasmussen
ae16a657d3 Initial version of suggested interface for fluid and rock properties. 2012-01-04 12:37:12 +01:00
Atgeirr Flø Rasmussen
f5edbe9c4b Improved robustness of WCONINJE and WCONPROD reading. 2012-01-03 16:06:15 +01:00
Atgeirr Flø Rasmussen
9b0005d132 Added SOIL keyword. 2012-01-03 16:05:43 +01:00
Bjørn Spjelkavik
7e3d000ec8 Minor reformatting. 2012-01-03 09:58:08 +01:00
Bjørn Spjelkavik
9a12c4566c Use flat vector for TSTEP, implement convertToSI(). 2012-01-03 09:57:41 +01:00
Bjørn Spjelkavik
79ba5608c5 Implemented keyword TSTEP 2012-01-03 09:38:38 +01:00
Atgeirr Flø Rasmussen
328353a9c2 Stop using std::tr1::array<> since it is padded (alignment) on gcc 4.1 (CentOS 5.7). 2011-12-22 14:43:23 +01:00
Atgeirr Flø Rasmussen
9b2bfe40d3 Blackoil fluid test programs now compile. 2011-12-22 12:59:42 +01:00
Atgeirr Flø Rasmussen
a55b664eb9 Now fluid cpp files compile successfully. 2011-12-21 13:29:15 +01:00
Atgeirr Flø Rasmussen
cbe5d3015b Work in progress on adapting to opm-core. 2011-12-21 13:22:26 +01:00
Atgeirr Flø Rasmussen
7c0998e197 Moved blackoil fluid classes to their proper place. 2011-12-21 13:09:12 +01:00
Bård Skaflestad
a98386f5aa Don't shadow name() method with a 'name' variable in read(). 2011-12-20 17:37:21 +01:00
Bård Skaflestad
1f1b58c56c Don't shadow field iterator 'i' with an index into that particular field. 2011-12-20 17:36:08 +01:00
Bård Skaflestad
617b160534 Compute perforation fluxes (no gravity adjustments). 
Requires additional parameter 'pmobc' (phase mobilities per cell) in
public function cfs_tpfa_res_flux().
 2011-12-20 02:13:50 +01:00
Atgeirr Flø Rasmussen
bd4236eda9 Now compiles parameter testcase, removed extraneous imported makefiles. 2011-12-19 16:02:51 +01:00
Atgeirr Flø Rasmussen
8f7bbddced Merged. 2011-12-19 15:31:24 +01:00
Atgeirr Flø Rasmussen
81a72be23b Now detects boost and compiles some tests. 2011-12-19 15:26:26 +01:00
Bård Skaflestad
940ec1a996 Merge from upstream. 2011-12-19 14:59:28 +01:00
Bård Skaflestad
959c694e2d Impose outflow sign convention when assembling w->c contributions. 2011-12-19 14:09:27 +01:00
Bård Skaflestad
7eed98118b Only perform incompressible adjustment if there are no BHP wells. 2011-12-19 14:07:57 +01:00
Bård Skaflestad
18d33a3859 Don't immediately clear the freshly allocated geometry storage... 2011-12-19 13:27:54 +01:00
Atgeirr Flø Rasmussen
81b58a0acf Now library contents build. Headers and tests not done yet. 2011-12-19 12:36:56 +01:00
Atgeirr Flø Rasmussen
7e90e732d9 Imported items from dune-cornerpoint/dune/common. 2011-12-19 11:34:50 +01:00
Atgeirr Flø Rasmussen
38fe05cb27 Moved GridAdapter to opm/core. Fixes include paths. 2011-12-16 10:17:40 +01:00
Bård Skaflestad
5610898bc9 Allocate storage for geometry in preprocess(). 
This allows recomputing the geometric primitives if (e.g.) we change
some of the node coordinates after constructing the grid.
 2011-12-14 10:48:23 +01:00
Bård Skaflestad
c84e9dc53c Initialise 'Nx' and 'nxf' before use in fill_cart_topology_2d(). 2011-12-14 10:23:34 +01:00
Bård Skaflestad
1ccd7971e3 Remove unused variables. 2011-12-14 10:20:31 +01:00
Bård Skaflestad
f770effb3f Don't re-declare destroy_cart_grid(). It's already in cart_grid.h . 2011-12-14 10:18:24 +01:00
Jostein R. Natvig
04f9d46c10 Add tensor grid constructors. 2011-12-14 09:30:25 +01:00
Jostein R. Natvig
d25ce5c002 Restructure code to prepare for reuse in future tensor_grid_* constructors. 2011-12-14 09:17:07 +01:00
Jostein R. Natvig
35a1070a5b Merge from upstream. 2011-12-14 07:02:47 +01:00
Bård Skaflestad
9b50c604e4 Merge from upstream. 2011-12-13 17:07:47 +01:00
Atgeirr Flø Rasmussen
8b2fee4774 Minor bugfix: avoid accessing empty (but non-zero capacity) vector. 2011-12-13 11:18:38 +01:00
Bård Skaflestad
c4f986316c Add field for specifying which surface volume fraction is injected. 2011-12-12 18:43:11 +01:00
Atgeirr Flø Rasmussen
23a61cb167 Changed code to use new include path: <opm/core/...> 2011-12-12 11:28:09 +01:00
Atgeirr Flø Rasmussen
4655108f98 Moved code from opmcore/ to opm/core/ 2011-12-12 11:13:54 +01:00