OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,124 Commits 9 Branches 35 Tags 15 MiB
81ca766b86
Commit Graph

2124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
81ca766b86 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
fe0581b69b Preserve sorting order. 2012-08-21 14:09:44 +02:00
Atgeirr Flø Rasmussen
87ce47f70d 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
Bård Skaflestad
d2e6125570 Merge pull request #17 from hnil/master 
Added output of timing in param format.
 2012-08-21 02:28:41 -07:00
Atgeirr Flø Rasmussen
d9444d0dfb 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
Halvor Møll Nilsen
29c6be6752 Added writing of timings in param format 2012-08-21 09:57:36 +02:00
Atgeirr Flø Rasmussen
1170727f1e Renamed SimulatorTwophase -> SimulatorIncompTwophase. 2012-08-20 15:45:05 +02:00
Atgeirr Flø Rasmussen
bbf2b4f369 Changed name of parameter output file to 'simulation.param'. 2012-08-20 14:46:51 +02:00
Bård Skaflestad
9a44eababc Merge pull request #16 from atgeirr/master 
Added parameter output_vtk.
 2012-08-17 05:14:56 -07:00
Atgeirr Flø Rasmussen
427fb67e9b Merge remote-tracking branch 'upstream/master' 2012-08-17 13:58:13 +02:00
Atgeirr Flø Rasmussen
a23f8d1706 Added parameter output_vtk. 
Defaults to true, if false do not write .vtu output.
 2012-08-17 13:54:19 +02:00
Bård Skaflestad
21b33e40d7 Merge pull request #15 from atgeirr/master 
Modifications to compressible transport solver, other minor mods.
 2012-08-17 03:49:30 -07:00
Atgeirr Flø Rasmussen
9a1bcaf496 Whitespace cleanup. 2012-08-17 12:40:15 +02:00
Atgeirr Flø Rasmussen
8fa0140e66 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorTwophase.cpp
 2012-08-17 11:31:59 +02:00
Atgeirr Flø Rasmussen
f582627f2a Merge pull request #14 from hnil/master 
Corrected use of boost header.
 2012-08-17 02:26:51 -07:00
Atgeirr Flø Rasmussen
08e966eff1 Small improvements, outputs unused params at the correct time. 2012-08-17 11:20:42 +02:00
Halvor Møll Nilsen
bdad2c449c Changed header for boost. 2012-08-17 10:59:26 +02:00
Atgeirr Flø Rasmussen
48acb816ff Merge remote-tracking branch 'upstream/master' 2012-08-17 10:58:12 +02:00
Atgeirr Flø Rasmussen
6ed0b0a817 Merge pull request #13 from hnil/master 
Changed output to be easier to read from matlab.
 2012-08-17 01:55:18 -07:00
Halvor Møll Nilsen
b0cbc3d7f4 Reintroduced writing of param. 2012-08-16 16:10:28 +02:00
Halvor Møll Nilsen
5a05af55eb Merge remote-tracking branch 'upstream/master' 2012-08-16 16:01:52 +02:00
Halvor Møll Nilsen
2da6650b97 Moved output of quantities to separate directoirs inside the outdir. 
This is done to get a cleaner putput.
 2012-08-16 15:29:57 +02:00
Atgeirr Flø Rasmussen
b427125a4f Merge remote-tracking branch 'upstream/master' 2012-08-14 15:27:30 +02:00
Atgeirr Flø Rasmussen
d89395f486 Merge pull request #12 from bska/master 
Coding Style and Diagnostics Clean-up.
 2012-08-14 05:01:08 -07:00
Bård Skaflestad
7ccf0350bc Tighten grammar of "HAVE_AGMG" symbol description. 2012-08-14 12:55:57 +02:00
Bård Skaflestad
05410ac950 Always #define "HAVE_DUNE_ISTL". 
Define the symbol to zero (false) if unavailable.  This prevents a
diagnostic message concerning an undefined preprocessor symbol when used
in the form

    #if HAVE_DUNE_ISTL
       /* ... */
    #endif
 2012-08-14 12:49:56 +02:00
