OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,119 Commits 9 Branches 35 Tags
de2c3817bc77c849b98d3915ecfb8c6636ae63ca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen de2c3817bc Merge pull request #1209 from akva2/remove_more_utilities 
remove some generic utility classes
 2018-01-16 17:44:44 +01:00
Atgeirr Flø Rasmussen 5881cfe5da Merge pull request #1208 from akva2/remove_utilities 
changed: remove some generic utility classes
 2018-01-12 10:43:00 +01:00
Atgeirr Flø Rasmussen 2977d8659e Make constructor generic. 
This supports std::vector and Opm::TableColumn (from opm-parser) as before,
but without requiring any OPM includes, making the class independent.
 2018-01-11 15:00:49 +01:00
Atgeirr Flø Rasmussen d700402b15 Remove unused boost include. 2018-01-11 15:00:20 +01:00
Atgeirr Flø Rasmussen 666591d79c Merge pull request #1206 from atgeirr/remove-unused-program 
Remove unused program
 2018-01-11 13:59:16 +01:00
Atgeirr Flø Rasmussen 900dbc6096 Remove unneeded includes from compute_tof_from_files.cpp 2018-01-11 12:27:24 +01:00
Atgeirr Flø Rasmussen a5c14af204 Remove unused program compute_tof. 2018-01-11 12:26:55 +01:00
Atgeirr Flø Rasmussen cf82a41229 Merge pull request #1205 from akva2/remove_transport 
remove implicit transport code
 2018-01-10 16:07:21 +01:00
Atgeirr Flø Rasmussen 8b34a6e795 Merge pull request #1203 from akva2/remove_build_status 
remove travis build status from README.md
 2018-01-04 12:58:59 +01:00
Atgeirr Flø Rasmussen ec58bfb224 Merge pull request #1192 from andlaus/add_energy_phase 
Add energy phase
 2017-12-11 11:32:31 +01:00
Atgeirr Flø Rasmussen d97a5c5734 Merge pull request #1197 from akva2/remove_tutorials 
remove tutorials which have been moved to opm-simulators
 2017-12-06 12:33:15 +01:00
Atgeirr Flø Rasmussen c9c4c81661 Merge pull request #1188 from totto82/handleWEFAC 
Handle WEFAC
 2017-12-05 08:37:44 +01:00
Atgeirr Flø Rasmussen 55348d6441 Merge pull request #1193 from akva2/move_utils_to_simulators 
Move utils to simulators
 2017-12-05 08:36:54 +01:00
Atgeirr Flø Rasmussen 54b5910921 Merge pull request #1194 from akva2/move_average_to_upscaling 
remove Average.hpp (from build system)
 2017-12-05 08:36:13 +01:00
Atgeirr Flø Rasmussen 1d1347d2b3 Merge pull request #1190 from totto82/BUGFIX_equil 
Fix pvtIndex map for cases with non-active eqlnum regions.
 2017-11-28 07:31:04 +01:00
Atgeirr Flø Rasmussen 2a88805822 Merge pull request #1187 from totto82/removeBlackOilPropsFromInit 
Remove black oil props from init
 2017-11-27 07:26:45 +01:00
Atgeirr Flø Rasmussen 37421c62da Merge pull request #1189 from andlaus/remove_configure 
remove the configure wrapper script
 2017-11-24 13:12:14 +01:00
Atgeirr Flø Rasmussen d049125205 Merge pull request #1186 from akva2/remove_param_group 
remove ParameterGroup code
 2017-11-18 09:14:11 +01:00
Atgeirr Flø Rasmussen d4bbaa1d3e Merge pull request #1185 from akva2/more_removals 
remove more sources which are unused after removals in opm-upscaling
 2017-11-17 12:52:28 +01:00
Atgeirr Flø Rasmussen c3121f0a1a Merge pull request #1184 from akva2/remove_unused_sources 
remove unused code
 2017-11-15 14:09:31 +01:00
