Commit Graph
16996 Commits
Author SHA1 Message Date
Bård Skaflestad 2ab40522ea Merge pull request #5068 from tskille/rptsol
PRT file updates
2024-01-04 00:22:41 +01:00
Torbjørn Skille 72892f0c4b PRT file updates
* Arrays genarated from RPTSOL + FIP is now strictly following Eclipse format
* Adding reservoir volume array also for custom FIP regions
2024-01-03 21:47:54 +01:00
Tor Harald Sandve 3856421a88 Merge pull request #5086 from akva2/fix_solvent_regression
fixed: setting solvent values should be conditional on enableSolvent
2024-01-03 09:09:33 +01:00
Markus Blatt adbe894c09 Merge pull request #5084 from akva2/janitoring
Some janitoring
2024-01-02 12:29:46 +01:00
Arne Morten Kvarving acc31ea695 fixed: obtaining solvent values should be conditional on enableSolvent
regressed in f508f3d4e8
2024-01-02 12:04:07 +01:00
Arne Morten Kvarving 165b57c66a Aquifer***: clean up includes 2024-01-02 10:39:59 +01:00
Arne Morten Kvarving 6f4ecd13d8 AdaptiveTimeSteppingEbos: remove unnecessary ScheduleState.hpp include 2024-01-02 10:18:36 +01:00
Atgeirr Flø Rasmussen bf55fcfd93 Merge pull request #5038 from totto82/addBondaryFluxOutput
Add output of FLOWS- and FLORES-
2023-12-21 15:46:50 +01:00
Tor Harald Sandve 04770275d2 Merge pull request #4991 from totto82/h2co2sol
add output of dissolved solvent rswsol
2023-12-21 14:55:02 +01:00
Tor Harald Sandve f508f3d4e8 add output of dissolved solvent rswsol 2023-12-21 10:48:58 +01:00
Bård Skaflestad 98421e31e7 Merge pull request #5043 from totto82/fixParallelOutput
Only output interior cells
2023-12-21 09:41:18 +01:00
Tor Harald Sandve 87361b8f8d Throw in output if OwnerCellsFirst = False 2023-12-20 15:36:36 +01:00
Tor Harald Sandve 6eeb5b4187 Only output interior cells 2023-12-20 13:00:46 +01:00
Markus Blatt 78e8ceccba Merge pull request #5078 from aritorto/throwMULTZ
Throw for LGRs combine with TRANX/Y/Z
2023-12-20 12:03:11 +01:00
Bård Skaflestad 52655b6d31 Merge pull request #5080 from akva2/geomech_janitor
remove unused variables
2023-12-20 11:25:42 +01:00
Arne Morten Kvarving fb725f89ad remove unused variables
fix a typo and add spaces in comments
2023-12-19 23:26:08 +01:00
Antonella Ritorto af257740c8 Throw for LGRs combine with TRANX/Y/Z 2023-12-19 20:31:42 +01:00
Markus Blatt 67594ed051 Merge pull request #5077 from aritorto/throwMULTZlgrs
Throw for LGR combined with MULTZ keyword
2023-12-19 17:59:35 +01:00
Bård Skaflestad b30bfb5b1b Merge pull request #5073 from atgeirr/fix-output-dir
Avoid modifying outputDir, leave empty if defaulted.
2023-12-19 16:50:27 +01:00
Arne Morten Kvarving de9c3ddfda added: test for outputdir 2023-12-19 15:21:58 +01:00
Arne Morten Kvarving c95cd5b147 added: bool param to flag that Main.hpp should not initialize/finalize MPI
needed for tests
2023-12-19 15:12:44 +01:00
Atgeirr Flø Rasmussen 093b346426 Avoid modifying outputDir, leave empty if defaulted.
Handle this case for Damaris, which needs to be told the output dir
before this is available from the IOConfig.
2023-12-19 15:12:44 +01:00
Antonella Ritorto 76b51aca76 Throw applyAllZMultipliers_ for LGRs 2023-12-19 13:17:54 +01:00
Bård Skaflestad 8837528c9e Merge pull request #5075 from steink/fix_saturation_pressure_issue
Avoid use of problematic 'saturationPressure'-function
2023-12-19 12:05:04 +01:00
Stein Krogstad e908c95ca2 Avoid call to saturationPressure 2023-12-19 09:54:52 +01:00
Markus Blatt eec2fbaaa1 Merge pull request #5071 from aritorto/assertSameParent
Assert refactored to include same-parent-leaf-cells
2023-12-18 19:36:18 +01:00
Markus Blatt 784131509f Merge pull request #5072 from aritorto/lookupExtractPerm
Lookup origin index for correct extractPermeability_
2023-12-18 19:34:51 +01:00
Markus Blatt 63031246c2 Merge pull request #5074 from aritorto/lookupPoroDisper
Lookup for extractPorosity and extractDispersion_
2023-12-18 16:47:51 +01:00
Antonella Ritorto 6d19c1dd53 Lookup for extractPorosity and extractDispersion_ 2023-12-18 15:47:44 +01:00
Antonella Ritorto 0f39554561 Lookup origin in extractPermeability_ 2023-12-18 15:14:43 +01:00
Antonella Ritorto 1fb708a239 Assert refactored to include same-parent-leaf-cells 2023-12-18 14:28:29 +01:00
Markus Blatt acc08799a4 Merge pull request #5064 from aritorto/lookupAssigner
lookupIdxOnLevelZeroAssigner added
2023-12-18 11:33:56 +01:00
Atgeirr Flø Rasmussen e83c4db6b1 Merge pull request #5067 from atgeirr/fix-var-order
Order variables the same as in constructor init list.
2023-12-15 14:55:38 +01:00
Atgeirr Flø Rasmussen 01b76e2658 Order variables the same as in constructor init list. 2023-12-15 14:23:55 +01:00
Atgeirr Flø Rasmussen 1dbd971710 Merge pull request #4889 from jcbowden/damariswriter-for-sim-fields-v5
Geometric mesh data added for Damaris in-situ visualisation
2023-12-15 10:18:00 +01:00
Antonella Ritorto bba5833332 Move lookupAssigner to remove shadow decl warnings 2023-12-14 20:01:25 +01:00
Josh Bowden 4db49a3785 Reformat using clag-format with default OPM format guide 2023-12-14 17:30:21 +01:00
Antonella Ritorto 1f77b0c199 Shadow declaration Grid(Type) fixed 2023-12-14 16:25:53 +01:00
Antonella Ritorto 0a8e1fa757 lookupIdxOnLevelZeroAssigner added 2023-12-14 16:12:48 +01:00
Josh Bowden 8094504018 Jenkins build error issue fix for unused typedefs 2023-12-14 12:39:18 +01:00
Josh Bowden 55dc80725f Improved in-line help comments; output MPI cell values to HDF5 only when saving mesh to HDF5; removed timing data 2023-12-14 10:27:05 +01:00
Bård Skaflestad fc73a51310 Merge pull request #4873 from vkip/wsegvalv_uda_item4
Allow UDA for WSEGVALV item 4
2023-12-13 21:19:27 +01:00
Bård Skaflestad b42b920b7e Merge pull request #5031 from blattms/print-parallel-info-to-prt
Also print information about parallel run to PRT file.
2023-12-13 18:16:50 +01:00
Josh Bowden e16cd9a3b3 finalise the PR 4889 modifications - added command line option to specifiy the shared memory file name in the <buffer> XML element --damaris-shared-memory-name which will be a randomised string opm-damaris-<random-string> for better multi-simulation behaviour when running more than one simulation on a single node. 2023-12-13 18:14:45 +01:00
Josh Bowden 757a96941a final review changes from PR 4889 and added extra command line argument to output mesh data --damaris-save-mesh-to-hdf 2023-12-13 18:14:37 +01:00
Josh Bowden 9309f5a1bd overhaul of GridDataOutput class to accept a vector type so that raw pointers are not overrun, this has lead to finding a good way to get the size of the data area that is alloacted by the DamarisVar wrapper class for damaris_alloc() 2023-12-13 18:14:06 +01:00
Josh Bowden 54d6db6f35 Update 1 for code after code review of PR 4889 2023-12-13 18:13:55 +01:00
Markus Blatt 4f619f8f38 Also print information about parallel run to PRT file.
Up to now this information is only output to standard out.
To help with debugging and replicating (e.g. in case of crashes)
without saved standard putput, we now also print the imformation about
MPI processes and OMP threads to the PRT file.
2023-12-13 16:42:02 +01:00
Tor Harald Sandve b9ecc2ac8f Merge pull request #5058 from totto82/fixInitTemp
BUGFIX. Use given temperature in the density calculations in the initialisation
2023-12-13 15:49:32 +01:00
Vegard Kippe fcc3a19a42 Explicit cast to avoid narrowing warning. 2023-12-13 14:34:36 +01:00