Bård Skaflestad
736020e6fe Always #define "HAVE_AGMG". 
Define the symbol to zero (false) if unavailable or unwanted.  This
prevents a diagnostic message concerning an undefined preprocessor
symbol (i.e., "HAVE_AGMG") when used in the form

    #if HAVE_AGMG
       /* ... */
    #endif
 2012-08-14 12:42:47 +02:00
Atgeirr Flø Rasmussen
17383ca91f Merge remote-tracking branch 'upstream/master' 2012-08-14 11:31:54 +02:00
Bård Skaflestad
f8825976f0 Restore original method spacing. 
No functional changes.
 2012-08-14 11:26:07 +02:00
Atgeirr Flø Rasmussen
a81df458e3 Gravity segregation column solver for compressible case implemented. 2012-08-14 11:25:59 +02:00
Bård Skaflestad
0841cea042 Restore coding conventions. 
Inadvertently lost in commit 064184b.
 2012-08-14 11:05:09 +02:00
Bård Skaflestad
5986b4a24d Re-adjust Doxygen layout for commit 9d9691a. 2012-08-14 11:03:33 +02:00
Bård Skaflestad
9d9691a927 Fix misprints in Doxygen comment. 2012-08-14 11:01:39 +02:00
Bård Skaflestad
56cd291080 Replace <tab>s by eight spaces. 
While here, fix a misprint in comment.
 2012-08-14 11:00:47 +02:00
Bård Skaflestad
7a48d13424 Remove an unused header. 
We don't need <string> to define the public interface of
LinearsSolverAGMG.
 2012-08-14 10:57:06 +02:00
Bård Skaflestad
624d6177df Restore coding conventions. 
Inadvertently lost in commit 064184b.
 2012-08-14 10:44:17 +02:00
Bård Skaflestad
b4175e5c2b Merge pull request #11 from hnil/master 
Changes: Poromult extapolate outside table. Facetages add to grid. Default of fluid is linear.
 2012-08-14 01:13:40 -07:00
Halvor Møll Nilsen
064184bd0c Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear. 2012-08-14 09:36:19 +02:00
Bård Skaflestad
3d45ca3512 Merge pull request #10 from atgeirr/master 
Improvements in grid creation and compressible solvers.
 2012-08-10 01:34:44 -07:00
Atgeirr Flø Rasmussen
9a23b8db74 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
abb4264b48 Made vector function argument a const reference. 2012-08-10 09:43:33 +02:00
Atgeirr Flø Rasmussen
b00532c6d9 Whitespace cleanup. 2012-08-09 14:48:44 +02:00
Atgeirr Flø Rasmussen
193d4d3921 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
1de03f017c Support using DXV, DYV, DZV in deck to create grid. 2012-08-09 14:28:13 +02:00
Atgeirr Flø Rasmussen
91a96307be Added TOPS keyword to deck parser. 2012-08-09 14:24:08 +02:00
Atgeirr Flø Rasmussen
a0b5ec9658 Merge remote-tracking branch 'upstream/master' 2012-08-09 10:55:23 +02:00
Bård Skaflestad
0f2b0bd33e Use read-only types for non-scalar input parameters. 
This allows the compiler to explicitly enforce conventions that
previously were only stated in the documentation.
 2012-07-20 16:04:45 +02:00
Bård Skaflestad
0cfa7223c4 Fix misprint in comment. 2012-07-20 11:36:02 +02:00
Atgeirr Flø Rasmussen
f2e1801219 Whitespace cleanup. 2012-07-19 15:34:42 +02:00
Atgeirr Flø Rasmussen
342a2f2668 Merge remote-tracking branch 'upstream/master' 2012-07-19 15:29:14 +02:00