OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,713 Commits 9 Branches 35 Tags 15 MiB
e15a28de68
Commit Graph

3713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
054b764224 Merge pull request #287 from rolk/286_info 
Read project settings from dune.module
 2013-07-30 06:27:08 -07:00
Joakim Hove
bdd587bf93 Minor merge fixup - sorry 2013-07-30 14:56:21 +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
Roland Kaufmann
58d9e09d02 Added note about where to make likely modifications 
People will head for CMakeLists.txt when making modifications (such
as adding a new file). This note directs them to where they should
rather look.
 2013-07-30 14:20:34 +02:00
Roland Kaufmann
5ae4d44e54 Read project properties from dune.module 
We cannot generate dune.module because that file is read by dunecontrol
before the build starts. It therefore make sense to let it be the
original and let the build system read it instead of duplicating the
information in CMakeLists.txt

This module is a adaption of Andreas Lauser's OpmParseDuneModule
in opm-material, modified to handle the more sparse info provided by
the other modules as well.
 2013-07-30 14:11:26 +02:00
Roland Kaufmann
00c367f184 Add description back to dune.module 
We want to read this from a declarative file instead of having it
in the build system source.
 2013-07-30 13:37:32 +02:00
Roland Kaufmann
3f4695794d Eliminate _MODULE_DIR variable 
It is only used in one place, where it can easily be replaced by its
expansion. The reason for removing it is that it depends on the name
of the project, and I intend to read this using a routine it the very
directory it is including, hence the need for a different approach.
 2013-07-30 13:26:16 +02:00
Roland Kaufmann
a74791bcac Use underscore for data members 2013-07-30 13:24:57 +02:00
Roland Kaufmann
26b2d2794c Provide way of shadowing only some properties 
The current implementations of IncompPropertiesInterface are very
all-or-nothing. In some situations, you want to read rock and fluid
properties from an Eclipse file, but use analytical functions for
the unsaturated properties. Or you want to update properties based
on a marching filter.

This patch provides a way to mix various property objects, or to
"shadow" the properties with a raw array of data, so you don't have
to reimplement the entire interface just to make a small change.
 2013-07-30 13:11:52 +02:00
Bård Skaflestad
27d188c041 Merge remote-tracking branch 'upstream/master' 2013-07-29 11:22:59 +02:00
Andreas Lauser
0faa2bb49c Merge pull request #282 from juliohm/master 
Remove trailing whitespaces
 2013-07-28 10:08:26 -07:00
Júlio Hoffimann
8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Júlio Hoffimann
e45313e918 Purge unused variable in tutorial 4 2013-07-26 11:42:24 -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
Joakim Hove
8c32146093 Rewritten EclipseGridParser to use input actnum instead of ACTNUM from deck 2013-07-24 14:42:40 +02:00
Bård Skaflestad
ea31ea5d90 Merge remote-tracking branch 'upstream/master' 2013-07-05 13:51:36 +02:00
Bård Skaflestad
efc44daf76 Merge pull request #278 from rolk/278_linkver 
Print linker version to log when configuring
 2013-07-05 04:25:50 -07:00
Roland Kaufmann
56d3e1f8a4 Parse RHEL5 linker strings better 2013-07-05 13:18:53 +02:00
Roland Kaufmann
0696a21280 Print linker version to log 2013-07-05 12:45:39 +02:00
Roland Kaufmann
357db6c5e0 Add function to detect linker version 
The linker that is used (ld vs. gold for instance) is often hidden
when using the compiler as a front-end (to include the correct
runtime libraries).

These functions enables us to probe the linker version and reports
its finding in the log.
 2013-07-05 12:44:04 +02:00
Bård Skaflestad
96c52ba5ee Merge remote-tracking branch 'upstream/master' 2013-07-05 12:43:25 +02:00
Bård Skaflestad
94bc2525b2 Merge pull request #277 from blattms/fix-agmg-verbosity 
Fixes setting the verbosity for AGMG.
 2013-07-05 03:41:58 -07:00
Markus Blatt
4a9dd8c483 Fixes setting the verbosity for AGMG. 
If verbosity is true, we set the iprint parameter such that the
output is print to standard out. If not, we use a negative number
such that only error messages are printed to standard out.
 2013-07-05 12:19:57 +02:00
Bård Skaflestad
99e8fe5fb5 Merge remote-tracking branch 'upstream/master' 2013-07-05 11:38:02 +02:00
Bård Skaflestad
8fc205707b Merge pull request #276 from rolk/276_linsolres 
Zero-initialize structure to avoid returning undefined
 2013-07-05 02:36:57 -07:00
Bård Skaflestad
81c6d1b046 Merge branch 'blattms-satellite-exclude-all' 2013-07-05 11:25:37 +02:00
Bård Skaflestad
143417e2b2 Merge pull request #272 from blattms/satellite-exclude-all 
Change marker EXCLUDE_ALL to EXCLUDE_FROM_ALL in opm_compile_satellite
 2013-07-05 02:24:58 -07:00
