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

2573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
81c022e79a Make DataMap.hpp properly include its dependencies. 2012-11-26 10:50:09 +01:00
Atgeirr Flø Rasmussen
0526657355 Document function currentDateTime(). 2012-11-26 10:49:15 +01:00
Bård Skaflestad
a2dccf7a8f Merge pull request #99 from atgeirr/binary_io 
Add missing header file to distribution.
 2012-11-15 03:28:59 -08:00
Atgeirr Flø Rasmussen
96f941b840 Merge branch 'master' into binary_io 2012-11-15 09:28:37 +01:00
Atgeirr Flø Rasmussen
3bf22a67b2 Merge pull request #97 from atgeirr/relax-function-call-semantics 
Remove unneeded assert.
 2012-11-14 23:55:43 -08:00
Atgeirr Flø Rasmussen
2b0e570842 Make explicit intention to do nothing on empty input. 2012-11-15 08:54:45 +01:00
Atgeirr Flø Rasmussen
d58dded067 Merge pull request #98 from bska/use-standard-lin-index 
Derive 'start' from traditional linear index expression
 2012-11-14 23:51:20 -08: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
e17d5e6499 Remove unneeded assert(). 
Function is safe to call with empty vectors.
 2012-11-14 15:30:25 +01:00
Bård Skaflestad
800b20b70c Merge pull request #96 from atgeirr/bugfix-preprocessing 
Fix bug in computing correct ZCORN indices for grid cell.
 2012-11-14 06:09:14 -08: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
Atgeirr Flø Rasmussen
fab3ea9723 Merge pull request #93 from bska/ert-nondefault-location-build-fix 
Fix build if ERT is installed in a non-default location
 2012-11-08 23:31:48 -08:00
Atgeirr Flø Rasmussen
8af339d6be Merge pull request #92 from bska/signed-vs-unsigned-ert 
Fix signed-vs-unsigned comparison warning
 2012-11-08 23:30:45 -08:00
Atgeirr Flø Rasmussen
a53b71233a Add missing header file to distribution. 2012-11-08 14:15:15 +01:00
Bård Skaflestad
55263da177 Fix build if ERT is installed in non-default location 
The existing description did not properly account for ERT (or, more
appropriately, the "libecl" part of ERT) being installed in a
non-default location (e.g., somewhere below ${HOME}).

