OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity
208 Commits 23 Branches 76 Tags 14 MiB
f77742c79b
Commit Graph

208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alf Birger Rustad
f77742c79b Merge pull request #2 from blattms/master 
facilitate out of source builds
 2012-09-06 05:25:20 -07:00
Markus Blatt
9f2d90072b Added $(top_srcdir) to AM_CPPFLAGS to facilitate out of source builds. 2012-09-06 14:00:13 +02:00
Bård Skaflestad
22b1be3d50 Merge pull request #1 from laods/master 
Enable parallel feature of upscale_relperm
 2012-07-17 00:59:26 -07:00
Lars Vingli Odsæter
38165f3ab7 Renamed macro USEMPI to HAVE_MPI in upscale_relperm.cpp so that the parallel implementation can be built in the DUNE setting 2012-07-16 08:23:34 +02:00
Bård Skaflestad
70a908c0fa Override Dune-ISTL's HAVE_BOOST symbol. 
Use OPM-Core's `have_boost_redef.hpp' facility to effect the symbol
overriding.  Using Boost in OPM-Uscaling is non-optional.
 2012-07-12 15:38:20 +02:00
Bård Skaflestad
43ce65464f Don't include <config.h> in headers. 
The conventional wisdom is to include <config.h> only in
implementation (i.e., ".cpp") files.  Especially if we're producing
a header-based library and not installing <config.h>.
 2012-07-12 14:10:26 +02:00
Roland Kaufmann
c4d99e3ea1 Specify namespace of math functions to avoid name clashes 
In the 4.6.x range of GNU compilers, the cmath header include math.h, adding
isinf() and isnan() to the global namespace as well as std. When used in if
statements, there is then an ambiguity between the std version which returns
bool and the global function which returns int; for more details see:
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48891>

If we qualify the functions explicitly with their namespace, this error goes
away.
 2012-06-27 15:04:41 +02:00
Roland Kaufmann
8bb70d9300 Update documentation directory to reflect change in branding 
This really should have been done as part of commit b6d492.
 2012-06-27 14:55:34 +02:00
Roland Kaufmann
b6d4921f86 Change branding from DUNE to OPM 
Only the configuration files where the library name is mentioned are changed.
Renaming the directory dune/ to opm/ would require massive change through-out
the code.
 2012-06-26 01:42:58 +02:00