Atgeirr Flø Rasmussen 18e230a18b Merge pull request #1122 from atgeirr/fix-type-bug-in-equil 
Fix type bug in equil
 2017-11-14 14:40:47 +01:00
Atgeirr Flø Rasmussen c1f16be87b Merge pull request #1183 from akva2/update_rh_packaging 
update redhat packaging
 2017-10-25 13:06:37 +02:00
Atgeirr Flø Rasmussen 1e0135c9bd Update swatinit tests to account for bugfix. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen ac9a20da20 Update equil regression reference after bugfix. 
Also reduce some very coarse tolerances to more reasonable levels.
 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen e5a7535a22 Bugfix: type for target capillary pressure. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen e4a8fad29c Merge pull request #1180 from blattms/cleanup-version-ifs 
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
 2017-10-12 13:28:50 +02:00
Atgeirr Flø Rasmussen c8fc2bd336 Merge pull request #1177 from alfbr/master 
Removing redundant checks from Nexus
 2017-10-11 21:57:36 +02:00
Atgeirr Flø Rasmussen e0fc476fbe Merge pull request #1179 from totto82/fixSwatInitTest 
Update the swatinit test base on fix in opm-material#248
 2017-10-11 18:53:21 +02:00
Atgeirr Flø Rasmussen 417c5b2d46 Merge pull request #1178 from andlaus/fix_mcu 
mark initHydroCarbonState() as inline
 2017-10-05 09:06:57 +02:00
Atgeirr Flø Rasmussen 1a8ae0a95a Merge pull request #1174 from akva2/update_packaging_libecl 
update packaging to reflect new libecl
 2017-09-25 10:05:40 +02:00
Atgeirr Flø Rasmussen c98683e31e Merge pull request #1173 from totto82/fix_fallout_none_productionSpecification 
Fix fallout if no group controll (NONE) is specified for a group
 2017-08-18 12:21:03 +02:00
Atgeirr Flø Rasmussen 4a8d74a910 Merge pull request #1172 from totto82/removeState 
Add interface for passing cell pressures directly in wellState.init(...)
 2017-08-10 14:21:53 +02:00
Atgeirr Flø Rasmussen 41234f1bee Merge pull request #1169 from totto82/impl_polymer 
Add polymer to blackoilstate
 2017-06-23 13:31:40 +02:00
Atgeirr Flø Rasmussen a8a46ee5ae Merge pull request #1167 from GitPaean/fixing_petsc_compilation 
removing the unused parameter:: for LinearSolverPetsc
 2017-06-12 11:12:45 +02:00
Atgeirr Flø Rasmussen 4bab353e90 Merge pull request #1168 from dr-robertk/PR/remove-warnings 
[cleanup] remove two uninitialized warnings in SaturationProposFromDeck.
 2017-06-07 14:08:57 +02:00
Atgeirr Flø Rasmussen d504715caa Merge pull request #1165 from blattms/fix-warnings 
Fix some warnings
 2017-06-02 17:03:14 +02:00
Atgeirr Flø Rasmussen 3f403a8470 Merge pull request #1162 from totto82/add_solvent_to_pu 
Implement solvent model in flow_ebos
 2017-05-19 10:02:59 +02:00
Atgeirr Flø Rasmussen acc0f81260 Merge pull request #1160 from akva2/remove_parameters 
changed: remove embedded 'parameters' namespace in ParamGroup
 2017-05-02 07:19:14 +02:00
Atgeirr Flø Rasmussen eeadc43cad Merge pull request #1159 from akva2/remove_xml_params 
changed: remove XML support for ParameterGroup
 2017-04-28 14:07:23 +02:00
Atgeirr Flø Rasmussen d837401d33 Merge pull request #1158 from akva2/no_native_in_packaging 
disable native tuning in packaging
 2017-04-28 08:36:55 +02:00
