OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-29 20:43:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,755 Commits 24 Branches 101 Tags 75 MiB
e6930df28c
Commit Graph

531 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
638eee501b Added compressible 2-phase simulator, to replace sim_wateroil.cpp. 2012-08-23 14:07:11 +02:00
Atgeirr Flø Rasmussen
2ade3eff60 Add missing header. 2012-08-20 16:40:28 +02:00
Atgeirr Flø Rasmussen
21a893c70a Improved treatment of parameters, uniformity with non-polymer sim. 2012-08-20 16:39:28 +02:00
Bård Skaflestad
0c0ea6863f Chase interface change of Opm::IncompPropertiesFromDeck constructor. 2012-08-10 12:27:41 +02:00
Atgeirr Flø Rasmussen
2864b99057 Added test program for investigating single-cell solver performance. 
Note that due to a design constraint in the transport solver, namely
that inflowing fluid must consist of only water (possibly with polymer),
and no oil, the program fails unless the comment on lines 186-- is
heeded.
 2012-07-03 15:48:36 +02:00
Halvor M. Nilsen
497822b893 Added posibility to use eclipse fluid for 1D case. Corrected bug in guess for newton solver 2012-07-03 11:05:51 +02:00
Halvor M. Nilsen
07f5c353e0 Changed initailizing of table for visc_mult_vals so one can set c_max and c_max_ciscmult 2012-06-26 08:40:26 +02:00
Halvor M. Nilsen
b13416be86 Made new single cell solvers. 2012-06-15 14:40:07 +02:00
Atgeirr Flø Rasmussen
92bc55385d Update porosities before calling transport solver. 2012-06-14 21:53:56 +02:00
Atgeirr Flø Rasmussen
8acd441149 Added simulator program handling scheduling. 2012-06-14 14:26:54 +02:00
Atgeirr Flø Rasmussen
cd9be1030a Adapt to moved SimulatorTimer class, and use common SimulatorReport class. 2012-06-14 14:26:29 +02:00
Xavier Raynaud
03c93ec9e5 fixed examples/Makefile.am 2012-06-14 12:48:49 +02:00
Xavier Raynaud
ee89824e0d Added gradient method option in polymer reorder. 2012-06-14 08:54:24 +02:00
Xavier Raynaud
87c68cf783 Added forgotten argument to function. 2012-06-14 08:44:09 +02:00
Xavier Raynaud
6620a1b5cd In profiling branch: merged last default branch. 2012-06-14 08:38:01 +02:00
Atgeirr Flø Rasmussen
7a40153e51 Added IncompTpfaPolymer class. 2012-06-13 19:56:44 +02:00
Xavier Raynaud
4c7c439dd7 merge. 2012-06-13 15:56:09 +02:00
Xavier Raynaud
cab3652c49 Added corey fluid class. 2012-06-13 15:48:09 +02:00
Atgeirr Flø Rasmussen
bc963a2333 Removed class PolymerInflow (moved to PolymerUtilities.hpp). 2012-06-13 15:45:27 +02:00
Xavier Raynaud
ce6e21c0d6 updated polymer_reorder (profiling branch). 2012-06-13 15:44:34 +02:00
Xavier Raynaud
6033527a82 Added pure Newton single cell method. Correction of Jacobi. sc formulation. 2012-06-13 15:11:30 +02:00
Atgeirr Flø Rasmussen
9766b36cf2 Removed more unused code. 2012-06-13 14:51:53 +02:00
Atgeirr Flø Rasmussen
a795166ee8 Remove unused code (wdp data now lives within IncompTpfa). 2012-06-13 14:46:19 +02:00
Atgeirr Flø Rasmussen
ffd33be55d Changed interface of TransportModelPolymer to expect full saturation, not just water. 2012-06-13 14:18:32 +02:00
Atgeirr Flø Rasmussen
c4b81d8da5 Removed two unnecessary arguments from TransportModelPolymer constructor. 2012-06-13 12:46:57 +02:00
Atgeirr Flø Rasmussen
07130c55f7 Updated to match change in IncompTpfa interface. 2012-06-13 10:54:00 +02:00
Xavier Raynaud
c583f4b4cd Added corey relative permeabilities. 2012-06-12 14:07:31 +02:00
Xavier Raynaud
37657d9feb Added comment.x 2012-06-11 16:23:33 +02:00
Xavier Raynaud
022b1ccb11 Small changes in Newton/Gradient method. 2012-06-11 15:59:33 +02:00
Xavier Raynaud
02c5935865 Added profiling branch. Compute number of residual evaluations. 2012-06-11 14:44:21 +02:00
Xavier Raynaud
9eb9ba372d merge 2012-06-11 14:40:55 +02:00
Xavier Raynaud
74b499f7be input parameter for injection is given by volume per day. 2012-06-06 17:04:17 +02:00
Atgeirr Flø Rasmussen
3660ec8e8c Follow headers that were moved in opm-core. 2012-06-05 15:45:41 +02:00
Atgeirr Flø Rasmussen
3b8ed65764 Bugfix in computation of injected and produced volumes. 
- Use correct function (from polymerUtilities.hpp).
 - Use correct input src term (equal to transport src).
 - Call at the correct point (after advective transport).
 2012-05-25 11:39:50 +02:00