Roland Kaufmann
35607f5623 Convert ignore file from Mercurial to Git 2012-06-25 23:25:45 +02:00
Roland Kaufmann
dd9f77c05d Remove superfluous tags file 2012-06-25 23:25:45 +02:00
Kari B. Skjerve
e1559d4596 merged heads 2012-06-14 13:41:55 +02:00
Kari B. Skjerve
579c5f4847 upscale_steadystate_implicit.cpp not finished! 2012-06-14 13:39:40 +02:00
Kari B. Skjerve
6ce00bc0a4 cleaning up unnecessary output in upscale_relperm.cpp 2012-06-14 13:37:45 +02:00
Kari B. Skjerve
36209a8245 Comment sign for Eclipse output changed (from // to --) 2012-05-24 12:57:56 +02:00
Kari B. Skjerve
9e7b6738b1 Changed comment sign (from // to --) 2012-05-24 12:56:17 +02:00
Atgeirr Flø Rasmussen
6d4b87c384 Match interface change for regula falsi solver from opm-core. 2012-05-24 10:40:49 +02:00
Kari B. Skjerve
b22ba1d224 Changed input and output to be more aligned with Eclipse. 2012-05-09 16:18:57 +02:00
Kari B. Skjerve
92c457bb64 added upscale_steadystate_implicit.cpp 2012-05-02 12:49:09 +02:00
Kari B. Skjerve
dc6448a9af changed output functionality 2012-05-02 12:47:46 +02:00
Kari B. Skjerve
1c67e0cf19 added upscale_steadystate_implicit 2012-05-02 12:47:18 +02:00
Kari B. Skjerve
7d8b4222ce Fixed output header 2012-03-29 15:11:41 +02:00
Kari B. Skjerve
341133ba52 porosity comp also when not upscaling perm 2012-03-09 15:16:55 +01:00
Bjørn Spjelkavik
dddec0c365 Restored distcheck option 2012-02-07 13:54:32 +01:00
Bjørn Spjelkavik
f49c249b35 Use common files from Opm instead of Dune. #3 2012-02-07 12:20:50 +01:00
Atgeirr Flø Rasmussen
b32993f8da Added test data point. 2012-01-27 09:07:13 +01:00
Kari B. Skjerve
b907f3c6ac Changed number of significant numbers in output to 4 2012-01-25 14:32:24 +01:00
Kari B. Skjerve
2f31cfa8d0 changed linsolver_tolerance to 1e-12, added check on swir/swor 2012-01-24 13:07:04 +01:00
Kari B. Skjerve
1361539489 Preserve minimum and maximum pressure points (to preserve min and max 
saturations). Also changed linsolver_tolerance to 1-12.
 2012-01-24 11:11:23 +01:00
Kari B. Skjerve
42229bd78b Fixed problem with saturation endpoints being up to machie precsion 
outside accepted limits
 2012-01-23 15:16:24 +01:00
Ingeborg Ligaarden
60cb47bdb3 Changed default value of sat_change_year from 0.0 (impossible..) to the more sensible value 1.0e-5. 2012-01-09 17:34:20 +01:00
Atgeirr Flø Rasmussen
a7ecacca31 Fixed pkg-config data. 2012-01-02 10:45:49 +01:00
Kari B. Skjerve
2cc6eef240 Anisotropic input 2011-12-23 13:03:56 +01:00
Ingeborg Ligaarden
2b5a479da7 Changed default max_it to 100. 2011-12-14 16:56:12 +01:00
Ingeborg Ligaarden
757561f65f Make initalization with capillary pressure default. 2011-12-13 20:33:04 +01:00
Ingeborg Ligaarden
e47cf2632b Merge. 2011-12-13 11:19:37 +01:00
Ingeborg Ligaarden
41212d5acd Catch exception if initialisation of capillary limit fails and then initialize by uniform distribution (thresholded by saturation limits). Also move check/correction of saturation limits (max/min saturation). 2011-12-13 10:49:11 +01:00
Bård Skaflestad
44d8ecdb88 Hook new example 'upscale_relpermvisc' up to build. 2011-12-12 21:23:08 +01:00
Kari B. Skjerve
bb9c657d16 added upscale_relpermvisc.cpp - relperm upscaling in viscous 
limit. Not tested yet, committed due to structural changes in repo
 2011-12-12 12:14:08 +01:00
Kari B. Skjerve
1810dfc754 added relative permeability upscaling in viscous limit (not testet, 
checked in due to structural changes in repo)
 2011-12-12 12:12:10 +01:00
Ingeborg Ligaarden
a9d30e2143 Changed default init_stepsize and max_stepsize. 2011-12-09 14:49:38 +01:00
Atgeirr Flø Rasmussen
ae6cd9723f Changed name of executable. 2011-12-09 13:34:35 +01:00
Atgeirr Flø Rasmussen
6ae03765f8 Added new method setToCapillaryLimit() and parameter start_from_cl. 2011-12-09 12:56:38 +01:00
Atgeirr Flø Rasmussen
bdfe8c8884 Removed "uint" linuxism, changed isnan() and friends into std::isnan() etc. 2011-12-06 10:43:34 +01:00
Ingeborg Ligaarden
5dd9ea32b4 Merged changes. 2011-11-25 15:08:48 +01:00
Ingeborg Ligaarden
a8b5c886e4 Fix indentation. 2011-11-23 18:13:31 +01:00
Ingeborg Ligaarden
a787904dfa Initalize with s_min+1e-4 and s_max-1e-4. 2011-11-23 18:09:53 +01:00
Ingeborg Ligaarden
cf96539d7b Initialize system with s_min < s < s_max. 2011-11-18 17:51:25 +01:00
Kari B. Skjerve
91510ba38a Fixed bug in output print 2011-10-27 10:43:40 +02:00
Halvor M. Nilsen
865a342306 changed to only compiling two tests 2011-10-24 11:10:28 +02:00