Commit Graph
14789 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 216f77f03f Remove unused variables. 2022-10-17 16:45:18 +02:00
Atgeirr Flø Rasmussen 1eec214c89 Merge pull request #4169 from blattms/dune-2.9-fix-deprecations
Dune 2.9 fix deprecations
2022-10-17 15:17:29 +02:00
Atgeirr Flø Rasmussen 5a90ced52d Merge pull request #4054 from totto82/gasliftthplim
Allow for gaslift for wells that violate thp limit but are not allowed to switch
2022-10-17 15:15:49 +02:00
Atgeirr Flø Rasmussen 6a13fe807a Merge pull request #4155 from totto82/fixTestGlift
set alq before trying to solve the equation during well testing
2022-10-17 15:08:57 +02:00
Atgeirr Flø Rasmussen 31ac961834 Merge pull request #4157 from blattms/wellcontrib-available-always
Fix compilation with amgcl/vexcl and without CUDA/OpenCL.
2022-10-17 15:03:37 +02:00
Markus Blatt f49739cb52 Merge pull request #4168 from bska/expand-bitset-serialization
Add Serialization Support for std::bitset<3>
2022-10-17 12:04:11 +02:00
Markus Blatt 8d522a2c42 Get rid deprecation warning for newer DUNE versions. 2022-10-14 21:29:09 +02:00
Bård Skaflestad 629edd3919 Add Serialization Support for std::bitset<3>
Needed in upcoming work for communicating dynamic phase quantities
per segment in a multisegmented well.
2022-10-14 18:29:52 +02:00
Bård Skaflestad 8162b97c0e Merge pull request #4167 from atgeirr/hide-all-vtk-params
Hide all vtk parameters.
2022-10-14 11:30:29 +02:00
Atgeirr Flø Rasmussen c6b3e4c462 Hide all vtk parameters. 2022-10-14 10:46:45 +02:00
Atgeirr Flø Rasmussen 69f2ede363 Merge pull request #4165 from atgeirr/avoid-useless-call
Do not call assignToSolution() and throw away the result.
2022-10-14 10:31:26 +02:00
Bård Skaflestad 7096343121 Merge pull request #4162 from akva2/use_range_generators
Use range generators for grid iterations
2022-10-13 23:42:10 +02:00
Bård Skaflestad dd61e79e86 Merge pull request #4166 from GitPaean/removing_GTotal
removing the usage of GTotal in the well code
2022-10-13 23:01:43 +02:00
Arne Morten Kvarving ff826aa939 RegionAverageCalculator: use elements range generator 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving 5796396696 RateConverter: use elements range generator 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving 15f1ec0c3a BlackoilWellModel: use elements range generator 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving 72dfc63167 BlackoilModelEbos: use elements range generator 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving ada17881cc AquiferAnalytical: use elements and intersections range generators 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving 72bed4449b AquiferNumerical: use elements range generator 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving 0da1ff494b findOverlapRowsAndColumns: use elements range generator 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving 3137cb5194 getQuasiImplesWeights: use elements range generator 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving a884e3c1d6 ecltracermodel: use elements range generator 2022-10-13 23:01:35 +02:00
Arne Morten Kvarving 7f21bc55b0 eclthresholdpressure: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving 3599e0e5de eclproblem: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving be84bc16be ecloutputblackoilmodule: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving f85d388955 eclgenerictracermodel: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving 998cd137a0 ecltransmissibility: use elements and intersections range generators 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving da2c68ee08 eclwriter: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving 0329ce08a7 eclgenericwriter: use elements and intersections range generators 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving 50e6ca16d6 eclgenericthresholdpressure: use elements and intersections range generators 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving 82b29f113a eclbasevanguard: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving a6509fe077 collecttoiorank: use elements range generator 2022-10-13 23:00:57 +02:00
Kai Bao 9056bf3d98 removing the usage of GTotal 2022-10-13 22:13:45 +02:00
Atgeirr Flø Rasmussen de12a990aa Do not call assignToSolution() and throw away the result. 2022-10-13 21:42:53 +02:00
Atgeirr Flø Rasmussen 2064e8725f Merge pull request #4121 from ElyesAhmed/damaris_integ_v3
Damaris integ v3
2022-10-13 14:02:30 +02:00
Arne Morten Kvarving ecc36f6ce8 fix cmake handling
- use imported target for linking
- use separate damaris cmake script
- handle HAVE_DAMARIS config variable in the usual way

fixing issues when user does not provide an outputDir via a command_line

avoid adding damaris's command lines when we dont have damaris
2022-10-13 12:23:06 +02:00
Elyes Ahmed 0a7f7e94b7 fixing unused variable err 2022-10-13 12:23:06 +02:00
Elyes Ahmed 31f5ff3f0e fixing initDamarisInitXmalFile in Cmake_Lists_FXiles 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen d27ed995bf Use OpmLog. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen b7bc8437e7 Minor fixes and formatting issues addressed. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen c1b3c5e973 Rename option to EnableDamarisOutputCollective. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 066897bbf9 Remove file added by mistake. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 2c86a61b70 Remove extra whitespace. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 430d8995eb Reformatting with clang-format. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 76bacff3cf Move XML template to separate file, fix formatting, and use path. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen fd1d1d15a4 Bugfix: remove quotes around _File_Mode. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 926c213628 Make ensureOutputDirExists() callable outside readDeck.cpp, and use it.
This is necessary because when using Damaris we must have the output dir ready
when we initialize Damaris. In the existing code, this was ensured only
from the setupLogging() call.
2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen fae71df32d Fix initialization and stopping Damaris.
With this, flow no longer hangs on exit.
2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen e347959d79 Set _PATH_REGEX_ for non-async, also reformat. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen 408fadca8e Add #define to fix compile on clang.
Necessary due to primitive check for std::unique_ptr in the XSD library.
2022-10-13 12:23:06 +02:00