Atgeirr Flø Rasmussen
ba042c7241
Minor revision, mostly whitespace cleanup and comments.
2012-08-27 09:48:06 +02:00
Bård Skaflestad
aeb878cfa1
Merge remote-tracking branch 'upstream/master'
2012-08-24 20:44:05 +02:00
Halvor Møll Nilsen
5004f3c4b9
Corrected typing pointed out by atgeirr in respose to pullrequest
2012-08-24 20:31:13 +02:00
Halvor Møll Nilsen
423b5074b5
added writing of reorder iterations for each cell
2012-08-24 20:31:13 +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
Xavier Raynaud
6ad3e6c050
Merged branches: profiling -> default.
2012-08-23 15:02:56 +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
638eee501b
Added compressible 2-phase simulator, to replace sim_wateroil.cpp.
2012-08-23 14:07:11 +02:00
Atgeirr Flø Rasmussen
4cdb2a43a3
Fixed renormalization conditions.
2012-08-23 14:05:28 +02:00
Xavier Raynaud
10267620f9
Added changes made in default branch to profiling branch.
2012-08-23 13:59:29 +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
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
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
Bård Skaflestad
297ca997c7
Chase interface change of Opm::IncompPropertiesFromDeck constructor.
2012-08-10 12:38:24 +02:00
Bård Skaflestad
0c0ea6863f
Chase interface change of Opm::IncompPropertiesFromDeck constructor.
2012-08-10 12:27:41 +02:00
Atgeirr Flø Rasmussen
158c33eb53
Constructors of *FromDeck classes now take an UnstructuredGrid.
...
This is a change from taking a vector containing the mapping to
deck-consistent logical cartesian indices. The mapping is contained
in the UnstructuredGrid::global_cell member, and may be null. The
change therefore saves the overhead of constructing a vector as a
copy of the data in the grid or (if null) as an identity mapping.
2012-08-10 10:12:45 +02:00
Atgeirr Flø Rasmussen
ffdf7ed4f7
Adapt to possibility for Cartesian grids from deck input.
...
Now we may have a grid generated from deck input using the
keywords DXV, DYV, DZV, which will have a null pointer for
the global_cell mapping. We check if this pointer is null,
and create an identity mapping in this case. The mapping is
needed by the *PropertiesFromDeck classes (and helpers).
2012-08-09 14:35:00 +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
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
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
Xavier Raynaud
83e9afc75a
merge. profiling -> default.
2012-06-14 16:54:04 +02:00
Xavier Raynaud
168c4c9e3d
Optimized newton solver.
2012-06-14 16:52:03 +02:00
Xavier Raynaud
9e7a738767
merge default -> profiling.
2012-06-14 14:55:23 +02:00
Xavier Raynaud
95c3756443
merge.
2012-06-14 14:35:06 +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
1fc8c9f3b5
merge
2012-06-14 14:02:42 +02:00
Atgeirr Flø Rasmussen
67c13e794a
Moved SimulatorTimer class to opm/core/simulator directory.
2012-06-14 14:02:22 +02:00
Xavier Raynaud
6e7980ba47
fixed bug in relperm computation.
2012-06-14 14:01:53 +02:00
Xavier Raynaud
5f4b68fe33
merge profiling branch.
2012-06-14 13:39:12 +02:00
Xavier Raynaud
f3eb14e528
Added sc formulation for gradient method.
2012-06-14 13:37:08 +02:00
Atgeirr Flø Rasmussen
eb845fd45a
Added reporting of time usage to interface, similar to SimulatorTwophase.
2012-06-14 13:24:38 +02:00
