OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-19 05:53:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,145 Commits 24 Branches 102 Tags 82 MiB
c93c1252e5
Commit Graph

126 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
bccb7381fd Added initBlackoilSurfvol() function. 2012-05-21 14:03:56 +02:00
Atgeirr Flø Rasmussen
18a0d0cf9f Added initialization of face pressures. 2012-05-21 10:19:12 +02:00
Atgeirr Flø Rasmussen
cd72a50977 Added initFacePressure() function. 2012-05-21 10:10:52 +02:00
Xavier Raynaud
f252f59e5c Added necessary #include. 2012-05-16 16:08:48 +02:00
Atgeirr Flø Rasmussen
d15a952cdd Added initStateBasic() overload taking BlackoilPropertiesInterface props. 2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
af8a32c560 Silence a warning. 2012-05-16 12:52:58 +02:00
Atgeirr Flø Rasmussen
cb03044d62 Renamed initTwophaseStateBasic() -> initStateBasic(). 2012-05-16 12:33:42 +02:00
Atgeirr Flø Rasmussen
f6efbf386c Renamed initStateTwophaseFromDeck() -> initStateFromDeck(). 
- Made initStateFromDeck() into a template taking arbitrary properties.
Implementation detail:
  - initWaterOilContact() was also templatized on props.
  - initHydrostaticPressure() is now overloaded on prop interface types.
 2012-05-16 11:37:31 +02:00
Atgeirr Flø Rasmussen
7df0023038 Added WellReport::push() overload taking BlackoilPropertiesInterface. 2012-05-15 12:50:02 +02:00
Atgeirr Flø Rasmussen
7700716d32 Added utility functions for compressible fluid case. 2012-05-15 12:49:15 +02:00
Atgeirr Flø Rasmussen
c0d43a69bd Now computePorevolume() takes a porosity array instead of a property object. 
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
 2012-05-14 21:47:10 +02:00
Bård Skaflestad
ece387d1ae Remove a variable rendered unused by change-set 5a9bf9f4a8b9. 2012-05-09 11:27:23 +02:00
Bård Skaflestad
0bd3e033b9 Flatten loops and prefer memcpy() to manual copying. 2012-05-09 11:21:47 +02:00
Kjetil Olsen Lye
88b8ddebd2 merge. 2012-05-08 12:25:29 +02:00
Kjetil Olsen Lye
8c6ea2895b Changed some minor bugs in the refactored code in wells_example 2012-05-08 12:23:58 +02:00
Bård Skaflestad
9e5b5be59b Delete trailing whitespace. 2012-05-08 12:04:59 +02:00
Bård Skaflestad
6b96d48677 Fix a likely indexing error leading to non-unit strides. 2012-05-08 12:03:50 +02:00
Kjetil Olsen Lye
c9d96d81b8 Refactored some computations into seperate methods in wells_example.cpp 2012-05-08 11:04:15 +02:00
Atgeirr Flø Rasmussen
1c8e21ae08 Rename parameter init_sat -> init_saturation (docs already used this name). 2012-05-03 13:48:59 +02:00
Atgeirr Flø Rasmussen
0aae87cf16 Rewrote wellsToSrc() to be a little more accepting and correct. 2012-05-03 13:45:19 +02:00
Atgeirr Flø Rasmussen
373a4f2689 Fix recently created bug in append_well_controls(). 2012-05-03 12:48:56 +02:00
Atgeirr Flø Rasmussen
6e9091bc4d Updated computeTransportSource() and wellsToSrc() to match changes in Wells data structure. 2012-05-02 09:24:34 +02:00
Atgeirr Flø Rasmussen
597a2cc7af Significant modification of well data structures and related functions. 
The following changes are made:
 - The SurfaceComponent enum has been removed.
 - Added new member Wells::number_of_phases.
 - The Wells::zfrac member has been replaced with comp_frac. The old
   zfrac always had 3 components per well (accessed according to the
   canonical ordering given by SurfaceComponent), the new one has
   number_of_phases components per well.
 - Changed add_well() accordingly to accept comp_frac.
 - Added new member WellControls::distr, giving distributions for
   rate controls.
 - All functions dealing with well controls now take Wells* and a
   well index instead of directly taking WellControls*.
 - Now append_well_controls() also takes a rate distribution argument.
 - Added new public function set_current_control().
 2012-04-26 13:55:35 +02:00
