OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,583 Commits 9 Branches 35 Tags
a6c173abadcf1123e406f8b2b465613139da1865
Commit Graph
239 Commits
Author SHA1 Message Date
Andreas Lauser cbb5910a93 incorperate the review comments/decisions for multi-region PVT 
the largest change is that all classes below opm/core/props/pvt take
the PVT region index as an argument, the higher-level ones (i.e.,
BlackoilProps*) take cell indices.
 2014-06-04 11:11:35 +02:00
Atgeirr Flø Rasmussen 97f94cb269 Remove unneeded term, fixing oil injecting behaviour. 
The 'comp_term' is supposed to be a total divergence term, which is supposed
to be zero for incompressible flow. It was added for improved robustness in
stagnant areas, but as implemented it would not be computed properly for
oil injection scenarios, due to the convention for two-phase transport
source terms (positive terms are inflow of first phase [water], negative
terms are total outflow).
 2013-10-04 13:16:02 +02:00
Bård Skaflestad fdc6c7b6ed Remove unused "typedef"s 
CLang and recent versions of GCC warn about unused "typedef"s.  This
change-set removes currently known instances in opm-core.
 2013-09-26 19:22:59 +02: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
Andreas Lauser d11db08084 include iostream in the files which use std::cerr or std::cout 
for some of these files this is needed to make to keep it compiling
after the next patch because the new ErrorMacros.hpp file will no
longer implicitly includes <iostream>. for the remaining files it is
just good style.

While at it, the includes for most of these files have been ordered in
order of decreasing abstraction level.
 2013-09-05 13:04:37 +02:00
Andreas Lauser bd094b2e11 replace boost::scoped_ptr by std::unique_ptr 
thanks to Bård Skaflestad, Atgeirr Rasmusen and Roland Kaufmann for
the hint.
 2013-08-08 15:21:38 +02:00
Andreas Lauser 31e7e7e01d better fix for the alignment warning of the previous patch 
'work' is a small, constant size array for temporary data so it can be
allocated on the stack and the 'work' parameter can be eliminated entirely.

Thanks to Bård Skaflestad for the suggestion!
 2013-07-30 19:07:30 +02: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
Júlio Hoffimann 8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Lars Vingli Odsæter f8bad8fd92 Change verbosity level of warning message in transport solver 
Don't print message "s was clamped in some cells" unless preprocessor
symbol 'VERBOSE' is set.
 2013-06-20 13:30:23 +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
Atgeirr Flø Rasmussen dcf88207e3 Include config.h in cpp file. 2013-03-22 15:20:38 +01:00
Atgeirr Flø Rasmussen bc40c0174a More minor doc fixes. 2013-03-22 09:45:00 +01:00
Atgeirr Flø Rasmussen 3f8ba3c1e5 Fix minor doc errors. 2013-03-22 09:26:45 +01:00
Atgeirr Flø Rasmussen 584fa8bc48 Fixes and improvements to transport solver docs. 2013-03-21 14:52:21 +01:00
Atgeirr Flø Rasmussen 410a9b73e2 Changed #ifdef HAVE_... to #if HAVE_... 2013-03-19 13:33:07 +01:00
Atgeirr Flø Rasmussen 9a2f2c48fd Fixed conditional compilation issues with UMFPACK. 
This should fix the issue reported in #208 introduced in #203.
 2013-03-19 10:30:27 +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 987aa5b6fd Further reorganising of opm-core. 
Deleted some unused code (or moved to opm-porsol), moved all code dealing with
time-of-flight to opm/core/tof, moved code for implicit transport solver to
opm/core/transport/implicit, spu_[im|ex]plicit.[ch] to opm/core/transport/minimal.
 2013-03-18 12:38:04 +01:00
Atgeirr Flø Rasmussen b304105b4f Make initGravity() to private, call from constructor. 
Also modify interface of solveGravity() to be minimal,
construcing columns for segregations solver at construction time.
 2013-03-15 13:53:37 +01:00
Atgeirr Flø Rasmussen aadae49b41 Removed unused rock compressibilty objects from interface. 2013-03-15 11:45:53 +01:00
Atgeirr Flø Rasmussen d13fed6cab Remove unused well objects from TransportSolverTwophaseImplicit. 2013-03-15 11:38:37 +01:00
Atgeirr Flø Rasmussen e2afd671f0 Make TransportSolverTwophaseReorder inherit TransportSolverTwophaseInterface. 
This changes the solve() interface, which requires clients to change.
 2013-03-15 11:31:31 +01:00
Atgeirr Flø Rasmussen 7f1a06cfb3 Fixed implicit transport solver interface. 
There were significant lifetime issues, now handled by moving
objects inside the class. Work in progress.
 2013-03-15 11:15:17 +01:00
