OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 16:11:57 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,652 Commits 24 Branches 102 Tags 90 MiB
24f8f7c857
Commit Graph

1820 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
766afa4602
Merge pull request #1917 from GitPaean/fixing_warnings_ 
more fixing for the tests
 2019-06-26 14:35:00 +02:00
Bård Skaflestad
402320267a
Merge pull request #1912 from akva2/janitoring 
Some janitoring
 2019-06-26 14:04:03 +02:00
Kai Bao
c2d472cd96 considering FOAM in the switch 2019-06-26 13:21:03 +02:00
Kai Bao
9a2fcdbfd5 fixing warnings in other folder under opm-simulators 2019-06-26 10:48:41 +02:00
Arne Morten Kvarving
4aec900699 reduce scope of variables 
quells sca warnings
 2019-06-25 09:29:07 +02:00
Arne Morten Kvarving
a21b81d5d9 fixed: check pointers before dereference 
quells a sca warning
 2019-06-25 09:28:51 +02:00
Arne Morten Kvarving
c826a709b1 fixed: reassignment before use of value 
quells a sca warning
 2019-06-25 09:27:26 +02:00
Arne Morten Kvarving
66394c870a fixed: check pointer before dereference 
quells a sca warning
 2019-06-25 09:26:41 +02:00
Atgeirr Flø Rasmussen
5749a7150c Move files out of opm/core/simulator. 2019-06-20 11:00:52 +02:00
Joakim Hove
7f1970af3c Use the shared SummaryState instance when initializing well rates 2019-06-17 07:49:55 +02:00
Joakim Hove
a0aa7fcc2b Use shared SummaryState when instantiating WellsManager 2019-05-29 07:44:23 +02:00
Joakim Hove
511645d12c Use InjectionControls and ProductionControls data classes 2019-05-23 16:27:17 +02:00
Joakim Hove
b6840db604 Use new well implementation Well2 from opm-common 2019-05-22 21:47:45 +02:00
Atgeirr Flø Rasmussen
c17adf788f Moved files to opm/simulators/ subdirs. 2019-05-08 12:58:19 +02:00
Markus Blatt
48c3802bf3 Removes unused function parameter warnings. 2019-04-25 10:00:59 +02:00
hnil
4f1603407d Added timing of prepare call for linear solvers 2019-04-10 14:40:46 +02:00
Joakim Hove
485db348f0 Move well includes to subdirectory Well/ 2019-03-07 15:30:33 +01:00
Joakim Hove
848072f658
Merge pull request #1362 from GitPaean/fixing_history_mode 
Fixing history mode
 2019-01-11 18:05:01 +01:00
Kai Bao
a9f40df678 not adding wells without perforations to WellsManager 2019-01-08 14:08:14 +01:00
Kai Bao
47b933a58e removing DynamicListEconLimited 
it is not used anymore. A lot of related implementation has been moved
to WellTestState.

Its existence makes some logic rather confusing and some new development
not easy.
 2019-01-08 11:28:11 +01:00
Kai Bao
bfc915849a BHP limit is taken care of from parser side 
WellsManager does not need to provide default bhp limit anymore.
 2019-01-03 09:48:02 +01:00
Atgeirr Flø Rasmussen
10c77257ad Fix missing GRAT in switch. 2019-01-02 15:29:22 +01:00
Kai Bao
b079c0a1e5 adding flow_injecitivity executable target 2018-12-11 21:40:47 +01:00
Kai Bao
e1ede3c9d5 adding polymer molecular weight to BlackoilPhases and phaseUsageFromDeck 2018-12-11 21:31:47 +01:00
Kai Bao
575907941d removing some repeated code in phaseUsageFromDeck 2018-11-27 14:55:26 +01:00
Arne Morten Kvarving
51da91c1ad remove files moved to opm-simulators-legacy 2018-11-27 11:00:21 +01:00
Arne Morten Kvarving
f027262ec4 remove files 2018-11-16 14:53:37 +01:00
Atgeirr Flø Rasmussen
8d2bc0e449 Add missing include for std::vector. 2018-11-13 20:26:44 +01:00
Joakim Hove
b9df94a70f Use Well CF and Kh calculations from opm-common 2018-09-10 12:23:59 +02:00
Andreas Lauser
ac2bc410f3 adapt to the fluid system naming convention change in opm-material 
note that almost the only thing which is affected is legacy code.
 2018-07-27 12:54:02 +02:00