Atgeirr Flø Rasmussen
3fe04afa8d Follow change to well rate target sign convention. 2012-04-25 15:36:01 +02:00
Atgeirr Flø Rasmussen
43b1db22a3 Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units. 2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
8a9cf2cc79 Added class WellReport. 2012-04-25 11:00:33 +02:00
Atgeirr Flø Rasmussen
1c5f879530 Changed order of functions to match order in header file. 2012-04-25 08:59:31 +02:00
Atgeirr Flø Rasmussen
6985ec94fe Now computeTransportSource() ignores crossflow. 2012-04-24 15:18:19 +02:00
Atgeirr Flø Rasmussen
e017c53380 Include well flow in computeTransportSource(). 
Also minor fixes in spu_2p to handle no-wells case properly.
 2012-04-24 15:15:36 +02:00
Atgeirr Flø Rasmussen
8c1f9be1c3 Minor change to computeWDP() interface. 2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
b41dd9088c Fixed computeWDP again. 2012-04-24 13:36:32 +02:00
Kjetil Olsen Lye
981fd5e1f3 Fixed computeWDP. Small prettification of code. 2012-04-24 13:33:12 +02:00
Bård Skaflestad
e444a3b77e Expand description of function create_wells(). 
Restore original parameter names in the process.
 2012-04-22 11:50:41 +02:00
Bård Skaflestad
8770042d64 Hide memory management aspects of struct Wells. 2012-04-21 13:57:41 +02:00
Bård Skaflestad
3bca737913 Hide memory management aspects of struct WellControls. 2012-04-21 11:34:11 +02:00
Atgeirr Flø Rasmussen
36aa5fd90c Renamed add_wells() -> add_well(). Documented. 2012-04-20 11:34:58 +02:00
Atgeirr Flø Rasmussen
a96ac0bc9e Renamed some enums and functions relating to Wells, and started documenting it. 2012-04-20 09:50:36 +02:00
Atgeirr Flø Rasmussen
1365dcd6b8 Initialise current well control in the appropriate place. 2012-04-19 16:11:58 +02:00
Kjetil Olsen Lye
b0b13c71f9 Fixed a compilation bug, also adjusted computeWDP slightly to allow for either a saturation vector by grid cells or by well cells 2012-04-17 09:19:06 +02:00
Kjetil Olsen Lye
67251e7f77 Added documententation of computeWDP and computeFlowRatePerWell 2012-04-16 11:39:16 +02:00
Kjetil Olsen Lye
d4b849f215 merge. 2012-04-13 20:41:19 +02:00
Kjetil Olsen Lye
af849bf9e9 Added computations for total flow for each well 2012-04-13 14:22:44 +02:00
Bård Skaflestad
a950a5c732 well_controls_append(): Use C comment delimiters in C. 2012-04-13 14:09:20 +02:00
Kjetil Olsen Lye
c992deb147 prettification 2012-04-13 13:21:33 +02:00
Kjetil Olsen Lye
3058e26447 merge 2012-04-13 13:20:36 +02:00
Kjetil Olsen Lye
f1cc0d56e8 Added reading of WGRUPCON, also added guide_rates to the well groups. Fixed a small bug in calculateWDP 2012-04-13 10:32:36 +02:00
Bård Skaflestad
9059af9b41 Opm::computeWDP(): Don't shadow (well) loop counter in phase loop. 2012-04-12 22:43:33 +02:00
Bård Skaflestad
a38efedc8d Opm::computeWDP(): Match definition and prototype. 
Specifically, accept the densities as a reference to const, not just a
const object.
 2012-04-12 22:41:03 +02:00
