OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,486 Commits 24 Branches 102 Tags 90 MiB
75b73a893e
Commit Graph

3486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
391bda4711 Merge pull request #645 from akva2/add_shared_opm_data 
Use shared copy of opm-data when possible
 2016-04-12 14:38:40 +02:00
Arne Morten Kvarving
596561b4ce Use shared copy of opm-data when possible 
- The user can supply OPM_DATA_ROOT directly and this
is used.
- The user can supply OPM_DATA_ROOT_PREDEFINED and
this is used unless there is a PR against opm-data specified in the
trigger.

This is used to minimize the network traffic on the jenkins resource.
opm-data is updated nightly, and this nightly updated copy is used
unless otherwise instructed.

This commit also enables the opm-data integration tests on all runs.
 2016-04-11 12:18:54 +02:00
Atgeirr Flø Rasmussen
fc0943c4e8 Merge pull request #642 from akva2/import_files_from_opm_core 
Import some files from opm core (with history)
 2016-04-11 10:54:13 +02:00
Arne Morten Kvarving
ec84849361 add files imported from opm-core to build system 
change include path for thresholdPressures.hpp in test.
note that the test is currently disabled (it was not enabled in
opm-core and does not build).
 2016-04-11 10:01:01 +02:00
Arne Morten Kvarving
66333051e7 Import the following files from opm-core 
opm/core/utility/thresholdPressures.hpp
tests/test_thresholdpressure.cpp
opm/core/simulator/SimulatorCompressibleTwophase.hpp
opm/core/simulator/SimulatorCompressibleTwophase.cpp
opm/core/simulator/SimulatorIncompTwophase.hpp
opm/core/simulator/SimulatorIncompTwophase.cpp
examples/sim_2p_comp_reorder.cpp

the files in opm/core has been put in opm/simulators
 2016-04-11 09:59:25 +02:00
Joakim Hove
2defd015ad Merge pull request #641 from atgeirr/rename-autodiff 
Rename opm-autodiff -> opm-simulators.
 2016-04-10 22:15:12 +02:00
Atgeirr Flø Rasmussen
b5cf0763c5 Also change library name opmautodiff -> opmsimulators. 2016-04-08 20:33:18 +02:00
Atgeirr Flø Rasmussen
ff549195ab Rename opm-autodiff -> opm-simulators. 2016-04-08 14:58:07 +02:00
Atgeirr Flø Rasmussen
3f70248415 Remove the m4 directory. 
Artifact left over from the autotools days.
 2016-04-08 14:35:44 +02:00
Atgeirr Flø Rasmussen
b4b9d10c3a Merge pull request #628 from dr-robertk/PR/async-output 
Pr/async output
 2016-04-08 13:43:24 +02:00
Robert Kloefkorn
e80ad5a9fe Merge remote-tracking branch 'upstream/master' into PR/async-output 2016-04-08 13:07:44 +02:00
Robert Kloefkorn
b3a313bfec ThreadHandle: added documentation and use std::unique_ptr to store object pointers. 2016-04-08 11:12:09 +02:00
Atgeirr Flø Rasmussen
079fce79d9 Merge pull request #640 from GitPaean/wells_moving_out 
Moving the StandardWells class definition to separate files.
 2016-04-07 11:18:56 +02:00
Kai Bao
23ba5fa398 removing the StandardWells definition inside BlackoilModelBase 
and some other tiny cleaning up.
 2016-04-07 10:45:13 +02:00
Kai Bao
624516ed3c creating separate files for class StandardWells 2016-04-06 16:42:04 +02:00
Atgeirr Flø Rasmussen
cebc393caf Merge pull request #635 from GitPaean/wells_refactoring 
A first step towards Wells refactoring
 2016-04-06 16:08:18 +02:00
Robert Kloefkorn
ec45b5547d cleanup. 2016-04-06 15:39:57 +02:00
Atgeirr Flø Rasmussen
09b52a8d7e Merge pull request #638 from atgeirr/module-renaming 
Module renaming
 2016-04-06 15:38:01 +02:00