Atgeirr Flø Rasmussen
00a628fa87 Removed orphan backslash. 2012-05-24 09:16:45 +02:00
Xavier Raynaud
68434429ac Removed changes in Makefile.am which should not have been committed. 2012-05-24 08:34:47 +02:00
Xavier Raynaud
91fe1c5d63 Removed useless commented regions. 2012-05-23 16:24:08 +02:00
Xavier Raynaud
4b805c191e Added bound checks to Newton column solver. 2012-05-23 16:22:48 +02:00
Xavier Raynaud
f8461eeec7 Added initialization of max concentration. 2012-05-22 11:15:40 +02:00
Xavier Raynaud
48adf98b5a Corrected some mistakes in Gauss Seidel gravitation transport solver. 2012-05-21 16:41:29 +02:00
Atgeirr Flø Rasmussen
c115ba2c28 Adapt to renaming and other small modifications of state and initialization. 2012-05-16 15:59:37 +02:00
Xavier Raynaud
60599b9dbf Implemented Gauss-Seidel solver for polymer. Not tested! 2012-05-16 15:06:14 +02:00
Atgeirr Flø Rasmussen
7d54d1f31b Adapt to changed interface of computePorevolume(). 2012-05-14 21:47:46 +02:00
Atgeirr Flø Rasmussen
bcb4c1bf2c Use simpler data structure for columns. 2012-05-14 11:06:30 +02:00
Xavier Raynaud
49948e07b9 merge 2012-05-14 10:50:26 +02:00
Atgeirr Flø Rasmussen
67a6674495 Update for simplified column data structure. 2012-05-11 09:41:01 +02:00
Xavier Raynaud
898eb655d5 added warning if use_gauss_seidel_gravity is used for gravitation solver. 2012-05-10 17:53:01 +02:00
Xavier Raynaud
1eb75314e6 Make polymer_reorder.cpp compliant with well management. Not tested! 2012-05-10 14:42:08 +02:00
Atgeirr Flø Rasmussen
9806f78a77 Update call to computeTransportSource() to match interface change. 2012-04-25 08:32:35 +02:00
Xavier Raynaud
81d90b28e2 merge 2012-04-23 14:06:44 +02:00
Xavier Raynaud
e867c53722 polymerUtilities uses now PolymerProperties to compute effective mobilities. 2012-04-23 11:49:05 +02:00
Atgeirr Flø Rasmussen
4ae1339460 Catch exceptions from boost::create_directories() to give useful error message. 2012-04-23 11:09:09 +02:00
Atgeirr Flø Rasmussen
e02429f5dc Using LinearSolverFactory now. 2012-04-23 11:07:43 +02:00
Xavier Raynaud
a0794117c9 Cleaned code for computation of residual, many changes, not tested! 2012-04-19 17:21:08 +02:00
Atgeirr Flø Rasmussen
4d3a5ccfad Adapted to IncompTpfa needing well input/output. 2012-04-18 13:35:15 +02:00
Atgeirr Flø Rasmussen
346647ca37 Removed unused code. 2012-04-12 15:11:30 +02:00
Atgeirr Flø Rasmussen
ad298a39d4 Added rock compressibility effects to polymer_reorder. 2012-04-12 14:49:24 +02:00
Atgeirr Flø Rasmussen
eb502faae7 Moved AdHocProps to new Inc.Props.DefaultPolymer class. 
Also moved some functions in polymer_reorder.cpp to be more similar to spu_2p.cpp.
 2012-04-12 14:10:47 +02:00
Atgeirr Flø Rasmussen
4d41caeea4 Added parameter num_transport_substeps and implemented substepping. 2012-04-12 13:49:29 +02:00
Atgeirr Flø Rasmussen
c99e396ed1 Silence warnings related to ad-hoc polymer fluid wrapper class. 2012-04-12 09:07:15 +02:00
Atgeirr Flø Rasmussen
18618b2d62 Changed initialization and other parts to be more similar to spu_2p.cpp. 2012-04-02 15:46:17 +02:00
Atgeirr Flø Rasmussen
724645b3f8 Introduced enum for adsorption behaviour to make code more self-documenting. 2012-03-27 15:33:48 +02:00
Xavier Raynaud
252fada2b4 Adapted to change in gravitation solver interface. 2012-03-27 13:05:53 +02:00
Xavier Raynaud
873b25c9e4 merge. 2012-03-27 12:51:24 +02:00
Xavier Raynaud
b846b15f1f Corrected typo: adsorbtion -> adsorption. 2012-03-27 11:26:55 +02:00
Xavier Raynaud
acedd4b596 Added adsorbtion in residual computation. 2012-03-27 11:20:20 +02:00
Atgeirr Flø Rasmussen
cffd06ab91 Fixed segregation scenario init. Reinstated old AdHocProps behaviour. 
AdHocProps: the relperm curves are now the same as in the standard small
testcase also used in the MRST prototype.
 2012-03-27 09:36:37 +02:00