Kjetil Olsen Lye
74fc0a5c25 Made a (possibly wrong) adjustment to well_controls_append. Each control now has its current index set to 0, as there's only supposed to be one control per well. 2012-04-12 18:47:06 +02:00
Kjetil Olsen Lye
7c21765100 Made a computeWDP-function 2012-04-12 17:50:51 +02:00
Atgeirr Flø Rasmussen
ed5a7802b3 Bugfix: ensure all cells have a valid saturation initially. 2012-03-29 21:10:14 +02:00
Atgeirr Flø Rasmussen
5e78fc1c9f Multiple changes dealing with initialization. Work in progress. 
- Moved simulator state class into its own file.
 - Using new initState...() methods in spu_2p.cpp
 - No longer controlled by 'scenario' parameter.
 2012-03-29 13:05:59 +02:00
Atgeirr Flø Rasmussen
41979968ff Minor bugfix. 2012-03-29 12:50:18 +02:00
Atgeirr Flø Rasmussen
bcb9a8772f Added correct documentation to initStateTwophaseBasic(). 2012-03-29 11:09:13 +02:00
Atgeirr Flø Rasmussen
3870df7fcd Added functions initStateTwophaseBasic() and initStateTwophaseFromDeck(). 2012-03-29 11:06:05 +02:00
Atgeirr Flø Rasmussen
6688ea1031 Make comments relating to omega (frac.flow-weighted density) precise. 2012-03-20 14:21:22 +01:00
Atgeirr Flø Rasmussen
227d3e7d3c Added computePorevolume() overload taking rock compressibility into account. 2012-03-20 10:31:32 +01:00
Atgeirr Flø Rasmussen
f40d0ad8de Documented computePhaseMobilities(). 2012-03-20 10:13:27 +01:00
Atgeirr Flø Rasmussen
5a47b3b075 Fix doc typo. 2012-03-14 13:46:21 +01:00
Atgeirr Flø Rasmussen
d98b83bd3d Moved Watercut class to miscUtilities.hpp. 2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
08e12d7be1 Added wellsToSrc() function. Use forward declarations in header. 2012-03-14 09:51:08 +01:00
Bård Skaflestad
e93ae04452 Merge from upstream. 2012-03-14 00:00:15 +01:00
Atgeirr Flø Rasmussen
f72fdf1914 Added computeSaturatedVol() and computeInjectedProduced() functions. 2012-03-13 15:56:52 +01:00
Bård Skaflestad
29ba859a80 Re-implement computeTotalMobilityOmega() in terms of computePhaseMobilities(). 2012-03-12 16:18:02 +01:00
Bård Skaflestad
c4f803fedd Re-implement computeTotalMobility() in terms of computePhaseMobilities(). 2012-03-12 16:09:26 +01:00
Bård Skaflestad
2ac5157148 Add utility for calculating all phase mobilities. 2012-03-12 16:03:29 +01:00
Atgeirr Flø Rasmussen
dfa5bda17d Changed some function signatures to take const UnstructuredGrid& instead of ptr. 2012-03-12 13:44:05 +01:00
Atgeirr Flø Rasmussen
03200bbf37 Added computeTransportSource() function. Handling bdy fluxes in spu_2p. 2012-03-12 13:00:48 +01:00
Atgeirr Flø Rasmussen
100108b5ad Added computeAverageSat() function. 2012-03-09 11:44:21 +01:00
Atgeirr Flø Rasmussen
00e87d36b9 Changed forward declaration of 'class UnstructuredGrid' to 'struct UnstructuredGrid'. 2012-03-08 12:28:22 +01:00
Atgeirr Flø Rasmussen
939ddd8fe6 Fix minor typo. 2012-03-06 15:10:21 +01:00
Bård Skaflestad
f4df7aa1bd Don't assume that num_phases==2 when calculating total mobility. 2012-02-27 10:07:00 +01:00
Atgeirr Flø Rasmussen
b058678235 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
f9fd79dbcb Moved writeVtkData() functions to utility/, added a test program. 2012-02-19 21:24:59 +01:00
Bård Skaflestad
c711133b45 Fix code on platforms for which sizeof(double)!=sizeof(double*). 2012-02-06 12:52:41 +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