Atgeirr Flø Rasmussen 7019eb2c32 Modify solve() interface, fix source term bug in implicit solver. 2013-03-15 08:21:55 +01:00
Atgeirr Flø Rasmussen aee974ef77 Minor adjustments. 2013-03-15 08:05:23 +01:00
Atgeirr Flø Rasmussen 86b51c80b8 Modified TransportSolverTwophaseInterface::solve(), general cleanup. 
Move output arguments last in argument list.
 2013-03-14 22:51:44 +01:00
Atgeirr Flø Rasmussen e532250867 Rename ImplicitTwoPhaseTransportSolver -> TransportSolverTwophaseImplicit. 2013-03-14 22:39:08 +01:00
Atgeirr Flø Rasmussen d607849293 Rename TwoPhaseTransportSolver -> TransportSolverTwophaseInterface. 
To be more consistent with naming practices elsewhere in opm-core.
 2013-03-14 22:24:36 +01:00
Atgeirr Flø Rasmussen 4ef30e694d Modified for added files and changed class names. 2013-03-14 21:43:21 +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 6e48999ede Removed unused SimpleFluid and SimpleFluid2pWrapper classes. 2013-03-14 13:33:26 +01:00
Atgeirr Flø Rasmussen 34f523339d Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Bård Skaflestad 0eb32742d4 Include <cassert> to bring in declaration of assert() 2013-02-20 12:59:40 +01:00
Bård Skaflestad a39e5a1366 Use an integer type for "maxit_" counter. 
The "maxit_" counter is an upper limit on the number of non-linear
iterations in a single cell.  Declaring this as a "double" is counter
intuitive unless one expects the number to be *really* high.

Present since
  - Commit 93d4bd8 (TransportModelTwophase.hpp)
  - Commit e0d38cf (TransportModelTwophaseCompressible.hpp)
 2013-02-19 11:27:54 +01:00
Bård Skaflestad edeb9d7551 Replace an assignment with intended equality test 
This corrects a latent error that has been present since the inception
of this module.
 2013-02-01 16:30:45 +01:00
Bård Skaflestad 089988aa16 Eliminate redundant explicit type conversion. 
The pointers in question are already type 'int *'.  There is no need to
explicitly convert them to that type too.
 2013-02-01 16:25:46 +01:00
Bård Skaflestad cf922e73ce Eliminate release-mode build warning. 
The 'cbottom' variable is only used within an assert().  Don't define
the variable in release (i.e., "NDEBUG") mode.
 2013-02-01 16:15:35 +01:00
Bård Skaflestad 8f6be16ac3 Use portable method of zeroing vector of ints. 
The memset() technique is only applicable to platforms for which
numerical zero is represented by all bits zero.
 2013-02-01 16:06:39 +01:00
Atgeirr Flø Rasmussen b719bc8b1e Added evalFunc() method. 
This public method is not virtual, and implemented in the base class using calls to
the virtual methods. Not yet used by the DG solver.
 2013-01-23 09:51:30 +01:00
Atgeirr Flø Rasmussen 5bdaeeafa0 Refactored applyMinUpwindLimiter(). 2013-01-23 09:50:25 +01:00
Atgeirr Flø Rasmussen 940f1299a9 Add methods totalFlux() and minCornerVal(). 
Also started refactoring applyMinUpwindLimiter() using the
added methods.
 2013-01-21 14:55:27 +01:00
Atgeirr Flø Rasmussen dc50e61a01 Use functionAverage() instead of direct coefficient access. 
This fixes the issue with limiters on multilinear basis.
 2013-01-21 11:09:43 +01:00
Atgeirr Flø Rasmussen de66f358b0 Added functionAverage() method to DGBasis classes. 2013-01-21 11:09:07 +01:00
Atgeirr Flø Rasmussen 1113e65eec Refactored limiter functions. 
The two limiter functions were very similar, and were unified in a single
method, with a bool argument to choose method variety.
 2013-01-21 10:46:06 +01:00
Atgeirr Flø Rasmussen c3f9e64c9c Complete separation of basis func classes. 
Also:
 - Add use_tensorial_basis parameter allowing run-time choice of basis.
 - Remove degree argument from solveTof() method, degree is instead obtained
   from parameters in constructors. Modified compute_tof* programs to match.
 2013-01-16 15:13:45 +01:00
Atgeirr Flø Rasmussen fb060da933 Implement (empty) virtual destructor, make methods public. 2013-01-16 15:11:46 +01:00
Atgeirr Flø Rasmussen 564db5df87 Increased quadrature order in a term. 
This is for the benefit of bi/tri-linear basis functions, as stated
in the comments.
 2013-01-16 13:45:15 +01:00