As EclipseGridParser.hpp declares various ERT-dependent types and
functions if a build configuration supports ERT (activated by the
`--with-ert' configure option), we need a proper include path to
reference the ERT headers.  The fix is simple--just insert the
$(ERT_CPPFLAGS) into the already existing $(AM_CPPFLAGS).
 2012-11-08 13:59:19 +01:00
Bård Skaflestad
44f54cb712 Fix signed-vs-unsigned comparison warning 
The existing code compared the output of data->size(), which is a
std::vector<double>::size_type (typically std::size_t) and therefore an
unsigned integer type to the number 'grid.number_of_cells' which is a
(signed) 'int'.  This leads to an annoying warning when increasing the
warning level in GCC.

While here, also insert code to verify that the 'stride' is a positive
number lest the subsequent assignment loop reference (*data) elements
out of bounds.
 2012-11-07 17:23:45 +01:00
Bård Skaflestad
eb4bf0a373 Merge pull request #91 from joakim-hove/writeEclActive 
Write ecl active
 2012-11-07 06:40:00 -08:00
Joakim Hove
43adfaeda5 Added start_date_ property to the SimulatorTimer class 2012-11-07 14:53:26 +01:00
Joakim Hove
a3efb49de2 Added comments + make sure to only export active cells in writeEclData 2012-11-07 13:31:46 +01:00
Bård Skaflestad
d399b2d7cc Merge pull request #89 from atgeirr/gravity-in-wells 
Gravity in wells
 2012-11-07 03:53:04 -08:00
Joakim Hove
f1d2a0db95 Merge pull request #90 from atgeirr/binary_io 
Fix for writeECLData()
 2012-11-06 22:28:08 -08:00
Atgeirr Flø Rasmussen
ae6c388546 Fix incorrect size in ecl_kw_alloc() call. 
Also, add more checks to ensure sanity.
 2012-11-06 20:45:49 +01:00
Atgeirr Flø Rasmussen
5ca3f98725 Update CompressibleTpfa wellbore gravity handling. 
Should now be in sync with cfs_tpfa_residual C interface. Simple well
gravity model implemented.
More flexibility in well gravity models would be a natural future extension.
 2012-11-06 19:28:22 +01:00
Atgeirr Flø Rasmussen
bbc80e4b83 Add HAVE_ERT guards to writeECLData.cpp. 2012-11-06 16:18:22 +01:00
Bård Skaflestad
9a33a3266e Merge branch 'master' into gravity-in-wells 2012-11-06 15:37:06 +01:00
Bård Skaflestad
d64ccdfbfd Merge pull request #88 from joakim-hove/IMPORT 
Minor fix to import_rewrite when rewrite is run in current directory.
 2012-11-06 06:35:57 -08:00
Joakim Hove
5c81635563 Minor fix to import_rewrite when rewrite is run in current directory. 2012-11-06 15:16:01 +01:00
Bård Skaflestad
69070133bd Merge branch 'master' into gravity-in-wells 2012-11-05 15:48:07 +01:00
Atgeirr Flø Rasmussen
ef297d90ea Merge pull request #87 from atgeirr/multidim_upwind 
Time-of-flight: multidimensional upwinding and new program
 2012-11-05 05:29:02 -08:00
Atgeirr Flø Rasmussen
51bbc85a26 Bugfix tof computations with multidimensional upwinding. 
Cell tof depends on downwind face tof in a more complicated way
with multidim upwinding, this was not done correctly.
 2012-11-05 14:26:00 +01:00
Bård Skaflestad
f466ae6a51 Account for gravity in well connection flux calculation 
We previously ignored effects of gravity in the calculation of the well
connection fluxes (i.e., perforation fluxes).  This commit includes
those effects where appropriate.
 2012-11-01 13:34:27 +01:00
Atgeirr Flø Rasmussen
3325d4ef39 Implemented multidimensional upwinding. 
The 'SMU' variant is chosen for its smoothness.
 2012-10-30 13:10:50 +01:00
Atgeirr Flø Rasmussen
3aef179030 Merge branch 'master' into multidim_upwind 2012-10-30 10:35:41 +01:00
Atgeirr Flø Rasmussen
386b4e4942 Add use_multidim_upwind parameter. 2012-10-30 10:32:29 +01:00
Atgeirr Flø Rasmussen
ca351e716d Change transport timer use to include construction time. 
Also minor mods to be more similar to compute_tof_from_files.cpp
 2012-10-30 10:31:30 +01:00
Atgeirr Flø Rasmussen
69832375d2 Merge branch 'tof_utilities' into multidim_upwind 2012-10-30 10:25:23 +01:00
Bård Skaflestad
905cec9543 Merge branch 'master' into gravity-in-wells 2012-10-29 18:33:10 +01:00
Bård Skaflestad
a803916715 Merge pull request #86 from atgeirr/barycoord 
New class WachspressCoord
 2012-10-29 10:32:11 -07:00
Atgeirr Flø Rasmussen
020f452a28 Added parameters for controlling use of multidim upwinding. 
For now, you will simply get SPU even with use_multidim_upwind=true.
 2012-10-29 17:23:17 +01:00
Atgeirr Flø Rasmussen
4c1240c4c1 Remove helpers that moved to WachspressCoord. 2012-10-29 15:36:25 +01:00
Atgeirr Flø Rasmussen
62fa94ae2a Use class WachspressCoord in VelocityInterpolationECVI. 
Implementation of coordinates has been moved out of the ECVI class
and into its own.
 2012-10-29 15:33:04 +01:00
Atgeirr Flø Rasmussen
ad2a237657 Added method WachspressCoord::adjacentFaces(). 2012-10-29 15:14:34 +01:00
Atgeirr Flø Rasmussen
1b31b207fe Added class WachspressCoord. 2012-10-29 14:55:44 +01:00
Atgeirr Flø Rasmussen
3288c7d505 Made constructor explicit, improve comment. 2012-10-29 12:56:04 +01:00
Bård Skaflestad
4268effe14 Merge branch 'master' into gravity-in-wells 2012-10-29 12:12:29 +01:00
Roland Kaufmann
a4d0003c0f Add conventional library export variable 
opmcore_LOCATION is the directory which contains libopmcore.so, whereas
opmcore_LIBRARY_DIRS are all the directories that must be added to link.
As of now, these two are the same, but should be kept separate in case
more directories must be added (one is an item, the other is a list).

Also cleaned up the description of the variables in the header.
 2012-10-29 09:36:41 +01:00
Roland Kaufmann
b642f3c0c8 Ignore CMake artifacts when building in-tree 2012-10-29 09:36:41 +01:00
Atgeirr Flø Rasmussen
87169cfa86 Merge branch 'master', remote-tracking branch 'upstream/master' into tof_utilities 2012-10-29 08:46:26 +01:00
Atgeirr Flø Rasmussen
20c1567eca Increased number of digits in output. 2012-10-29 08:27:59 +01:00