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

2603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
9152d78405 Added new tof computation utility. 
This program assumes that grid, porosity, flux field and sources are
available to read from files. It does not compute any flux field itself.
 2012-10-25 14:47:26 +02:00
Atgeirr Flø Rasmussen
72f8da074e Add constructor taking file name to GridManager. 
Calls read_grid(). Grid fileformat not yet documented.
 2012-10-25 13:23:50 +02:00
Bård Skaflestad
2ec15ab74a Merge branch 'master' into gravity-in-wells 2012-10-25 10:44:17 +02:00
Atgeirr Flø Rasmussen
319fb8df50 Merge pull request #84 from bska/fix-equality-comparisons 
Fix well classification that was only correct by accident
 2012-10-25 01:08:48 -07:00
Atgeirr Flø Rasmussen
cc6c9311a0 Merge pull request #85 from bska/use-standard-sh-in-ac 
Don't use '==' when '=' is equally good
 2012-10-25 01:07:47 -07:00
Bård Skaflestad
8cda8dfda0 Don't use '==' when '=' is equally good 
There is no need to use Bash-specific operators when the pure sh(1)
built-in test operators have the exact same semantics.  This increases
portability to systems for which /bin/sh is *not* Bash (or Dash).
 2012-10-25 00:22:22 +02:00
Bård Skaflestad
3e20f4ed2b Merge branch 'master' into gravity-in-wells 2012-10-24 22:43:25 +02:00
Bård Skaflestad
eec1552789 Merge pull request #82 from rolk/cxx0x 
Build opm-core with C++0x support if available
 2012-10-24 12:42:17 -07:00
Roland Kaufmann
09f458f5ee Remove superfluous construction by std::make_pair 
Since we know the type of the components, we may just as well create the
pair directly! (Using make_pair invokes compiler bugs in GCC).
 2012-10-24 21:22:11 +02:00
Bård Skaflestad
c8dedfde06 Fix well classification that was only correct by accident 
Specifically, the tests

   if (!wells->type[self_index] == INJECTOR)
   if (!wells->type[self_index] == PRODUCER)

produced the expected results *only* because INJECTOR==0 and PRODUCER==1
in the WellType enumeration, thus (!INJECTOR == PRODUCER) and
(!PRODUCER == INJECTOR).

Installing the (much) more appropriate

    if (wells->type[self_index] != INJECTOR)
    if (wells->type[self_index] != PRODUCER)

is not only more readable, it is also future-proof and scales better if
we ever introduce new WellTypes (e.g., a MONITOR).
 2012-10-24 21:12:29 +02:00
Bård Skaflestad
672ff95ae8 Replace !(a==b) test with a more common a!=b test 2012-10-24 21:02:46 +02:00
Bård Skaflestad
10b3c717b3 Merge branch 'master' into gravity-in-wells 2012-10-24 14:45:55 +02:00
Bård Skaflestad
ae9e003a90 Merge pull request #83 from rolk/recommends 
Update recommendations for building OPM
 2012-10-24 05:36:45 -07:00
Roland Kaufmann
6a4f6ade42 Warn that OPM should not be built differently from DUNE. 
Using headers and libraries from a DUNE built with different options
than OPM, can result in strange ABI errors such as a segmentation
fault in the static initialization section.
 2012-10-24 12:51:50 +02:00
Roland Kaufmann
c6bd22b90b Recommend parallel builds 
Load average of 0.9 is something that even a PhD student's crappy
laptop computer should be able to handle, without completely killing
it.

It really should be something like:

 make -j -l $(echo \($(grep "^processor" /proc/cpuinfo)+1\)\*0.9 | bc)

but that is probably far too complex to put in a README. The average
developer should be able to pick a reasonable value themselves.
 2012-10-24 12:39:31 +02:00
Roland Kaufmann
e8444f91e0 Replace deprecated AC_TRY_COMPILE with AC_COMPILE_IFELSE 2012-10-24 12:01:38 +02:00
Roland Kaufmann
bb96a2e269 Refrain from using reserved names ac_* for variables 2012-10-24 11:39:51 +02:00
Roland Kaufmann
9063a47051 Disable checks for C++11 if C++0x is disabled 
By adding an extra test we can avoid the somehow illogical possibility
of building with '--enable-gxx11check --disable-gxx0xcheck'.
 2012-10-24 11:25:28 +02:00
Roland Kaufmann
6d2f7e1f7c Compile with C++0x support if possible 
Since DUNE does this, it might a good idea to track the same ABI.
 2012-10-24 10:32:23 +02:00
Roland Kaufmann
056bce2128 Distinguish between C++0x and C++11 in conf. opts. 
Surely this must have been a copy&paste error.
 2012-10-24 10:28:48 +02:00