Commit Graph
11765 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen ac3004da9d Merge pull request #2847 from blattms/blackoilmodel-getLocalNonshutWells
Added BlackoilWellModel::getLocalNonshutWells to reduce code duplicat…
2020-10-09 16:35:50 +02:00
Markus Blatt ba1bc7c23c Added BlackoilWellModel::getLocalNonshutWells to reduce code duplication. 2020-10-09 15:27:09 +02:00
Atgeirr Flø Rasmussen f528adb604 Merge pull request #2837 from blattms/fix-parallel-average-formation-factors
Fixes parallel computation of average formation factors.
2020-10-06 19:37:12 +02:00
Bård Skaflestad 406feea8e7 Merge pull request #2835 from bska/chase-ctfac-api-update
Provide Simulator's Dynamic CTF in data::Connection
2020-10-06 14:33:12 +02:00
Alf Birger Rustad 2949c54957 Merge pull request #2838 from akva2/janitoring
fix typo
2020-10-06 14:10:23 +02:00
Arne Morten Kvarving 3db98e3bef fix typo 2020-10-06 12:36:27 +02:00
Kai Bao 64746e21bf Merge pull request #2826 from akva2/janitoring
fixed: make some indices constexpr
2020-10-06 11:21:40 +02:00
Bård Skaflestad e39333895c Provide Simulator's Dynamic CTF in data::Connection
This is in preparation of implementing the WELPI feature.
2020-10-05 23:14:24 +02:00
Bård Skaflestad 14e34378b0 Merge pull request #2829 from GitPaean/wip_aquifer_keywords
aquifer summary keywords
2020-10-05 22:51:40 +02:00
Markus Blatt 5553d2d1f3 Renamed variables/functions for number of cells. 2020-10-05 20:02:13 +02:00
Markus Blatt f791884639 Used std::distance instead of manual for-loop. 2020-10-05 14:31:48 +02:00
Markus Blatt ca8de16285 Fixes parallel computation of average formation factors.
This was using the sum of the sum of all cells of the partitions.
Hence the shared cells were counted twice.
2020-10-05 14:08:59 +02:00
Atgeirr Flø Rasmussen 0aa3f51eb7 Merge pull request #2836 from akva2/avoid_macro
avoid usage of property system macro
2020-10-05 09:54:53 +02:00
Arne Morten Kvarving c888410a07 avoid usage of property system macros 2020-10-05 09:01:58 +02:00
Atgeirr Flø Rasmussen f6569b6a4f Merge pull request #2832 from alfbr/improve-output
Improve output
2020-10-05 08:49:09 +02:00
Atgeirr Flø Rasmussen aa5db0ddcf Merge pull request #2833 from hakonhagland/override
Fix inconsistent-missing-override warnings
2020-10-04 23:09:02 +02:00
Alf Birger Rustad 958f368ce7 indent 2020-10-03 12:25:47 +02:00
Alf Birger Rustad 207d2678fa Fix indent 2020-10-03 12:23:46 +02:00
Alf Birger Rustad 5a8f274c36 Typo and white space 2020-10-03 12:21:05 +02:00
Håkon Hægland c0b493c4ce Fix inconsistent-missing-override warnings 2020-10-03 10:43:09 +02:00
Alf Birger Rustad 3204b55a35 Forgot two 2020-10-02 15:20:23 +02:00
Alf Birger Rustad 885c182b7e Added one more decimal for hundreds of a second. 2020-10-02 15:13:41 +02:00
Tor Harald Sandve 165fa96250 Merge pull request #2824 from hakonhagland/gas_lift3
Implements support for gas lift optimization.
2020-10-02 14:48:27 +02:00
Alf Birger Rustad 3832be4f28 Typo 2020-10-02 14:27:51 +02:00
Alf Birger Rustad a25868dc52 Untabify and add three missing parantheses 2020-10-02 14:26:09 +02:00
Alf Birger Rustad 9e89883aec Allow more digits in simulation time 2020-10-02 14:18:06 +02:00
Alf Birger Rustad a081394f32 Fixed alignement 2020-10-02 14:06:25 +02:00
Kai Bao ed89f25d1b providing the aquifer data for summary output 2020-10-02 13:13:20 +02:00
Alf Birger Rustad 7cebf7fb5a Added space 2020-10-02 12:48:35 +02:00
Alf Birger Rustad e68db6dbda Converted to fmt formatting 2020-10-02 12:46:45 +02:00
Håkon Hægland a5ac74082a Avoid unused variable warning.
The control_mode is unused if not build in debug mode since the assertion
will be skipped.
2020-10-02 11:17:48 +02:00
Alf Birger Rustad 845eb17d28 Formatted seconds and percent in final report. 2020-10-02 09:31:49 +02:00
Alf Birger Rustad d36069c759 Remove confusing progress message. 2020-10-02 09:04:26 +02:00
Alf Birger Rustad 8ecfa1b5db Fix the warning message for tracer model. 2020-10-02 08:56:49 +02:00
Kai Bao 49eb111225 adapting to the interface change of SummaryConfig 2020-10-01 23:32:21 +02:00
Alf Birger Rustad 90b2e8b8ef Compacted time step report 2020-10-01 22:42:20 +02:00
Markus Blatt ec884183a5 Merge pull request #2828 from blattms/add-mswells
[opencl] deletes assignment operator of WellContributionsOCLContainer
2020-10-01 22:35:09 +02:00
Markus Blatt e8c030be17 Merge pull request #2821 from ducbueno/add-mswells
Reintroduced multisegment wells to OpenCL backend
2020-10-01 21:52:25 +02:00
Håkon Hægland 52f6f819ee Simplified using fmt::format()
Simplified debug output formatting by using fmt::format(). Also switched
off glift debug output by default.
2020-10-01 18:40:05 +02:00
Markus Blatt 1109aeecfc Merge pull request #2825 from blattms/dune-2.7-fixes
Fixes compilation with DUNE 2.7
2020-10-01 16:30:18 +02:00
Markus Blatt 903cde5568 Merge pull request #2820 from atgeirr/serial-partitioning
Add command line parameter --serial-partitioning.
2020-10-01 16:09:49 +02:00
Markus Blatt 684b58564c use auto in for-loop as at other occasions. 2020-10-01 15:56:50 +02:00
Markus Blatt f306f78737 Delete assignment operator of WellContributionsOCLContainer, too 2020-10-01 15:55:57 +02:00
Jose Eduardo Bueno fbbb21d482 Removed smart pointers; + delete for copy constr 2020-10-01 10:27:34 -03:00
Arne Morten Kvarving 7ffceeba57 fixed: make some indices constexpr
also use the bool conditions for conditional deref'ing with the indices.
this helps avoid maybe uninitialized warnings with gcc
2020-10-01 11:46:31 +02:00
Atgeirr Flø Rasmussen 30cab9dbe6 Merge pull request #2819 from totto82/rocktab
Add support for ROCKTAB
2020-10-01 09:32:31 +02:00
Jose Eduardo Bueno 89cefd8d95 Fixed seg fault when there are only mswells 2020-09-30 18:34:50 -03:00
Jose Eduardo Bueno 7aad035bcf Added smart pointers 2020-09-30 17:31:35 -03:00
Markus Blatt 6e1f729e8d Work around MPIGuard which is broken in DUNE 2.7.0
Otherwise compilation aborts with:

flow_ebos_gasoil.cpp:(.text+0xa5d0): multiple definition of `Dune::GuardCommunicator::create(ompi_communicator_t* const&)';
2020-09-30 20:34:36 +02:00
Markus Blatt d30f6d272b [gpu] Support UMFPack with DUNE 2.7
The index type changed from int to long int with 2.7.
2020-09-30 20:10:21 +02:00