Commit Graph

3107 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
69f8d98f8f Increase output precision for ascii dumps. 2012-10-02 14:39:12 +02:00
Atgeirr Flø Rasmussen
bcc03ef41d 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
076164d3f3 Add "output_vtk" parameter, split output function in two.
Vtk and Matlab output now happens in two different functions.
2012-09-17 07:54:50 +02:00
Atgeirr Flø Rasmussen
d74f0a9c52 Add output of surface volume. 2012-09-14 09:51:28 +02:00
Xavier Raynaud
4db4d715de Last saturation is stored in a mutable variable. 2012-09-10 11:03:59 +02:00
Halvor M. Nilsen
594eca3633 Added lines which is need to compile with PROFILING. Did not check if code brakes. 2012-09-08 11:11:23 +02:00
Xavier Raynaud
55486d3c03 Fixed source term (measured at reservoir condition). 2012-09-05 13:38:30 +02:00
Xavier Raynaud
938fc0f0d4 Fixed comment line. 2012-09-05 12:34:17 +02:00
Xavier Raynaud
7721defbd3 Fixed/Added documentation comments. 2012-09-05 11:45:54 +02:00
Xavier Raynaud
5f27612b05 Merged from upstream. 2012-09-05 11:11:06 +02:00
Xavier Raynaud
7fb671ffbf Changed computation of polymer production. Added functionalities for compressible case. 2012-09-05 11:09:45 +02:00
Bård Skaflestad
36e017d48d Honour initialisation order requirement.
Introduced in change-set 85cde6f721a4.
2012-09-05 10:27:37 +02:00
Xavier Raynaud
38bcaeb362 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud
8e089dd80d Use porevolume instead of porosity, as argument for the transport solver. 2012-09-05 09:11:05 +02:00
Xavier Raynaud
fa84128ddc Fixed bug. 2012-09-05 09:07:47 +02:00
Xavier Raynaud
845c100dcd Fixed order of arguments in function call. 2012-09-04 11:39:17 +02:00
Xavier Raynaud
612a1ffc63 Fixed bug. 2012-09-03 16:46:02 +02:00
Xavier Raynaud
27dea09311 Added initializations in constructor. 2012-09-03 16:45:50 +02:00
Xavier Raynaud
76e517516f Added missing initialization of gravity in constructor. 2012-09-03 14:55:19 +02:00
Xavier Raynaud
8752f14015 Added executable example for compressible with polymer. 2012-09-03 13:52:59 +02:00
Xavier Raynaud
8bf900f1bf Update surface volume in transport solver. 2012-09-03 12:52:25 +02:00
Xavier Raynaud
708c56bb94 Simplified computation of adsorbed mass of polymer. 2012-09-03 12:49:04 +02:00
Xavier Raynaud
a335e1b149 Added Simulator for compressible polymer. Not tested. 2012-08-31 10:38:50 +02:00
Xavier Raynaud
8b40a4a68f Fixed comments. 2012-08-30 15:58:14 +02:00
Xavier Raynaud
99fe7bf46e Fixed preprocessor flag names in some header files. 2012-08-30 15:31:28 +02:00
Xavier Raynaud
92def1d514 Cleaned up ownership (private vs public) in class definition. 2012-08-30 09:09:23 +02:00
Xavier Raynaud
eb52ee58c1 Added gravity transport solver functionality. Not tested. 2012-08-29 13:49:02 +02:00
Xavier Raynaud
928513b561 Added compressible polymer transport solver. Not yet done. 2012-08-28 16:42:26 +02:00
Xavier Raynaud
9a271a6038 Added (fluid) compressible pressure solver for polymer. 2012-08-27 13:16:10 +02:00
Atgeirr Flø Rasmussen
ac1ec3e9ac Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
0ed597fee9 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Halvor Møll Nilsen
7f3cbc476a Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 12:26:27 +02:00
Xavier Raynaud
72658ac91c Simplified code: Only one occurence of residual evaluation. 2012-08-23 17:18:19 +02:00
Xavier Raynaud
51e0512989 Removed non-used members in class ResidualEquation. 2012-08-23 16:51:51 +02:00
Atgeirr Flø Rasmussen
def904c6d6 Use the start-of-timestep pore volume in transport solver.
This is to improve consistency with other solvers, and relates
to the expression that is converted into a finite difference when
discretising:
  (phi s) - (phi s)^0 = phi^0(s - s^0) + (phi - phi^0)s
                        ^^^^^
The above marks the spot where we now use phi^0 instead of phi.
2012-08-23 14:58:32 +02:00
Xavier Raynaud
52a19192cb Added PROFILING preprocessor flag. 2012-08-23 14:58:26 +02:00
Atgeirr Flø Rasmussen
cf3511663c Fixed solveGravity(): now properly modifies surfacevolume.
Also:
  - solveGravity() interface changed to take surface volume as a parameter,
  - gravity vector is now given in initGravity() instead of
    solveGravity(), for consistency with the incompressible solver.
2012-08-23 14:45:23 +02:00
Atgeirr Flø Rasmussen
4cdb2a43a3 Fixed renormalization conditions. 2012-08-23 14:05:28 +02:00
Atgeirr Flø Rasmussen
70d33843e4 Chase changes to some interfaces after merging. 2012-08-22 11:16:51 +02:00
Atgeirr Flø Rasmussen
1fc5c8988f Merge branch 'rock_comp_tpfa' 2012-08-22 11:13:16 +02:00
Atgeirr Flø Rasmussen
87e4b017ed New class SimulatorCompressibleTwophase. 2012-08-22 10:37:52 +02:00
Atgeirr Flø Rasmussen
7c313282c0 Minor comment fix. 2012-08-22 09:05:54 +02:00
Atgeirr Flø Rasmussen
f2f49c7132 Fix pressure renormalization conditions. Some formatting fixes.
Checking for both rock compressibility and pressure conditions
is necessary before we renormalize pressure.
2012-08-21 14:52:43 +02:00
Atgeirr Flø Rasmussen
2acaa970e1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	examples/sim_2p_incomp_reorder.cpp
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-21 12:47:52 +02:00
Atgeirr Flø Rasmussen
8e80848486 Added well constraint checking to SimulatorIncompTwophase.
- Changed Wells constructor arg for SimulatorIncompTwophase to WellsManager.
 - Insert checking code for well constrains (mostly copied from spu_2p.cpp).
Unrelated to the above changes.
 - Added pressure normalization for incompressible case (from spu_2p.cpp)
2012-08-21 10:51:14 +02:00
Atgeirr Flø Rasmussen
d09e60820f Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa 2012-08-20 16:09:20 +02:00
Atgeirr Flø Rasmussen
a86239d10c Renamed SimulatorTwophase -> SimulatorIncompTwophase. 2012-08-20 15:45:05 +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
0d97945aba Removed safetyfactor with membervariable which for now is put to 1.0. Made jacobian calculations more transparent and fixed pointer error. 2012-06-26 08:37:08 +02:00
Halvor M. Nilsen
aba26a0583 Tried to make derivative genneral 2012-06-23 15:04:59 +02:00