OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,989 Commits 9 Branches 35 Tags
60ae384ba88bd2dd920c8d6aa3bc542678324063
Commit Graph
115 Commits
Author SHA1 Message Date
Liu Ming ea98e431bc adapt to api changes of opm-parser. 2015-02-12 16:04:41 +08:00
Liu Ming 4d7309b1bf Support minpvf. 2015-02-09 11:25:09 +08:00
Atgeirr Flø Rasmussen 605d3e0d09 Make MinpvProcessor ignore inactive cells. 2015-01-19 15:44:13 +01:00
Markus Blatt 9cf21d87ee Skip the pointer arithmetic. 
Bard was right that the iterator_range returns the underlying
native pointers. Therefore can write the computation much more
natural.
 2015-01-14 21:58:37 +01:00
Markus Blatt 1b6bbb035e Fixed bogus documentation of vanished cell_index. 2015-01-14 10:09:01 +01:00
Markus Blatt cba54977bb Adds a free function to UgGridHelpers to access the face tag. 
To identify the face tag we use the iterator over the cell faces.
This provides all the information needed both for UG and CpGrid.
 2015-01-13 20:36:33 +01:00
Markus Blatt f7622f0e71 Avoid multiple symbol definitions for MinPvProcessor. 
The non-template class MinpvProcessor contains all function
definitions inside of the header file without inlining. The
results in the symbols being in the library of opm-core and
in case of using CpGrid an addtional occurence in other
libraries (opm-autodiff?).

This commit changes this by simply inlining all these functions.

Note that another (better?) option would be to move at least
the bigger once into a cpp file.
 2015-01-12 16:35:03 +01:00
Atgeirr Flø Rasmussen 48439d6420 Use proper way to access pi() from boost::math. 2014-12-01 14:55:06 +01:00
Atgeirr Flø Rasmussen 8af3b17c68 Simplify formula with atan2(). 2014-12-01 14:38:08 +01:00
Atgeirr Flø Rasmussen 35a8bd4791 Fix more whitespace tab->space issues. 2014-12-01 14:21:16 +01:00
Atgeirr Flø Rasmussen 9e26afaaba Fix comment referencing renamed function. 2014-12-01 13:43:34 +01:00
Atgeirr Flø Rasmussen 6bc74bd746 Replace M_PI with boost usage. 2014-12-01 12:11:27 +01:00
Atgeirr Flø Rasmussen 3eb3000248 Rename vertexNeighbours() -> cellNeighboursAcrossVertices(). 2014-12-01 11:37:49 +01:00
Atgeirr Flø Rasmussen e7bdb72ce3 Whitespace: tabs to spaces. 2014-12-01 11:28:28 +01:00
Atgeirr Flø Rasmussen e807834a3c Use GridHelpers in implementation of vertexNeighbours(). 2014-12-01 11:27:39 +01:00
Atgeirr Flø Rasmussen 700d49ac91 Minor fixes for FaceCellsProxy::operator(). 
Fixes are:
 - Made the method const.
 - Corrected argument name cell_index -> face_index.
 2014-12-01 11:22:33 +01:00
Atgeirr Flø Rasmussen b26bfc51f6 Add orderCounterClockwise() and test. 2014-11-27 14:49:32 +01:00
Atgeirr Flø Rasmussen 578f467b59 Add free function vertexNeighbours() and test. 2014-11-27 14:49:32 +01:00
Atgeirr Flø Rasmussen 5e940faa8b Use syntax for std::array which works with GCC 4.4. 2014-08-27 16:00:57 +02:00
Atgeirr Flø Rasmussen ce4168df27 Refactor set/getCellCorn() with private method. 
Also const-ify everything that can be const.
 2014-08-27 13:17:28 +02:00
Atgeirr Flø Rasmussen 0f02dba2d4 Correct doc error (zcorn is also output argument). 2014-08-27 11:15:00 +02:00
Atgeirr Flø Rasmussen 7ca1922c77 Remove unneeded const_cast. 2014-08-27 11:13:37 +02:00
Atgeirr Flø Rasmussen 4279170284 Change loop order. 2014-08-26 22:10:31 +02:00
Atgeirr Flø Rasmussen 37604618ec Documented MinpvProcessor. 2014-08-25 15:39:33 +02:00
Atgeirr Flø Rasmussen 4ad160d2de Add new constructor, that can handle MINPV processing. 2014-08-25 15:20:41 +02:00
Atgeirr Flø Rasmussen f74a0bb3e6 New class MinpvProcessor, and test. 2014-08-25 15:20:01 +02:00
Atgeirr Flø Rasmussen cfd07600bc Create pointer-to-const objects. 
Older gcc (4.4) does not allow conversion of shared_ptr<Foo> to
shared_ptr<const Foo>. Pointed out by @bska.
 2014-08-21 15:24:39 +02:00
