Commit Graph

12149 Commits

Author SHA1 Message Date
Bård Skaflestad
095dedfe41 Refactor inflow tests and flux assignments. 2012-02-10 11:40:21 +01:00
Bård Skaflestad
670e95b147 Fix spelling (interiour -> interior). 2012-02-10 11:26:48 +01:00
Bård Skaflestad
869ce15a44 Remove #include<> statement that refers to file removed in cset b4feb4a932de. 2012-02-10 11:14:35 +01:00
Atgeirr Flø Rasmussen
c279224e41 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
b45c42e209 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
7de03af4c1 Made grid argument of compute_sequence() const. 2012-02-09 23:28:47 +01:00
Atgeirr Flø Rasmussen
4f0d501ac6 Refactored internals, now using modifiedRegulaFalsi() template for performance. 2012-02-09 23:17:08 +01:00
Atgeirr Flø Rasmussen
ed9cb9924e Added classes TransportModelInterface and TransportModelTwophase. 2012-02-09 16:07:53 +01:00
Xavier Raynaud
fede5f4c5f Merge from upstream. 2012-02-09 14:16:37 +01:00
Xavier Raynaud
69a08f7177 Fix build issues with static libraries on Ubuntu 11.10
Specifically, add BLAS and LAPACK routines into
${LIBS} and add checks for UMFPACK and
UMFPACK-related libraries.  OPM-Core might be
installed and fully functional, but if it depends
on UMFPACK, the AC_SEARCH_LIBS call might still fail.

See also: dune-cornerpoint commit 3a6be2aa9a45.
2012-02-09 14:16:02 +01:00
Xavier Raynaud
bba74b7182 Move Boost libraries to LDADD. 2012-02-09 14:08:17 +01:00
Atgeirr Flø Rasmussen
4a5c3d704d Added AdHocProps and changed defaults to reproduce matlab case, bugfix. 2012-02-09 09:39:43 +01:00
Atgeirr Flø Rasmussen
094ede0855 Set minimum s to 0.2 for s-iterations (temporary measure). 2012-02-09 09:05:49 +01:00
Atgeirr Flø Rasmussen
f35ef18492 Added "init_sat" parameter and made injection concentration reflect the standard testcase. 2012-02-08 15:43:06 +01:00
Atgeirr Flø Rasmussen
31e84a25cd Added parameters "dx", "dy", "dz" and "injection_rate_per_day". 2012-02-08 15:30:29 +01:00
Atgeirr Flø Rasmussen
40eb6bc889 Added cartesian grid constructor with dx, dy, dz. 2012-02-08 15:29:52 +01:00
Atgeirr Flø Rasmussen
c54fa3448f Added straightforward (more matlab-friendly) output. 2012-02-08 14:40:22 +01:00
Atgeirr Flø Rasmussen
240d69da57 Separated nonlinear controls for c and s residuals, set bracket fields. 2012-02-08 14:02:46 +01:00
Atgeirr Flø Rasmussen
d91baec858 Made two changes:
1) Use refactored vtk output, also output concentration.
   2) Make default polymer behaviour mimic matlab testcase.
2012-02-08 13:44:53 +01:00
Atgeirr Flø Rasmussen
46f29380b3 Added more (inactive) debug output. 2012-02-08 13:43:22 +01:00
Atgeirr Flø Rasmussen
e998753236 Refactored writeVtkDataGeneralGrid() to take arbitrary fields for output. 2012-02-08 13:41:58 +01:00
Xavier Raynaud
ee3335dddd Added necessary BOOST libs to build polymer_reorder program. 2012-02-07 12:32:04 +01:00
Atgeirr Flø Rasmussen
37ce9d0db3 Improved treatment of inflow (source) polymer concentration:
- solver now takes parameter for inflow_c
 - simulator calls polymerInflowAtTime(double time) for its value
 - currently starts polymer injection after 4 days (0.4 pv)
Also added some (inactive) debug printouts.
Still not working when injecting polymer.
2012-02-07 09:09:34 +01:00
Atgeirr Flø Rasmussen
493ee753b4 Change adsorption default value to something more reasonable. 2012-02-06 21:45:21 +01:00
Atgeirr Flø Rasmussen
d17cfd1372 First compiling version of full polymer residual. Not yet working. 2012-02-06 14:01:56 +01:00
Bård Skaflestad
c711133b45 Fix code on platforms for which sizeof(double)!=sizeof(double*). 2012-02-06 12:52:41 +01:00
Atgeirr Flø Rasmussen
0ad4fab860 Minor bugfix, now reproducing non-polymer results. 2012-02-06 10:45:54 +01:00
Atgeirr Flø Rasmussen
a5e1339aac Minor output fixes. 2012-02-06 09:38:44 +01:00
Atgeirr Flø Rasmussen
3828a2f630 Added timers. 2012-02-06 09:10:11 +01:00
Atgeirr Flø Rasmussen
70bf9f0373 Merge. 2012-02-06 08:54:54 +01:00
Atgeirr Flø Rasmussen
f46587bf3c Structure for c-solve in place, still not implemented residual_c(). 2012-02-06 08:54:38 +01:00
Bård Skaflestad
6b8e89e098 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
Atgeirr Flø Rasmussen
143861745a Initial work on supporting polymer transport. Work in progress. 2012-02-03 16:39:55 +01:00
Bård Skaflestad
6ba84fa5da Split a long line to fit in eighty columns. 2012-02-03 12:38:54 +01:00
Atgeirr Flø Rasmussen
e1df60c04d Copied and renamed files and functions from opm-core as base for polymer reorder solver. 2012-02-02 16:35:55 +01:00
Atgeirr Flø Rasmussen
11b4c91d2e Reorganized and cleaned up in prep for polymer work. 2012-02-02 16:03:50 +01:00
Atgeirr Flø Rasmussen
1c66958c0a Added example program and necessary configuration macros. 2012-02-02 15:41:46 +01:00
Atgeirr Flø Rasmussen
9f49fca32e Lowered required autoconf version to 2.59. 2012-02-01 20:42:39 +01:00
Bård Skaflestad
08671a1d6d Coalesce constructors using a default value. 2012-02-01 16:40:15 +01:00
Bård Skaflestad
a785d9488e Create minimum buildable Polymer module for OPM. 2012-02-01 16:16:30 +01:00
Jostein R. Natvig
37296545a4 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
Jostein R. Natvig
04f88cee52 Add new version of well datastructure. 2012-02-01 12:16:05 +01:00
Atgeirr Flø Rasmussen
b52370e370 Added IncompPropertiesFromDeck class and its building blocks. 2012-01-31 09:41:53 +01:00
Atgeirr Flø Rasmussen
ae200b7bae Minor comment typo fix. 2012-01-27 12:46:57 +01:00
Atgeirr Flø Rasmussen
0f8c56d922 Fixed bug in some capPress() implementations (calling wrong function). Doc fix. 2012-01-27 11:42:05 +01:00
Jostein R. Natvig
f56c67081d 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
Atgeirr Flø Rasmussen
22d269811f C++ified reordering transport solver facade. 2012-01-24 13:47:00 +01:00
Atgeirr Flø Rasmussen
974b027dbf Made sure permeability param is read as a double. 2012-01-23 13:43:45 +01:00
Atgeirr Flø Rasmussen
db8681b9ff Updated files from MRST repository. 2012-01-20 13:09:13 +01:00
Bjørn Spjelkavik
7d6fb03142 Changed namespace Dune -> namespace Opm. 2012-01-19 13:50:57 +01:00