Joakim Hove
514cdc574c Completion refactor 2018-06-26 12:30:54 +02:00
Joakim Hove
94d57f686c Refactor of connecrions & completions 2018-06-20 11:51:00 +02:00
Joakim Hove
bd57d574d3 Rename Completion -> Connection 2018-06-11 17:23:28 +02:00
Tor Harald Sandve
2534cc46db WIP fix vfp in flow 2018-05-15 10:24:50 +02:00
Arne Morten Kvarving
4933c10035 reduce scope of variable 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
ee57c82834 changed: mark constructors explicit 2018-04-13 11:25:10 +02:00
Bård Skaflestad
0f4354d8fd Include <sstream> for Class "ostringstream" 
Some implementations do not get a transitive definition of class
"ostringstream" in scope through the other headers and therefore
fail to compile the member function

  SimulatorReport::reportStep(std::ostringstream&)
 2018-04-04 19:00:51 +02:00
Atgeirr Flø Rasmussen
ce308455ab
Merge pull request #1433 from totto82/fix_reportStep 
Add reportStep method in SimulatorReport and use it
 2018-04-04 15:23:01 +02:00
Tor Harald Sandve
7c9dab1a64 Add reportStep method in SimulatorReport and use it 2018-03-12 14:48:34 +01:00
Kai Bao
b0edfd2f04 adding POLYMW to the injectorType determination 
just to silence a warning resulting from OPM/opm-common#348.
 2018-03-09 14:40:49 +01:00
Atgeirr Flø Rasmussen
1b33769922
Merge pull request #1399 from totto82/MoveWell 
Some more cleaning in the output code in opm-output, ewoms and opm-simulator
 2018-02-19 15:05:20 +01:00
Lars Petter Øren Hauge
011143829d Allow Wells struct initialization without wells 
Calling wells()->number_of_wells on nullptr causes segmentation fault. This
occurs when running a deck without wells. Allowing WellsManager::init to
continue for decks without wells enables the well struct to be set.

Authored by Sveinung Rundhovde & Lars Petter Hauge
 2018-02-13 16:43:10 +01:00
Tor Harald Sandve
a89a6af854 Some more cleaning in the output code in opm-output, ewoms and opm- 
simulator

1) Don't depend on legacy code for communicating the data::wells
2) Bugfix. Store globalIdx instead localIdx in data::wells::complitions
3) Move ThreadHandle to ebos
 2018-02-12 08:44:43 +01:00
Atgeirr Flø Rasmussen
cf9b7c39b9 Adapt to moved opm-grid headers. 2018-02-10 08:33:33 +01:00
Arne Morten Kvarving
2da361414e changed: relocate the remaining files in opm/core/utility 
move to opm/common/utility/numeric
 2018-01-30 16:33:46 +01:00
Arne Morten Kvarving
141186ad1d changed: opm/[core -> common]/utility/parameters 2018-01-30 16:33:45 +01:00
Arne Morten Kvarving
e9e5c15e99 changed: opm/[core/linalg -> common/utility/numeric]/blas_lapack.h 2018-01-30 12:47:10 +01:00
Arne Morten Kvarving
742d2d2158 changed: opm/common/[util->utility]/numeric/cmp.hpp 2018-01-30 12:13:30 +01:00
Arne Morten Kvarving
83d4dae117 changed: do not ifdef the entire implementation 
better to handle this in build system
 2018-01-17 18:16:26 +01:00
Arne Morten Kvarving
c03a980199 Import the remaining code from opm-core 2018-01-17 15:18:56 +01:00
Andreas Lauser
5bf53148c0 replace #if HAVE_CONFIG_H by #ifdef HAVE_CONFIG_H 
it seems like most build systems pass a -DHAVE_CONFIG_H flag to the
compiler which still causes `#if HAVE_CONFIG_H` to be false while it
clearly is supposed to be triggered.

That said, I do not really see a good reason why the inclusion of the
`config.h` file should be guarded in the first place: the file is
guaranteed to always available by proper build systems, and if it was
not included the build either breaks at the linking stage or -- at the
very least -- the runtime behavior of the resulting libraries will be
very awkward.
 2017-12-11 11:33:52 +01:00
