Commit Graph

3210 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
18c9e681c2 Fix type of dx, dy, dz. Small refactoring in pressure solver init. 2012-02-28 09:47:02 +01:00
Xavier Raynaud
ee52e354b1 Bugfixed in computation of the gradient of the residual (from formulae). 2012-02-27 15:49:04 +01:00
Xavier Raynaud
6b267dd871 Bugfix in computation of the derivatives of the relative permeability. 2012-02-27 15:43:26 +01:00
Xavier Raynaud
c2128d6cff Bugfix after removal of hello polymer program. 2012-02-27 12:20:55 +01:00
Xavier Raynaud
5c78dc8960 Cleaned up code for Splitting method for residual zero finding. 2012-02-27 10:39:21 +01:00
Xavier Raynaud
a26656c6e5 Cleaned up code for Splitting method in zero finding residual. 2012-02-27 10:10:32 +01:00
Atgeirr Flø Rasmussen
e9b17dee02 Using miscUtilities.hpp from opm-core instead of keeping own versions. 2012-02-26 21:18:47 +01:00
Atgeirr Flø Rasmussen
753ebedc0d Removed "hello polymer" test program. 2012-02-26 20:20:37 +01:00
Atgeirr Flø Rasmussen
40e2ccd1f0 Removed legacy reorder solver code. 2012-02-26 20:17:22 +01:00
Xavier Raynaud
c63d817332 Added varying bounded box for allowable values of c and c in the splitting residual solver. 2012-02-24 17:35:47 +01:00
Xavier Raynaud
f0fc7bf3c0 Merge. 2012-02-23 17:00:43 +01:00
Xavier Raynaud
266b451715 Fix splitting method residual solver. Add piecewise linear curve to handle the boundaries of the acceptable domain for s and c. 2012-02-23 16:59:17 +01:00
Atgeirr Flø Rasmussen
75ea10eea4 Added support for gravity in pressure solver. 2012-02-22 15:06:19 +01:00
Atgeirr Flø Rasmussen
95618aecac Implemented solveMultiCell() by the nonlinear Gauss-Seidel method. 2012-02-22 14:55:34 +01:00
Atgeirr Flø Rasmussen
4e5215e1ab Added compute_totmob_omega() function. 2012-02-22 14:54:15 +01:00
Atgeirr Flø Rasmussen
5b01436db9 Catch up to IncompTpfa needing a linear solver. 2012-02-22 09:28:57 +01:00
Atgeirr Flø Rasmussen
5516ee7e04 Multiple changes, including new parameters for polymer injection and solvers.
- "poly_start_days", "poly_end_days", "poly_amount" controls injection
   time interval and concentration of injected polymer.
 - Made a small class (PolymerInflow) for this control.
 - Now warns if polymer injection rate changes during timestep.
 - Parameters "nl_tolerance" and "nl_maxiter" control nonlinear scalar solvers.
 - Catch up to change in TransportModelPolymer (constructor args).
2012-02-20 17:14:09 +01:00
Atgeirr Flø Rasmussen
21f7022afd Tolerance and max iters are constructor arguments. Uses satRange() properly. 2012-02-20 17:07:42 +01:00
Atgeirr Flø Rasmussen
5afc6bf0e8 Merged. 2012-02-20 13:59:56 +01:00
Atgeirr Flø Rasmussen
97134499c5 Using IncompTpfa. 2012-02-20 13:59:34 +01:00
Bård Skaflestad
aebf500789 Staticise polymerInflowAtTime() to avoid warning about missing declaration. 2012-02-20 13:58:56 +01:00
Atgeirr Flø Rasmussen
b84c957e2b Using GridManager and writeVtkData() from opm-core. 2012-02-20 12:46:54 +01:00
Xavier Raynaud
1763e8afd7 Merged. 2012-02-20 09:37:54 +01:00
Xavier Raynaud
dd324478de Added s-c splitting solver for single cell problem. 2012-02-20 09:27:22 +01:00
Atgeirr Flø Rasmussen
d041c98f21 Added solveMultiCell() method to match change in interface. Currently throwing. 2012-02-15 22:52:32 +01:00
Atgeirr Flø Rasmussen
6b60550f6e Add parameter "new_code" to switch between old and new structuring of transport solver. 2012-02-12 23:46:42 +01:00
Atgeirr Flø Rasmussen
a3dfdad3a6 Use PolymerData struct as moved to namespace Opm and defined in TransportModelPolymer.hpp. 2012-02-12 23:45:43 +01:00
Atgeirr Flø Rasmussen
8cb2af77e7 Added TransportModelPolymer class. 2012-02-12 23:30:57 +01:00
Atgeirr Flø Rasmussen
b30e64630f Moved saturation copying out of transport time measurement. 2012-02-12 23:30:28 +01:00
Atgeirr Flø Rasmussen
ddc53646d5 Catch up to header file removal in opm-core. 2012-02-12 23:29:56 +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
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