OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,713 Commits 9 Branches 35 Tags
e15a28de68c5fa329ddc01de7ed9103d23ee346b
Commit Graph
65 Commits
Author SHA1 Message Date
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
Halvor Møll Nilsen 3267592e49 make geometry parallel 2012-10-31 16:21:31 +01:00
Bård Skaflestad 1a0eeb47ba Merge remote-tracking branch 'upstream/ert' into ert 
Conflicts:
	Makefile.am
 2012-10-12 10:58:16 +02:00
Atgeirr Flø Rasmussen 4b01cf53dd Merge branch 'master' into ert 
Conflicts:
	opm/core/grid/cpgpreprocess/preprocess.h
 2012-10-03 10:00:58 +02:00
Bård Skaflestad fb8ade64c1 Merge remote-tracking branch 'upstream/master' 2012-10-02 19:30:31 +02:00
Bård Skaflestad 3108031bfd Document appropriate structure fields. 
Commit 642eaf6 introduced the correct documentation, but mixed the order
of the 'zcorn' and 'actnum' documentation.  This commit corrects that
oversight.
 2012-10-02 16:24:13 +02:00
Atgeirr Flø Rasmussen 00bbfa06a8 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
 2012-09-05 13:36:19 +02:00
Bård Skaflestad 2b610dfce7 Assert that all cells are in range. 
This will (hopefully) prevent the issues fixed in commits aaae8e1 and
462c7cf from reoccurring.
 2012-08-23 15:25:04 +02:00
Ivar Ursin Nikolaisen 462c7cf8e3 Add parentheses to c1 assignment for consistency. 2012-08-21 15:15:40 +02:00
Ivar Ursin Nikolaisen aaae8e170b Fix associativity bug in get_zcorn_sign 
The bug can also cause c2 to be larger than the length of
actnum, leading to segmentation faults.
 2012-08-21 14:15:49 +02:00
Bård Skaflestad 624d6177df Restore coding conventions. 
Inadvertently lost in commit 064184b.
 2012-08-14 10:44:17 +02: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 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
Bård Skaflestad 0858cbfc16 Document public interface of Cartesian grid constructors. 2012-07-18 12:05:53 +02:00
Bård Skaflestad 642eaf6c29 Document public interface of cpg-processing module. 2012-07-18 11:22:43 +02:00
Bård Skaflestad 426cb97003 Fix misprint. 2012-07-18 11:21:42 +02:00
Bård Skaflestad 46b89cf1a9 Document public corner-point processing interfaces. 2012-07-18 11:17:59 +02:00
Joakim Hove d782ba15cb Merge branch 'master' of github.com:OPM/opm-core into ert 2012-06-28 13:10:08 +02:00
Joakim Hove bb066aa23b Added functionality to save results in ECLIPSE format from ERT libraries. 2012-06-27 20:20:05 +02:00