Andreas Lauser
db1f257184 make call_umfpack.c compile even if UMFPACK is not available 
That said, don't try to call any of its functions or you'll regret it
at runtime!
 2017-12-11 11:33:52 +01:00
Andreas Lauser
503c7d1ca8 make the PETSc code compile even if PETSc is not available 
if PETSc is not available, the .cpp file will compile fine because it
will be reduced to be empty, but trying to include
LinearSolverPetsc.hpp in this case will result in an error.
 2017-12-11 11:33:52 +01:00
Andreas Lauser
244871829d PhaseUsage: handle polymer and solvent the same way as energy 2017-12-11 10:30:14 +01:00
Andreas Lauser
4571a8f841 add an energy "phase" 
This is quite a hack: Even though energy is not a "phase" and it is
also not considered in MaxNumPhases and pu.num_phases because this
would break a lot of assumptions in old code, it is nevertheless
assigned an "canonical index" that can be translated "active index"
via PhaseUsage::phase_pos[]. This awkwardness is needed because much
of the legacy OPM code conflates the concepts of "fluid phase" and
"conserved quantity" and fixing that issue would basically mean an
almost complete rewrite of much of the legacy code. That said, the
same statement applies to polymer and solvent, but these are currently
handled as even more second-class citizens because they are not even
given a canonical index and also cannot be translated into an active
one.
 2017-12-11 10:30:14 +01:00
Arne Morten Kvarving
075d518bea fixed: add ENERGY to switch to quell unhandled enum value warning 2017-12-05 17:13:08 +01:00
Roland Kaufmann
5284497bad Remove superfluous backing class for share_obj 
I originally wanted to make share_obj a class so that I could hide the
helper function, but it turned out that I needed a function after all
since a function template can be inferred from the parameters but the
type cannot from the constructor.

By returning a shared_ptr directly, the compiler can do return object
optimization.
 2017-12-04 16:24:14 +01:00
Roland Kaufmann
f173dad56e Provide stream that ignores everything written to it 
Use this stream when you want a straight code path, but also be able
to disable output at will.
 2017-12-04 16:24:14 +01:00
Roland Kaufmann
9193105410 Change from pass-by-value to pass-by-const-ref 
The object is copied when put into the list, so there should be no
danger of dangling references.
 2017-12-04 16:24:14 +01:00
Roland Kaufmann
0c53ac1509 Add classes for event-handling 
The new classes Event and EventSource can be used as a simple mechanism
for implementing event-based callbacks in the simulators.
 2017-12-04 16:24:14 +01:00
Atgeirr Flø Rasmussen
a767e166ae Make DataMap.hpp properly include its dependencies. 2017-12-04 16:24:14 +01:00
Joakim Hove
3725ac8f7d Added DataMap.hpp 2017-12-04 16:24:14 +01:00
Tor Harald Sandve
31657a5d1c Add efficiencyFactor to GuideRate 2017-12-01 11:32:35 +01:00
Tor Harald Sandve
c787f5a251 Handle WEFAC 
Added test combining WEFAC and GEFAC
 2017-11-30 13:45:05 +01:00
Tor Harald Sandve
90fcf0b132 Fix pvtIndex map for cases with non-active eqlnum regions. 2017-11-27 13:40:09 +01:00
Tor Harald Sandve
6862ed0b35 Fix 2p bug 2017-11-22 09:24:52 +01:00
Tor Harald Sandve
197019d865 Adress PR review issues 2017-11-22 08:31:57 +01:00
Tor Harald Sandve
d6ea5cc402 Cleaning the initialization code 
-remove whitespaces
-fix documentation
 2017-11-21 12:52:07 +01:00
Tor Harald Sandve
0ef82665f5 Use &ref not shared_pointer to MaterialLawManager 2017-11-21 12:08:10 +01:00
Tor Harald Sandve
51f48fcd13 Remove blackoilPhases and phaseUsage from the initialization code 
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
 2017-11-21 12:08:10 +01:00
Tor Harald Sandve
36e8f1bfec Remove BlackoilProps from equil initalization code 
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
 2017-11-21 12:08:10 +01:00
Atgeirr Flø Rasmussen
91ac16b7e3 Merge pull request #1184 from akva2/remove_unused_sources 
remove unused code
 2017-11-15 14:09:31 +01:00
