OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-25 23:20:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
919 Commits 31 Branches 117 Tags
bfa52cc5f23c5c055b87af4594520adb91f35fc3
Commit Graph
106 Commits
Author SHA1 Message Date
Bård Skaflestad d3f85ea60c Merge remote-tracking branch 'upstream/master' into ert 
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.
 2012-10-12 00:43:51 +02:00
Atgeirr Flø Rasmussen 89eee7e220 Bugfix: order of function arguments. 
Order of arguments for computePhaseFlowRatesPerWell() was wrong.
This fix was done previously for SimulatorCompressibleTwophase,
but the incompressible sim was ignored.

Also added an ASSERT that may help catch some misuse.
 2012-10-10 14:09:09 +02:00
Atgeirr Flø Rasmussen a9783eefc7 Add explanatory comment. 2012-10-02 15:46:33 +02:00
Atgeirr Flø Rasmussen 4f276a8870 Bugfix: size of vector for A should be np*np. 2012-10-02 14:35:28 +02:00
Atgeirr Flø Rasmussen 017663cc5b Change interface for (blackoil) computeInjectedProduced(). 
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
 2012-10-02 11:12:23 +02:00
Atgeirr Flø Rasmussen 17c1be6541 Modified functions dealing with transport source. 
In preparation for switching to new convention for inflow
sources in the compressible case: source being surface volumes,
not reservoir volumes.
 2012-10-01 16:40:47 +02:00
Atgeirr Flø Rasmussen 6a01298312 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
 2012-09-26 09:07:57 +02:00
Atgeirr Flø Rasmussen 2017481a58 Improve diagnostic output if crossflow is detected. 2012-09-20 14:33:57 +02:00
Atgeirr Flø Rasmussen 8dc958044f Merge branch 'master' into ert 2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen 65447604ae Typo fix. 2012-09-14 20:56:08 +02:00
Atgeirr Flø Rasmussen 67b5f007fd Made initialization from SWAT/SGAS etc. more robust and general. 2012-09-14 10:40:36 +02:00
Atgeirr Flø Rasmussen 9c77d12f8d Merge branch 'master' into ert 
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
 2012-09-05 13:36:19 +02:00
Atgeirr Flø Rasmussen 0f9d572f9a Fix stride bug in WellReport::push(). Use convert::to(). 2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen 14aab769f2 Fix stride bug in SGAS/SWAT init. 2012-09-04 13:06:13 +02:00
Atgeirr Flø Rasmussen c2d41a6639 Whitespace cleanup and adding a check for #phases <= 3. 2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen 913054c473 Added more checks in 3-phase init code. 2012-09-03 13:54:50 +02:00
Atgeirr Flø Rasmussen c409fcccce Merge remote-tracking branch 'hnil/master' 2012-09-03 13:40:33 +02:00
Xavier Raynaud a8cb519d4e Fixed comment. 2012-09-03 12:26:22 +02:00
Xavier Raynaud 0701daa4dc Improve documentation. 2012-09-03 11:29:48 +02:00
Xavier Raynaud b4a4e297a8 Added functionality to compute porosity for compressible fluid. 2012-08-29 10:54:21 +02:00
Atgeirr Flø Rasmussen 5182fef48d Switch loop ordering for better cache performance. 2012-08-27 13:17:27 +02:00
Halvor Møll Nilsen cf9b9cdf20 Started work on supporting 3 phases for wellreport. 2012-08-27 12:22:32 +02:00
Halvor Møll Nilsen 9ef6014964 Addes support for initialisation of three phases using SWOF and SGOF 2012-08-27 12:20:03 +02:00
Atgeirr Flø Rasmussen 9bb76d74cc Fixed bug in matrix multiplication (matrix has Fortran element order). 2012-08-27 11:19:22 +02:00
Atgeirr Flø Rasmussen e96421dbd7 Whitespace cleanup. 2012-08-23 08:59:09 +02:00
Atgeirr Flø Rasmussen 96327164cc Added computeSurfacevol() method. 
The method is called by the reordering transport solver after computing
new saturations in order to update the surface volumes.
 2012-08-23 08:57:48 +02:00
Joakim Hove 368e1813a1 Using Datamapper.h in writeVtkData 2012-06-28 13:20:18 +02:00
Bård Skaflestad cc054d474d computeFractionalFlow(): Reuse the output array in all intermediate calculations. 
This eliminates a number of free-store operations and data movements.
 2012-06-13 17:07:56 +02:00
Atgeirr Flø Rasmussen 611cd53380 Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
Bård Skaflestad 664e0eadef initBlackoilSurfvol(): Use loop order consistent with column-major ordering. 2012-05-21 21:03:43 +02:00
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