Atgeirr Flø Rasmussen 5690d20705 Add PINCH support to grid construction. 2014-08-21 14:32:13 +02:00
Atgeirr Flø Rasmussen f72f823aab Make all construction from deck use EclipseGrid. 
The deck constructor is still present, but it will construct an
EclipseGrid object instead of doing its own equivalent processing.
 2014-08-21 14:21:21 +02:00
Andreas Lauser f96417e81c rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2014-05-21 11:22:43 +02:00
Andreas Lauser 3941fbc5f1 remove EclipseGridParser compatibility methods from all classes 2014-05-21 11:22:43 +02:00
Joakim Hove 0c9212a605 ERT-601: Added GridManager() constructor which takes a Parser::EclipseGrid instance 2014-04-22 17:16:11 +02:00
Joakim Hove 8260d945fa Added function grid_equal() to compare two UnstructuredGrid instances. 2014-04-22 15:13:54 +02:00
Bård Skaflestad 04704de376 Merge pull request #518 from blattms/master-refactor-for-cpgrid-support 
refactor for cpgrid support to apply to master
 2014-04-15 00:02:31 +02:00
Andreas Lauser 07d0196466 remove second grdecl.h header file 
that one was completely unused and the "grdecl" struct defined in
there collided name-wise with the one defined in "GridManager.hpp".
trying to link code which used the version of the grdecl.h header with
code that used the one from GridManager.hpp would have resulted in _a
lot_ hilarity...
 2014-04-10 18:06:05 +02:00
Markus Blatt 8668ce7b71 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Manually resolved conflicts:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/simulator/initState_impl.hpp
	opm/core/wells/WellsManager.cpp
	opm/core/wells/WellsManager.hpp
 2014-03-27 15:27:11 +01:00
Atgeirr Flø Rasmussen f8f7550782 Made single-argument constructors explicit. 
Avoids unintended implicit conversions.
 2014-03-17 13:27:50 +01:00
Markus Blatt baa0261132 [bugfix] Take normalized face normals into account when calculating tpfa. 
At least for Cpgrid the face normal is normalized which has to be taken into
account in tpfa_htrans_compute.
We therefore multiply the facenormal with the face area in cases (read Cpgrid)
where this needed.
 2014-02-27 12:28:22 +01:00
Markus Blatt aafe9147eb Added documentation for FaceCellTraits 2014-02-25 15:03:01 +01:00
Markus Blatt b0ac1572e1 Added traits classes for the type of cell and face centroids. 2014-02-25 15:01:22 +01:00
Markus Blatt a0253e8e0f Added method to access face normals. 2014-02-25 14:59:53 +01:00
Markus Blatt 842667eab2 Added free method to get the sum of the the faces that are attached to every cell. 2014-02-21 11:50:36 +01:00
Markus Blatt e5b1feb2d5 Assume begin_cell_centroid to what the name tells us: an iterator over then centroids. 
Therfore we do not need to call center() in getCoordinate. This is done in the iterator
class returned from CpGrid.
 2014-02-20 10:45:08 +01:00
Markus Blatt b164f4ba95 Fix doxygen documentation. 2014-02-20 10:44:43 +01:00
Markus Blatt 3aad1a6cc5 Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support 
Resolved Conflicts:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/props/rock/RockFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
 2014-02-19 15:22:18 +01:00
Markus Blatt 8da99e11c5 Refactored parts needed for Blackoil in autodiff to get rid of UG dependency. 
This patch refactors (hopefully) all parts of opm-core that are needed
by the fully implicite black oil solver in opm-autodiff and that inherently
relied on UnstructuredGrid.

We added a new simple grid interface consisting out of free functions
that will allow us to use CpGrid without copying it to an UnstructuredGrid
by the means of the GridAdapter. Using this interface we have add methods that
allow specifying the grid information (global_cell, cartdims, etc.) wherever
possible to prevent introducing grid parameters for the type of the grid.
Unfortunately this was not possible everywhere.
 2014-02-17 13:23:01 +01:00
Andreas Lauser 099d6ee797 rename "createGrDecl" to "createGrdecl" 2014-02-07 19:35:28 +01:00
Andreas Lauser 96a7730d8c add variants of all methods which take the new parser to the grid manager 2014-02-07 19:35:28 +01:00
Atgeirr Flø Rasmussen ad899fcc10 Now checks for missing TOPS or DEPTHZ in DXV etc. initialization. 2014-01-24 13:55:16 +01:00
Arne Morten Kvarving 60d4a02c0b fix some openmp pragma's 2014-01-21 14:33:14 +01:00