Arne Morten Kvarving
a76ae214b8 remove unused code 2017-11-15 11:56:40 +01:00
Atgeirr Flø Rasmussen
f29f1b49d1 Merge pull request #1122 from atgeirr/fix-type-bug-in-equil 
Fix type bug in equil
 2017-11-14 14:40:47 +01:00
Joakim Hove
19318e5019 Schedule no longer part of EclipseState. 2017-10-24 20:38:15 +02:00
Atgeirr Flø Rasmussen
3bfe295d62 Bugfix: type for target capillary pressure. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
bbfd5b6413 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
df59dbbabf Merge pull request #1177 from alfbr/master 
Removing redundant checks from Nexus
 2017-10-11 21:57:36 +02:00
Markus Blatt
2bdafdb602 [cleanup] Removes unnecessary if clauses for unsupported DUNE versions. 
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
 2017-10-11 21:25:18 +02:00
Alf B. Rustad
fa886bc3aa Cosmetic change 2017-10-11 10:45:18 +02:00
Alf B. Rustad
7d32729a00 Cosmetic change 2017-10-11 10:45:18 +02:00
Alf B. Rustad
db7c47042c Remove remaining Nexus checks 2017-10-11 10:45:17 +02:00
Alf B. Rustad
520574513f Avoid false positives by introducing a tolerance 2017-10-11 10:45:17 +02:00
Alf B. Rustad
cc3ab456e9 Removing redundant checks from Nexus 2017-10-11 10:44:59 +02:00
Andreas Lauser
d95b622c75 mark initHydroCarbonState() as inline 
this allows it to be used in multiple compile units without the linker
running amok.
 2017-10-04 19:24:20 +02:00
Tor Harald Sandve
d643476ea5 Fix fallout if no group controll (NONE) is specified for a group 2017-08-18 08:56:26 +02:00
Tor Harald Sandve
6b55b8316b Add interface for passing cell pressures directly in wellState.init(...) 2017-08-03 10:31:10 +02:00
Tor Harald Sandve
d247b05b6b Add polymer to phase usage. 2017-06-16 13:40:29 +02:00
Tor Harald Sandve
655b81c8d7 Add polymer to blackoilstate 2017-06-12 15:37:57 +02:00
Atgeirr Flø Rasmussen
8a2cf4fd2d Merge pull request #1167 from GitPaean/fixing_petsc_compilation 
removing the unused parameter:: for LinearSolverPetsc
 2017-06-12 11:12:45 +02:00
Robert Kloefkorn
02b0b9d0f9 [cleanup] remove two uninitialized warnings in SaturationProposFromDeck. 2017-06-07 13:19:21 +02:00
Kai Bao
bbb0c5a993 removing the unused parameter:: for LinearSolverPetsc 
to fix the compilation when PETsc exists.
 2017-06-06 11:00:51 +02:00
Markus Blatt
1b52fc0724 Add missing include of config.h 
Closes OPM/opm-core#1164
 2017-05-24 12:11:49 +02:00
Tor Harald Sandve
d7fa66197f Add SSOL to blackoilState 
Stores the solvent saturation in the simulator container.
 2017-05-10 11:14:53 +02:00
Tor Harald Sandve
9e504da6a1 Add solvent to phaseUsage 2017-05-08 10:29:51 +02:00
Arne Morten Kvarving
ca2288ac37 changed: remove embedded 'parameters' namespace in ParamGroup 
inconsistent and unnecessary.

this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
 2017-04-28 15:34:11 +02:00
Atgeirr Flø Rasmussen
ce6801df7a Merge pull request #1157 from andlaus/fix-non-MPI-build 
fix non-MPI builds
 2017-04-20 21:47:08 +02:00
Andreas Lauser
6f257f0877 fix non-MPI builds 
some headers must be included unconditionally.
 2017-04-20 15:12:34 +02:00
Tor Harald Sandve
9a1a26b267 FIX memory leakage in well_controls 
The Alq and vfp is set free in well_controls_destroy to avoid memory
leakage.
 2017-04-20 12:58:16 +02:00
Kai Bao
926f93fa4e adding flag to tell when using well potential for guide rate 
for WellNode.
 2017-04-11 16:53:19 +02:00