Robert Kloefkorn
7e6a6fb20a ThreadHandle: cleanup and docu. 2016-04-06 15:26:47 +02:00
Kai Bao
84cc1ed81d correcting the determination of wells_active_. 2016-04-06 14:36:51 +02:00
Kai Bao
2bd83aae73 making the constructors of WellOps and StandardWells explicit. 2016-04-06 14:10:17 +02:00
Atgeirr Flø Rasmussen
c00376e506 Renamed in Jenkins scripts. 2016-04-06 13:32:27 +02:00
Atgeirr Flø Rasmussen
6cd1d28696 Rename in travis script. 2016-04-06 13:31:07 +02:00
Atgeirr Flø Rasmussen
37c4bd16b1 Adapt code to dune-cornerpoint -> opm-grid renaming. 2016-04-06 13:29:47 +02:00
Atgeirr Flø Rasmussen
6f1cec4eec Rename dune-cornerpoint -> opm-grid. 2016-04-06 13:29:47 +02:00
Kai Bao
9972dae32a updating for the comments. 
implement wells(), localWellsActive() and wellsActive() for the
BlackoilModelBase and its derived classed.
 2016-04-06 12:54:01 +02:00
Kai Bao
4ad5d81296 fixing wrong codes from the rebase process and cleanup. 2016-04-06 12:54:01 +02:00
Kai Bao
8a52dd743b making StandardWells a simple class. 2016-04-06 12:54:01 +02:00
Kai Bao
3947ff5b1d moving localWellsActive and wellsActive to StandardWells 
maybe later it can be something general for different types of wells.
 2016-04-06 12:54:01 +02:00
Kai Bao
48483b23c7 update BlackoilSolventModel to fix the compilation. 2016-04-06 12:54:01 +02:00
Kai Bao
23288ce2e5 fixing the compilation after updated with master branch. 2016-04-06 12:54:01 +02:00
Kai Bao
5910c0db7c recovering the buidling for flow_multisegment 2016-04-06 12:54:01 +02:00
Kai Bao
723da3e618 recovering the flow_polymer 2016-04-06 12:54:01 +02:00
Kai Bao
bef4b8c077 moving the wellOps to the StandardWells class. 2016-04-06 12:54:01 +02:00
Kai Bao
8367eaacb3 first attempt to introduce StandardWells struct. 
To replace the const Wells struct in BlackoilModelBase.
Only testing with Flow for the moment. Will update other Flow siblings
later.
 2016-04-06 12:54:00 +02:00
Robert Kloefkorn
54ea243c5f SimulatorFullyImplicitBlackoilOutput: added threaded asynchronous output. 2016-04-06 11:10:01 +02:00
Arne Morten Kvarving
b406be3839 added: trigger support for opm-data on jenkins builds 2016-04-06 10:16:11 +02:00
Arne Morten Kvarving
4becc05314 fixed: use shallow clones on jenkins 2016-04-06 10:16:11 +02:00
Atgeirr Flø Rasmussen
b7fc614356 Merge pull request #636 from bska/travis-request-opm-output 
Request requisite module opm-output in Travis builds
 2016-04-05 13:59:43 +02:00
Bård Skaflestad
814a94e058 Request requisite module opm-output in Travis builds 2016-04-05 12:54:44 +02:00
Atgeirr Flø Rasmussen
25cd84b6a2 Merge pull request #622 from totto82/refact_sovlent 
Refactor the solvent model
 2016-04-05 10:46:28 +02:00
Arne Morten Kvarving
68d02c0002 add jenkins script for running simple2D polymer case 2016-04-05 09:42:56 +02:00
Arne Morten Kvarving
4bea041ec8 add jenkins script for running Norne case 2016-04-05 09:14:55 +02:00
Arne Morten Kvarving
9e5bc628db add jenkins script for running SPE cases 2016-04-05 09:14:55 +02:00
Tor Harald Sandve
e5254f3779 Adapt to changes interface of extractWellPerfProperties 
The BlockoilmultisegmentModel is updated to account for changes in the
extractWellPerfProperties() interface.
 2016-04-05 09:13:29 +02:00
Atgeirr Flø Rasmussen
16c8ca40cd Merge pull request #634 from totto82/fix_test_solventProps 
Fixes to test_solventprops_ad
 2016-04-05 09:11:29 +02:00
Tor Harald Sandve
764d8a1c3f Remove leftovers from a merge process going wrong 2016-04-05 09:03:22 +02:00
Tor Harald Sandve
89e540cb2c Pass solutionState as first parameter 
output parameters go last...
 2016-04-05 08:57:07 +02:00
Tor Harald Sandve
925d0becf3 Fix to make flow_solvent run decks without solvent 2016-04-05 08:57:07 +02:00
Tor Harald Sandve
541475b2db Implement computePropertiesForWellConnectionPressures for solvent model 
The solvent specify part of computeWellConnectionPressures is factored
out to computePropertiesForWellConnectionPressures in order to reuse
the computeWellConnectionPressures from the base model.
 2016-04-05 08:57:07 +02:00