Bård Skaflestad
7db145cc1a Merge branch 'satellite-exclude-all' of git://github.com/blattms/opm-core into blattms-satellite-exclude-all 2013-07-05 11:07:43 +02:00
Roland Kaufmann
002e22b9ec Zero-initialize structure to avoid returning undefined 
The compiler will otherwise complain that we are returning undefined
data. There is no way for the client code to know whether this was
the case.
 2013-07-05 10:59:52 +02:00
Markus Blatt
757973b713 Adjusts macro documentation to recent change. 2013-07-05 10:44:31 +02:00
Bård Skaflestad
33173396f5 Merge pull request #266 from rolk/266_library 
Move all common build code to cmake/ directory
 2013-07-05 01:28:55 -07:00
Roland Kaufmann
9853407ded Refer to other project-specific files at top-level 
Having the include statements here will hopefully lead to others
quickly finding the list of prerequisite files needed to build.
 2013-07-05 00:58:29 +02:00
Roland Kaufmann
91f96087b7 Include file list from top-level instead of module-level 
Increase the visibility of the source file name include by no longer
putting it in a module, but rather by including it in CMakeLists.txt
 2013-07-05 00:57:07 +02:00
Roland Kaufmann
a4767f754b Don't include prerequisites here; do it more explicitly 
Developers that are working to familiarize themselves with OPM will
probably start out in CMakeLists.txt to figure out where the project
declare its dependencies, thus the list should be referred to from
there instead of inside one of the sub-modules.
 2013-07-04 23:47:38 +02:00
Bård Skaflestad
d332129676 Merge pull request #274 from blattms/non-tr1 
Changed std::tr1 occurences to boost.
 2013-07-04 12:01:51 -07:00
Markus Blatt
68eb3fbcb1 Changed std::tr1 occurences to boost. 
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
 2013-07-04 16:04:35 +02:00
Markus Blatt
f739c607f9 Change marker EXCLUDE_ALL to EXCLUDE_FROM_ALL in opm_compile_satellite 
Previously, when passing EXCLUDE_ALL to opm_compile_satellite this
resulted a cmake error:

CMake Error at cmake/Modules/UseDebugSymbols.cmake:71 (get_target_property):
  Cannot find source file:

    EXCLUDE_ALL

  Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
  .hxx .in .txx
Call Stack (most recent call first):
  cmake/Modules/OpmSatellites.cmake:77 (strip_debug_symbols)
  CMakeLists.txt:176 (opm_compile_satellites)
 2013-07-04 12:28:10 +02:00
Roland Kaufmann
501e5ad0e9 Project-specific hooks no longer needs an extra arg. 
This change is already implemented in its own commit, but the
CMakeLists.txt change is in its own commit to make it easier to
distribute the changes to other projects without merge conflicts.
 2013-06-29 22:10:48 +02:00
Roland Kaufmann
2c8e068812 Remove the project parameter for the customization hook 
The hooks are meant to be project specific, and should therefore
either know their own name or at least have access to a variable with
that name in it.
 2013-06-29 22:04:00 +02:00
Bård Skaflestad
d3065fb3f6 Merge pull request #269 from rolk/269_sink 
Use a more realistic measure for source and show use of units
 2013-06-28 04:56:36 -07:00
Roland Kaufmann
1998e98a00 Use natural names instead of mathematical notation 2013-06-28 13:44:15 +02:00
Roland Kaufmann
405a6b021c Sink should match source 
Although it already does numerically, this make is more explicitly
clear.
 2013-06-28 13:40:22 +02:00
Roland Kaufmann
0e456909e6 Use a more realistic injection rate 
In addition, this also shows how to use the units to specify the
measure.
 2013-06-28 13:20:09 +02:00
Roland Kaufmann
6a7a9541f4 Give a name to the porosity 
Mostly one would assume that this would be the porosity since that's the
only non-named argument, but stating this explicitly saves us from one
trip to the manual.
 2013-06-28 13:08:16 +02:00
Bård Skaflestad
254f70e504 Merge pull request #267 from laods/verbosity 
Change verbosity level of warning message in transport solver
 2013-06-28 02:02:31 -07:00
Roland Kaufmann
f44cd35d81 Move configure script to cmake/Scripts/ directory 
We want all changes to happen there; retain a small script that
simply forwards the action to the main script in that directory.
 2013-06-26 00:05:02 +02:00
Roland Kaufmann
df6c17a9c4 Use common library code and define customization in macros 
Only the code that is special for this particular project is retained
in the main file; all the common code is imported from the cmake/
directory.
 2013-06-25 23:55:58 +02:00
Roland Kaufmann
38bd5b0ad3 Common code for building OPM library modules 
Most of the OPM libraries follow the same template; this include file
contains all the common code.
 2013-06-25 23:53:40 +02:00
Roland Kaufmann
bc9c8a7068 Get prerequisites from a separate "header" file 
Note that the variable containing the dependencies must be expanded
inside quotes; otherwise the list will spill into the argument list!
 2013-06-25 23:49:36 +02:00