Commit Graph

2077 Commits

Author SHA1 Message Date
Andreas Lauser
4baf0f6acf Merge pull request #654 from andlaus/nested_ad
Fix build
2016-04-18 11:01:39 +02:00
dr-robertk
93f48d6ad9 Merge pull request #647 from GitPaean/wells_refactoring_onlytemplate_function
Moving more well related functions to StandardWells
2016-04-16 12:37:42 +02:00
Andreas Lauser
0405953a64 adapt code w.r.t. the removal of the tags for Opm::Evaluation 2016-04-15 18:49:29 +02:00
Robert Kloefkorn
da0e725eb8 BackupRestore: remove all specializations for BlackoilState. This is now covered by
SimulationDataContainer.
2016-04-15 12:21:47 +02:00
Kai Bao
adb140a788 fixing the running of flow_multisegment 2016-04-14 16:05:19 +02:00
Kai Bao
75b73a893e putting Vector and ADB to be inside StandardWells and wellhelpers 2016-04-14 16:05:19 +02:00
Kai Bao
19734f2103 adding extractWellPerfProperties to StandardWellsSolvent
to fix the flow_solvent running.
2016-04-14 16:05:19 +02:00
Kai Bao
5da57973fe adding updateWellState and updateWellControls to StandardWells 2016-04-14 16:05:18 +02:00
Kai Bao
376c940f09 moving updatePerfPhaseRatesAndPressures to StandardWells 2016-04-14 16:05:18 +02:00
Kai Bao
c398a6e424 puting computeWellFlux in StandardWells 2016-04-14 16:05:18 +02:00
Kai Bao
e9e1b9fda8 adding extractWellPerfProperties to StandardWells
It causes problem for the flow_multisegment. So the version in
BlackoilModelBase is kept for now.

On the other hand, it is few of functions that will be both required by
the standard wells and multisegment wells.

Some decision will be made later on how to put this function.
2016-04-14 16:05:18 +02:00
Kai Bao
c8b66821d5 adding computeWellConnectionDensitesPressures to StandardWells class. 2016-04-14 16:05:18 +02:00
Kai Bao
5d99fac207 adding StandardWellsSolvent for Solvent model. 2016-04-14 16:05:18 +02:00
Kai Bao
bca23d34c1 making StandardWells non-templated
we will focus on template functions instead.
2016-04-14 16:05:18 +02:00
Kai Bao
266f6f2df5 adding computePropertiesForWellConnectionPressures to StandardWells
tested with flow. Not sure how other flow siblings work.
2016-04-14 16:05:18 +02:00
Kai Bao
3bcfc905bd makding StandardWells a template based on SolutionState and WellState
may need to be adjusted later.
2016-04-14 16:05:18 +02:00
Kai Bao
c120313f09 renaming visc parameters to mu_w for better readability 2016-04-14 15:09:03 +02:00
Kai Bao
104f6053f1 removing blank spaces and replacing the tab with spaces by retab 2016-04-14 14:57:26 +02:00
Kai Bao
30774d8309 correcting buggy visc pointer usage in effective viscosity calculation 2016-04-14 14:52:00 +02:00
Atgeirr Flø Rasmussen
c64593a023 Merge pull request #650 from GitPaean/mixing_parameters_fixing
using effective polymer viscosity for polymer mobility calculation.
2016-04-14 14:16:45 +02:00
Kai Bao
666f91505d using effective polymer viscosity for polymer mobility calculation. 2016-04-14 13:45:21 +02:00
Atgeirr Flø Rasmussen
a031c25ced Re-enable output for 2-phase sims.
This was disabled when the facilities were moved to opm-output.
Now that the simulators are in the opm-simulators module and not
opm-core we can re-enable it.
2016-04-14 13:08:24 +02:00
Pål Grønås Drange
170a71eef8 Using API get3DProperties. 2016-04-14 11:37:27 +02:00
Atgeirr Flø Rasmussen
be67e0f7a5 Update include file locations. 2016-04-14 11:32:08 +02:00
Pål Grønås Drange
fd9f67ae55 Using API get3DProperties() 2016-04-12 14:47:50 +02:00
Pål Grønås Drange
77fc26475b Using new EclipseState API, made ->s into .s 2016-04-12 14:47:50 +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
Atgeirr Flø Rasmussen
ff549195ab Rename opm-autodiff -> opm-simulators. 2016-04-08 14:58:07 +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
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
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
37c4bd16b1 Adapt code to dune-cornerpoint -> opm-grid renaming. 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
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