Atgeirr Flø Rasmussen
1106538d85
Merge remote-tracking branch 'hnil/hnil_class' into combined.
...
Conflicts:
CMakeLists.txt
examples/sim_wateroil.cpp
opm/core/grid/cpgpreprocess/geometry.c
opm/core/transport/reorder/ReorderSolverInterface.hpp
opm/core/transport/reorder/TofDiscGalReorder.cpp
opm/core/transport/reorder/TofDiscGalReorder.hpp
opm/core/transport/reorder/TofReorder.cpp
opm/core/transport/reorder/TofReorder.hpp
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
2013-03-14 16:18:39 +01:00
Atgeirr Flø Rasmussen
6127afc1c6
Adapt include statements to moved headers.
2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
2d871c1402
Moved writeECLData and writeVtkData to opm/core/io subdirs.
2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
ddd41bfcd7
Moved opm/core/eclipse/* to opm/core/io/eclipse/*.
2013-03-07 22:59:06 +01:00
Atgeirr Flø Rasmussen
f893adbda6
Document function currentDateTime().
2012-11-26 10:49:15 +01:00
Halvor Møll Nilsen
772aae6a62
Corrected include statements after renaming files.
2012-11-16 16:24:54 +01:00
Halvor Møll Nilsen
523ca56ef1
Changes needed to for makeing a simulator using ImplicitTransport. Several changes in names to highlight what is reorder simulator classes
2012-11-16 13:38:03 +01:00
Halvor Møll Nilsen
c090eb618b
Added wrapper in code in separate file. Continued to change ../simulator/SimulatorIncompTwophase.cpp
2012-11-15 15:01:12 +01:00
Halvor Møll Nilsen
6c666f90a8
Changes to try to make naming and classes more consistent. This is a start to make devide models and tranport solvers so that VE models is more easely handled
2012-11-15 13:20:49 +01:00
Joakim Hove
09b3ef785c
Added start_date_ property to the SimulatorTimer class
2012-11-07 14:53:26 +01:00
Atgeirr Flø Rasmussen
b9fc9896d3
Rename function argument and variable.
...
rock_comp -> rock_comp_props
2012-10-12 09:21:52 +02:00
Atgeirr Flø Rasmussen
280590a012
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
2fbdf9bd0a
Fix order of arguments in function call.
...
Rate and fractional flow were switched in call
to computePhaseFlowRatesPerWell().
2012-10-08 14:26:46 +02:00
Atgeirr Flø Rasmussen
7fd95d7333
Fix mass balance reporting.
...
Multiple issues:
- now reporting surface volumes, not reservoir volumes,
- fixed reporting for the case of multiple transport steps.
2012-10-02 15:47:47 +02:00
Atgeirr Flø Rasmussen
e9b2fc0ac9
Fix volume reporting with multiple transport substeps.
2012-10-02 15:47:21 +02:00
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
d74f0a9c52
Add output of surface volume.
2012-09-14 09:51:28 +02:00
Xavier Raynaud
38bcaeb362
Changed solvegravity interface. Fixed bug.
2012-09-05 10:10:02 +02:00
Xavier Raynaud
845c100dcd
Fixed order of arguments in function call.
2012-09-04 11:39:17 +02:00
Xavier Raynaud
76e517516f
Added missing initialization of gravity in constructor.
2012-09-03 14:55:19 +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
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
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
Atgeirr Flø Rasmussen
67c13e794a
Moved SimulatorTimer class to opm/core/simulator directory.
2012-06-14 14:02:22 +02:00