Atgeirr Flø Rasmussen fdd7b39587 Merge pull request #1157 from andlaus/fix-non-MPI-build 
fix non-MPI builds
 2017-04-20 21:47:08 +02:00
Atgeirr Flø Rasmussen 0cb21a8c04 Merge pull request #1156 from totto82/memfix_wellControl 
FIX memory leakage in well_controls
 2017-04-20 20:59:09 +02:00
Atgeirr Flø Rasmussen e52b7ef2ad Merge pull request #1155 from akva2/add_deps 
Packinging update backport
 2017-04-18 23:17:14 +02:00
Atgeirr Flø Rasmussen 524233c60a Merge pull request #1154 from andlaus/report-failure 
SimulatorReport: make it possible to report failed time steps
 2017-04-11 12:29:37 +02:00
Atgeirr Flø Rasmussen 3b5e15771b Merge pull request #1153 from babrodtk/hysteresis_output 
Added functions in SaturationProps for hysteresis IO
 2017-04-07 15:54:26 +02:00
Atgeirr Flø Rasmussen 901dbc248e Merge pull request #1145 from totto82/add_sat_table_id 
Add sat table id to well struct
 2017-04-07 14:43:33 +02:00
Atgeirr Flø Rasmussen e2f8375a1a Merge pull request #1151 from totto82/fix_test_equil 
Fix test equil
 2017-04-05 09:01:12 +02:00
Atgeirr Flø Rasmussen d3d7c64107 Merge pull request #1147 from totto82/fix_initial_rs 
Do not extrapolate initial rs and rv values in the depth tables
 2017-03-16 13:55:17 +01:00
Atgeirr Flø Rasmussen 7bf6da1953 Merge pull request #1146 from GitPaean/putting_wells_under_group_control 
putting wells under immidatel group control when specified with GRUP
 2017-03-10 10:18:39 +01:00
Atgeirr Flø Rasmussen 03e005bb76 Merge pull request #1143 from GitPaean/fixing_thp_initialization 
Fixing thp initialization
 2017-03-02 15:51:38 +01:00
Atgeirr Flø Rasmussen aecfa0e448 Merge pull request #1144 from totto82/output_initial_rs 
Do not set rs=rsSat and rv=rvSat for the saturated case
 2017-02-23 09:13:40 +01:00
Atgeirr Flø Rasmussen 6d01c29686 Merge pull request #1142 from GitPaean/output_thp 
adding thp to the report for summary output.
 2017-02-16 13:16:14 +01:00
Atgeirr Flø Rasmussen d5a9f27e5e Merge pull request #1141 from akva2/remove_adaptive_time_stepping 
remove AdaptiveTimeStepping class
 2017-02-10 15:16:56 +01:00
Atgeirr Flø Rasmussen 119b5b1a3a Merge pull request #1140 from andlaus/fix_gcc7_warnings 
fix a GCC 7 warning
 2017-02-10 10:31:13 +01:00
Atgeirr Flø Rasmussen c5a80e97a2 Merge pull request #1138 from andlaus/refactor_well_permeability 
do not explicitly pass the permeability to the well model anymore
 2017-01-27 13:15:50 +01:00
Atgeirr Flø Rasmussen 5aa5ac89c5 Merge pull request #1137 from GitPaean/group_ebos_vrep 
set the VREP control as current control when applying VREP control
 2017-01-27 11:11:42 +01:00
Atgeirr Flø Rasmussen 5e67765229 Merge pull request #1136 from andlaus/update_dune.module 
update the dune.module file
 2017-01-20 13:58:48 +01:00
Atgeirr Flø Rasmussen 674d97c660 Merge pull request #1134 from GitPaean/group_ebos 
updating the group control limit for individual control wells
 2017-01-18 14:08:33 +01:00
Atgeirr Flø Rasmussen 7830083e9b Merge pull request #1133 from blattms/parallel-accumulate 
Added an accumulate method that allows to switch off non-owner entries.
 2017-01-11 15:16:48 +01:00
