OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,487 Commits 9 Branches 35 Tags
2db194aca6caefa8e16a13de0235f05b574bbadb
Commit Graph
84 Commits
Author SHA1 Message Date
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
Andreas Lauser 16e7b7ac33 fix headers 
make all non-implementation headers includable without
preconditions. Also, this removes the GravityColumnSolver.hpp file,
because it tried to include a non-existing file and it was thus unused.
 2013-09-11 13:11:47 +02:00
Andreas Lauser c25ec5999e convert users of the ASSERT and the ASSERT2 macros to standard assert() 2013-09-05 13:04:37 +02:00
Andreas Lauser 19e5d5cea2 convert THROW to OPM_THROW 2013-09-05 13:04:37 +02:00
Bård Skaflestad 6d3cbafa54 Merge pull request #288 from andlaus/fix-clang-warnings 
fix a few CLang warnings
 2013-07-30 12:18:54 -07:00
Andreas Lauser 5a7992fc56 fix a few CLang warnings 
most of them quite insignificant, but still annoying. The only
exception is the warning about the changed alignment for the 'work'
argument of spu_implicit_assemble(). AFAICT, the only reason why it
worked was that the pointer produced by malloc() was passed
directly. (malloc() seems to fulfill all alignment criteria.) To fix
this, I've changed that argument's type from char* to double*.
 2013-07-30 16:27:20 +02:00
Joakim Hove f5ac9fc240 Actually using filename argument in GridManager::saveEGRID 2013-07-30 15:37:49 +02:00
Joakim Hove 07ed1a19f1 Merge remote-tracking branch 'upstream/master' into save-eclgrid-after-deactivating-cells 
Conflicts:
	opm/core/io/eclipse/EclipseGridParser.cpp
	opm/core/io/eclipse/EclipseGridParser.hpp
 2013-07-30 14:49:37 +02:00
Júlio Hoffimann 8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Joakim Hove 9cc3d4dd2d Changed EclipseGridParser::saveEGRID() to take globalCells as input 2013-07-25 12:08:08 +02:00
Joakim Hove 59b99f7444 Added method saveEGRID() on GridManager 2013-07-24 14:43:06 +02:00
Andreas Lauser 884c5ab027 make config.h the first header to be included in any compile unit 
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
 2013-04-10 12:56:14 +02:00
Andreas Lauser b20cb0f909 remove the include statement for omp.h in geometry.c 
this fixes the build on clang
 2013-04-10 12:41:28 +02:00
Atgeirr Flø Rasmussen ab59813dec Minor doc fix. 2013-03-20 14:21:19 +01:00
Atgeirr Flø Rasmussen b32674f3ea Moved ColumnExtract and initState. 
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
 2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen 0a935774d2 Move GridManager to grid subdir. 
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
 2013-03-18 10:16:46 +01:00
Atgeirr Flø Rasmussen c23898efa7 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 ac49972082 Remove more unused mex-interfaces. 2013-03-07 16:17:40 +01:00
Atgeirr Flø Rasmussen d63d1e7121 Removed some unused mex-interfaces. 2013-03-07 15:18:10 +01:00
Bård Skaflestad 4d6eca1847 Merge pull request #135 from atgeirr/doc-improvements 
Doc and comment improvements
 2013-02-06 01:26:29 -08:00
Atgeirr Flø Rasmussen f23d14a309 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:42:24 +01:00
Roland Kaufmann 4fb25b91ef Compute properties for cells in 2D 2013-01-21 23:15:55 +01:00
Roland Kaufmann 701526596d Compute properties for edges in 2D 2013-01-21 23:15:55 +01:00
Roland Kaufmann 7d8511fdaf Prepare for processing two-dim. grid 
Allow a two-dimensional grid to be sent to compute_geometry() without
the assertion triggering. Route three-dimensional grids to the existing
implementation.
 2013-01-21 23:15:55 +01:00
Atgeirr Flø Rasmussen 389a943f34 Bugfix: multiply by edge length in 2d face quadrature weights. 2012-12-14 13:17:36 +01:00
Atgeirr Flø Rasmussen ff1bfc810a Implemented 2d quadrature rules for degree 1 and 2 (order 2 and 3). 
Also added cartesian 2d cell testcase.
 2012-12-14 12:22:56 +01:00
Atgeirr Flø Rasmussen 980d6eb482 CellQuadrature works only for 3D, enforce it. 2012-12-04 20:56:05 +01:00
Atgeirr Flø Rasmussen d347d86f82 Moved FaceQuadrature and CellQuadrature classes to their own files. 2012-12-04 16:10:07 +01:00
Halvor Møll Nilsen a30e42b962 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
Bård Skaflestad 0d1603d705 Derive 'start' from traditional linear index expression 
In particular, this replaces the opaque 'off'-based expression with one
that is easier to verify on inspection.
 2012-11-14 21:33:45 +01:00
Atgeirr Flø Rasmussen ebf9514686 Improve clarity of previous bugfix (no functional change). 2012-11-14 15:05:53 +01:00
Atgeirr Flø Rasmussen 0a6a723ae9 Fix bug in computing correct ZCORN indices for grid cell. 2012-11-14 14:31:51 +01:00