Commit Graph
14912 Commits
Author SHA1 Message Date
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
Elyes Ahmed 4e7d9b5900 adding a constraint to let flow compile without having damaris necessarly 2022-10-13 12:23:06 +02:00
Joshua Bowden fa7af3540c Changes needed to add Damaris functionality. The current state is that we output the pressure field and we use both HDF5 and parallel HDF5.
Damaris initialization is added after InitMpi but before starting the simulation. Damaris will invoke a separate core for writing in
parallel and leave the rest of cores for the simulator. The main changes are in main where start_damaris and then in eclwriterm where
we use damaris to output the PRESSURE. To test Damaris one can use --enable-damaris-output=true and to use parallel HDF5 one can use
--enable-async-damaris-output=true (false is the default choice)
2022-10-13 12:23:06 +02:00
Markus Blatt 7e1c63c92d Merge pull request #4163 from bska/remove-close-brace-semicolon
Remove Trailing Semicolon on Function's Close Brace
2022-10-13 11:47:38 +02:00
Bård Skaflestad ec83f37afa Merge pull request #4147 from akva2/tracer_begin_optimize
Optimize EclTracerModel::updateStorageCache
2022-10-13 10:47:51 +02:00
Bård Skaflestad 90ddd13bcc Remove Trailing Semicolon on Function's Close Brace
This removes a GCC warning message on higher warning levels.
2022-10-13 09:57:55 +02:00
Atgeirr Flø Rasmussen 38e38fd1c2 Merge pull request #4161 from blattms/do-no-include-config.h-in-headers
Move include of config.h to cpp-file
2022-10-13 09:09:42 +02:00
Markus Blatt fcc3690832 Added missing include of config.h in cpp files. 2022-10-12 15:28:38 +02:00
Markus Blatt b9aa7bdc3b Move include of config.h to cpp-file
One should never include config.h in a header. To the very least it results
in redefined macros.
2022-10-12 14:30:26 +02:00
Bård Skaflestad 0da2b6e558 Merge pull request #4156 from tskille/add_regtest_krnum
start regression testing for SPE1CASE2_KRNUM
2022-10-12 10:39:11 +02:00
Torbjørn Skille d9ca2c7108 start regression testing for SPE1CASE2_KRNUM 2022-10-12 07:59:56 +02:00
Tor Harald Sandve 408624cf57 Merge pull request #4148 from osae/hysterKillough
Killough hysteresis now supported.
2022-10-12 07:52:35 +02:00
Markus Blatt c2963560d2 Fix compilationw with amgcl/vexcl and without CUDA/OpenCL.
There is no reason to omit WellContributions if neither CUDA nor
OpenCL is found as the implementations/functions only use C++-
To the contrary, the defines used for deactivating were not
consistent with usage elsewhere and resulted in compiler erorrs
for exotic configuration
2022-10-11 10:42:08 +02:00
Tor Harald Sandve 2ca3c25f4f set alq before trying to solve the equation during well testing 2022-10-10 08:14:42 +02:00
Arne Morten Kvarving 89d4798cca changed: do all updateStorageCaches in one call
by looping over the tracer batches.
this avoids initializing the element contexts 3 times for each cell
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving 9a88f56e7d changed: put tracer batches in an array
now we can easily iterate over them
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving 0d1c989a25 simplify updateStorageCache
use the elements() range generator. while at it, fix some cosmetics
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving 2f80274100 changed: only update primary variables in tracer update
no reason to update the extensive quantities
2022-10-07 13:27:56 +02:00
Bård Skaflestad 0a3ede1400 Merge pull request #4151 from GitPaean/wecon_only_producer
only enforcing production economic limit to producers.
2022-10-06 15:44:52 +02:00
Bård Skaflestad 9893f9cea3 Merge pull request #4150 from akva2/janitoring
fixed: add missing includes
2022-10-06 15:44:24 +02:00
Bård Skaflestad 0206627aad Merge pull request #4152 from tskille/add_regtest_wvfpexp02
add regression test for model WVFPEXT-02
2022-10-06 15:43:56 +02:00
Kai Bao 9461bf1a99 only enforcing production economic limit to producers. 2022-10-06 15:27:33 +02:00
Torbjørn Skille 7afb12ff6e add regression test for model WVFPEXT-02 2022-10-06 14:30:46 +02:00
Arne Morten Kvarving d08ab74630 fixed: add missing includes
and mark parameter maybe_unused
2022-10-06 13:16:46 +02:00
Ove Sævareid 38436df417 Killough hysteresis now supported. 2022-10-05 18:20:00 +02:00
Bård Skaflestad 4b7ad47b69 Merge pull request #4146 from akva2/update_property_refactor
Refactor property updating in EclProblem
2022-10-05 17:11:39 +02:00
Arne Morten Kvarving c4e2ffea57 simplify updateProperty_: use elements() range generator 2022-10-05 15:36:22 +02:00
Arne Morten Kvarving 26b8fe01a3 changed: use updateProperty_ in updateCompositionChangeLimits_() 2022-10-05 15:36:19 +02:00
Arne Morten Kvarving 2d33932160 changed: use updateProperty_ in updateMaxPolymerAdsorption_ 2022-10-05 15:31:13 +02:00
Arne Morten Kvarving 0841b2baf4 changed: use updateProperty_ in updateHysteresis_ 2022-10-05 15:28:07 +02:00
Arne Morten Kvarving f4cd69f422 changed: use updateProperty_ in updateMinPressure_ 2022-10-05 15:25:07 +02:00
Arne Morten Kvarving 80b54a85ad changed: use updateProperty_ in updateMaxWaterSaturation_ 2022-10-05 15:21:52 +02:00
Arne Morten Kvarving 32995d34a1 changed: use updateProperty_ in updateMaxOilSaturation_ 2022-10-05 15:18:49 +02:00
Arne Morten Kvarving e4fe00413b added: EclProblem::updateProperty_ function
this loops over the grid cells, extracts compressedDofIdx
and intensive quantities and then calls a passed function.
2022-10-05 15:11:49 +02:00
Bård Skaflestad 5f101a3d58 Merge pull request #4144 from akva2/rename_serialize_object
adjust to renaming of serializeObject
2022-10-04 17:18:15 +02:00
Tong Dong Qiu 860c209bac Removed deleted header reference 2022-10-04 14:23:16 +02:00
Arne Morten Kvarving 214f62f90c adjust to renaming of serializeObject 2022-10-04 14:10:47 +02:00
Bård Skaflestad 8d85ffd916 Merge pull request #4142 from atgeirr/rename-sims
Rename flow_blackoil to flow_blackoil_legacyassembly and flow_blackoil_tpfa to flow_blackoil
2022-10-04 12:54:13 +02:00