Atgeirr Flø Rasmussen 8851f072a3 Merge pull request #1132 from atgeirr/throw-on-solvent 
Throw if solvent phase injected.
 2017-01-10 08:28:16 +01:00
Atgeirr Flø Rasmussen 00dad30432 Throw if solvent phase injected. 2017-01-09 16:33:03 +01:00
Atgeirr Flø Rasmussen 7ef8971be4 Merge pull request #1120 from jokva/density-from-eclipsestate 
Use Density from EclipseState
 2017-01-09 10:38:30 +01:00
Atgeirr Flø Rasmussen 8daa0f440c Merge pull request #1125 from jokva/reduce-deck-use-relperm-diagnostics 
Don't rely on Deck for checkTable and checkPhase
 2017-01-09 09:35:25 +01:00
Atgeirr Flø Rasmussen e2023ed38e Merge pull request #1124 from jokva/read-rock-from-eclipsestate 
Read ROCK from EclipseState, not Deck
 2017-01-09 09:33:47 +01:00
Atgeirr Flø Rasmussen 898ca1b7e0 Merge pull request #1131 from atgeirr/increase-iters-for-equil 
Increase max iterations for capillary curve inversion.
 2017-01-09 09:31:14 +01:00
Atgeirr Flø Rasmussen be26c072e1 Increase max iterations for capillary curve inversion. 
Triggered by a new two-phase case.
 2017-01-06 15:24:08 +01:00
Atgeirr Flø Rasmussen 3e3a76d37d Merge pull request #1129 from totto82/test_swatinit_fix 
Make it optinal to apply SWATINIT
 2017-01-06 10:23:39 +01:00
Atgeirr Flø Rasmussen fdd81eacaa Remove unused Deck function argument. 2017-01-02 09:47:57 +01:00
Atgeirr Flø Rasmussen 2e49273da7 Fix order of initialization. 2016-12-29 13:55:42 +01:00
Atgeirr Flø Rasmussen 4ea6611ecc Merge pull request #1117 from totto82/storeIfTimeStepFails 
Store whether timestep failed or not
 2016-12-19 12:21:31 +01:00
Atgeirr Flø Rasmussen f65739c718 Merge pull request #1121 from andlaus/fix_build 
add missing semicolon to fix the build
 2016-12-16 11:08:54 +01:00
Atgeirr Flø Rasmussen dec5bdf7c4 Remove redundant tests. 
The unit constant test has been added to opm-parser since the
unit support has been moved there. The parser test is simply
redundant.
 2016-12-05 12:55:37 +01:00
Atgeirr Flø Rasmussen 87650a3819 Merge pull request #1115 from atgeirr/remove-more-grid-stuff 
Remove more files moved to opm-grid.
 2016-12-01 13:52:35 +01:00
Atgeirr Flø Rasmussen f72f996008 Merge pull request #1112 from andlaus/improve_SimulatorReport 
Improve simulator report
 2016-11-30 19:33:55 +01:00
Atgeirr Flø Rasmussen fd552926d8 Remove more files moved to opm-grid. 2016-11-30 14:29:37 +01:00
Atgeirr Flø Rasmussen ebfcea125d Merge pull request #1114 from akva2/update_jenkins_grid 
update jenkins dependency graph
 2016-11-29 22:50:09 +01:00
Atgeirr Flø Rasmussen 8d129d7172 Merge pull request #1113 from atgeirr/remove-grid-stuff 
Move grid things to opm-grid.
 2016-11-29 21:04:14 +01:00
Atgeirr Flø Rasmussen ec85a922ac Update dune.module to reflect changed dependency graph. 2016-11-29 13:31:48 +01:00
Atgeirr Flø Rasmussen c7cc24385a Remove files moved to opm-grid. 2016-11-29 13:25:22 +01:00
Atgeirr Flø Rasmussen 602f3252e6 Merge pull request #1103 from GitPaean/fixing_warning 
warning fixed related to petsc
 2016-11-23 12:37:31 +01:00