Xavier Raynaud
6d9f0ea3ec Added support for adsorbtion index (desorbtion allowed or not). 2012-03-26 16:37:39 +02:00
Atgeirr Flø Rasmussen
294c8b03be Bugfix in calculation of adsorbed polymer for balance reports. 2012-03-26 15:33:38 +02:00
Xavier Raynaud
c070f0ad4d Added influx for scenario 3. 2012-03-26 13:45:35 +02:00
Xavier Raynaud
1836247dab Added actual resistance factor. Not tested. 2012-03-23 17:40:03 +01:00
Xavier Raynaud
bd8288077f Changed permeability values to run segregation test case. 2012-03-20 17:42:35 +01:00
Xavier Raynaud
272bc376bb Added flags for computation methods (as in spu_2p). 2012-03-20 11:59:14 +01:00
Xavier Raynaud
e7e9c03a67 Added gravitation. Only segragation splitting and gravitation column solver. 2012-03-19 16:32:41 +01:00
Atgeirr Flø Rasmussen
6a6c039d8f Added parameter 'output_interval'. 2012-03-15 15:10:09 +01:00
Atgeirr Flø Rasmussen
1554bfff11 Still working on adsorption computations. 2012-03-14 16:13:59 +01:00
Atgeirr Flø Rasmussen
b227b7e954 Add reporting of adsorbed polymer. Buggy, do not trust yet. 2012-03-14 16:03:28 +01:00
Atgeirr Flø Rasmussen
ad470a7796 Bugfix: dead pore space in polymer mass calc. Added computePolymerAbsorbed(). 2012-03-14 15:54:36 +01:00
Atgeirr Flø Rasmussen
97cd0ffa73 Added polymer reporting to mass balances. Not with absorbed polymer yet. 2012-03-14 14:03:47 +01:00
Atgeirr Flø Rasmussen
48d0fdf0ba Added comment. 2012-03-14 13:07:40 +01:00
Atgeirr Flø Rasmussen
5cd19e6dfa Amount injected now defaults to max given by polymer properties. 2012-03-14 13:05:39 +01:00
Atgeirr Flø Rasmussen
46cc14a308 More changes for feature parity with spu_2p. 2012-03-14 12:52:38 +01:00
Atgeirr Flø Rasmussen
ae172597e0 Untabify again. 2012-03-14 11:19:47 +01:00
Atgeirr Flø Rasmussen
d8f39c747c Adding features from opm-core/examples/spu_2p.cpp. 2012-03-14 11:19:05 +01:00
Atgeirr Flø Rasmussen
120055dc94 Untabify. 2012-03-14 10:40:05 +01:00
Atgeirr Flø Rasmussen
393807b165 Minor #include changes. 2012-03-14 10:39:43 +01:00
Bård Skaflestad
938640f180 Catch up to interface change of writeVtkData(). 
OPM-Core change-set 57bac968c8a6 replaced UnstructuredGrid pointers
with the corresponding (const) references.
 2012-03-14 09:11:32 +01:00
Atgeirr Flø Rasmussen
93a747403e Follow change to IncompTpfa (adding BCs). 2012-03-07 09:38:09 +01:00
Atgeirr Flø Rasmussen
5b21e24e79 Make default initial saturation equal to connate water. Use new total mobilities. 2012-03-06 16:08:35 +01:00
Xavier Raynaud
ceef4bbdcd Parameter single_cell_method is now enum. Some optimization. 
Redundant computation of fractional flow and mc removed.
 2012-03-05 11:56:23 +01:00
Atgeirr Flø Rasmussen
214f6ff38a Use IncompPropertiesFromDeck instead of AdHocProps when initializing from deck. 2012-03-02 15:32:28 +01:00
Xavier Raynaud
a33e3d9db0 rock density is obtained from PLYROCK in PolymerProperties::getFromDeck. 2012-02-29 14:58:51 +01:00
Xavier Raynaud
125933468e polymer_reorder reads polymer data from PolymerProperties. 2012-02-29 13:28:43 +01:00
Xavier Raynaud
123762caa9 Added class PolymerProperties with a constructor which takes argument from an eclipse parser. 2012-02-29 11:27:59 +01:00
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
6b267dd871 Bugfix in computation of the derivatives of the relative permeability. 2012-02-27 15:43:26 +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
Atgeirr Flø Rasmussen
75ea10eea4 Added support for gravity in pressure solver. 2012-02-22 15:06:19 +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
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
dd324478de Added s-c splitting solver for single cell problem. 2012-02-20 09:27:22 +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
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
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
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
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
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
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
143861745a Initial work on supporting polymer transport. Work in progress. 2012-02-03 16:39:55 +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
Bård Skaflestad
a785d9488e Create minimum buildable Polymer module for OPM. 2012-02-01 16:16:30 +01:00