Atgeirr Flø Rasmussen 1e462f4c04 Merge pull request #1107 from GitPaean/fixing_findWellNode 
Adding a flag to WellCollection whether group control active
 2016-11-17 23:27:06 +01:00
Atgeirr Flø Rasmussen af874ada54 Merge pull request #1106 from atgeirr/remove-moved-tests 
Remove tests that were moved to opm-output.
 2016-11-17 10:41:06 +01:00
Atgeirr Flø Rasmussen 3c35e767d4 Remove tests that were moved to opm-output. 2016-11-17 09:47:58 +01:00
Atgeirr Flø Rasmussen 054fa92e61 Merge pull request #1104 from GitPaean/fixing_findWellNode 
rewriting the findWellNode function
 2016-11-16 15:00:13 +01:00
Atgeirr Flø Rasmussen c901e2ec7c Merge pull request #1088 from GitPaean/group_control 
group control_updating well production targets within a group.
 2016-11-16 13:20:04 +01:00
Atgeirr Flø Rasmussen 59ef5f2b11 Merge pull request #1100 from akva2/fix_well_serialization 
fixed: use correct indices for perforation pressure
 2016-11-07 14:53:09 +01:00
Atgeirr Flø Rasmussen 76bdc081c0 Merge pull request #1099 from atgeirr/bump-version 
dune.module: change version to 2017.04-pre
 2016-11-04 12:30:17 +01:00
Atgeirr Flø Rasmussen be462f6c3a dune.module: change version to 2017.04-pre 2016-11-04 12:26:59 +01:00
Atgeirr Flø Rasmussen 5d33f0d900 Merge pull request #1095 from atgeirr/fix-diag-twophase 
Fix saturation family diagnostics for two-phase case.
 2016-10-28 10:41:17 +02:00
Atgeirr Flø Rasmussen e0dc670604 Merge pull request #1097 from totto82/initialTimestep 
Make it possible to set initial timestep
 2016-10-28 10:26:31 +02:00
Atgeirr Flø Rasmussen 1ce4c47b09 Fix saturation family diagnostics for two-phase case. 2016-10-27 11:58:50 +02:00
Atgeirr Flø Rasmussen 5963dd0027 Merge pull request #1094 from atgeirr/completion-data-changes 
Adapt to changed data::Wells API.
 2016-10-25 13:58:37 +02:00
Atgeirr Flø Rasmussen 9dfd16cffb Adapt to changed data::Wells API. 2016-10-25 10:41:16 +02:00
Atgeirr Flø Rasmussen 125d1696d6 Merge pull request #1093 from dr-robertk/PR/fix-wellmanager-constructor 
Make WellsManager compile with c++-11.
 2016-10-23 07:36:08 +02:00
Atgeirr Flø Rasmussen ad5d98664c Merge pull request #1075 from jokva/output-data-wells-sans-vectors 
WIP: Restore from data::Wells without vector dumps
 2016-10-21 14:58:10 +02:00
Atgeirr Flø Rasmussen cc72693348 Merge pull request #1090 from atgeirr/convergence-failure-problem-not-error 
Convergence failure is "problem" not "error"
 2016-10-21 12:49:10 +02:00
Atgeirr Flø Rasmussen 069b65a635 Add option to enable logging (default true). 
This makes it possible to avoid logging from this class in a parallel setting.
 2016-10-20 22:39:08 +02:00
Atgeirr Flø Rasmussen e38b9ffcb7 Classify convergence failure as a "problem" not "error". 2016-10-20 22:36:20 +02:00
Atgeirr Flø Rasmussen 8e8b624d4c Ensure logging only on first rank. 2016-10-20 22:36:20 +02:00
Atgeirr Flø Rasmussen 518c9849ff Merge pull request #1092 from andlaus/fix_make_install 
fix `make install`
 2016-10-20 09:44:16 +02:00