Commit Graph

685 Commits

Author SHA1 Message Date
Arne Morten Kvarving
0bedc4db32 changed: move the VtkBlackoilModule parameters to Opm::Parameters 2024-07-30 13:12:25 +02:00
Arne Morten Kvarving
8f536c74b4 changed: move the VtkWritePhasePresence parameter to Opm::Parameters 2024-07-30 13:12:25 +02:00
Arne Morten Kvarving
4d8b6afa1d changed: move the VtkDiffusionModule parameters to Opm::Parameters 2024-07-30 13:12:25 +02:00
Arne Morten Kvarving
74fd7667ff changed: move the VtkDiscreteFractureModule parameters to Opm::Parameters 2024-07-30 13:12:25 +02:00
Arne Morten Kvarving
2400cf03ce changed: move the VtkMultiPhaseModule parameters to Opm::Parameters 2024-07-30 13:12:23 +02:00
Arne Morten Kvarving
218960a71d changed: move the VtkPTFlashModule parameters to Opm::Parameters 2024-07-30 13:11:14 +02:00
Arne Morten Kvarving
09ac67b736 changed: move the VTKEnergyModule parameters to Opm::Parameters 2024-07-30 13:11:14 +02:00
Atgeirr Flø Rasmussen
55608d9407 Merge pull request #908 from jakobtorben/initialize_water_saturation_for_RSW
initialize water saturation for gas dissolved in water
2024-07-19 09:22:41 +02:00
Lisa Julia Nebel
4d0179cffc Implement a more polling-based interface for the tasklets failure mechanism 2024-07-12 15:12:41 +02:00
Lisa Julia Nebel
92a8ef1c4b Add an atomic flag to TaskletRunner
This flag is shared between the threads, if any thread fails, this is set and before the new threads get dispatched or run, this flag is checked.
In case it is set, the program aborts.
2024-07-08 20:58:02 +02:00
jakobtorben
5eac0880a9 initialize water saturation for gas dissolved in water 2024-07-05 10:23:13 +02:00
Arne Morten Kvarving
b4db328670 cosmetics 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
ef55cf2489 changed: move the GridFile parameter to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
ff46b91ff0 changed: move the Cells(X|Y|Z) parameters to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
fdf0179c5a changed: move the DomainSize(X|Y|Z) parameters to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
6b11559bf4 changed: move the PredeterminedTimeStepsFile parameter to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
48d2672402 changed: move the RestartTime parameter to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
65fa0fae9e changed: move the InitialTimeStepSize parameter to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
7101b68989 changed: move the EndTime parameter to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
78cd842193 changed: move the PrintParameters parameter to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
fda381c349 changed: move the PrintProperties parameter to Opm::Parameters 2024-07-01 17:51:01 +02:00
Arne Morten Kvarving
e28284b68a changed: move the NewtonMaxIterations parameter to Opm::Parameters 2024-07-01 15:40:56 +02:00
Arne Morten Kvarving
7a4a91c3bf changed: move the NewtonTargetIterations parameter to Opm::Parameters 2024-07-01 15:40:56 +02:00
Arne Morten Kvarving
526aac8865 changed: move the NewtonMaxError parameter to Opm::Parameters 2024-07-01 15:40:56 +02:00
Arne Morten Kvarving
2a133b615e changed: move the NewtonTolerance parameter to Opm::Parameters 2024-07-01 15:40:56 +02:00
Arne Morten Kvarving
c54fb7816f changed: move the NewtonWriteConvergence parameter to Opm::Parameters 2024-07-01 14:13:34 +02:00
Arne Morten Kvarving
a39ccfd4d3 changed: move the NewtonVerbose parameter to Opm::Parameters 2024-07-01 14:13:34 +02:00
Arne Morten Kvarving
3730ce659e fvbaseproperties.hh: put setting of defaults values in separate section
increases overview
2024-07-01 10:13:03 +02:00
Arne Morten Kvarving
59a246e178 changed: move setting of default vanguard to basicproperties.hh
use forwarding to avoid including dgfvanguard.hh unless it is actually
used
2024-07-01 10:13:03 +02:00
Arne Morten Kvarving
cea13e4b96 changed: move the ParameterFile parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
4cce7022bb changed: move the GridGlobalRefinements parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
b38a991b05 changed: move the EnableThermodynamicHints parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
67bb6717f3 changed: move the EnableStorageCache parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
e3222a6dd6 changed: move the EnableIntensiveQuantitiesCache parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
f77c12bce9 changed: move the ContinueOnConvergenceError parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
3f1e2eb73c changed: move the MaxTimeStepDivisions parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
b7cf4b8132 changed: move the MinTimeStepSize parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
eaa75856c6 changed: move the MaxTimeStepSize parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
d1f3411a66 changed: move the EnableAsyncVtkOutput parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
db9ac62d9d changed: move the EnableVtkOutput parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
da2b47b459 changed: move the OutputDir parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
95841aaae2 changed: move the EnableGridAdaptation parameter to Opm::Parameters 2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
7e304296a5 changed: start splitting compile time properties from runtime parameters
working towards putting the latter in the Opm::Parameters namespace.
start by moving the ThreadsPerProcess parameter
2024-07-01 09:46:45 +02:00
Arne Morten Kvarving
ca21f087b5 fixed: don't use a EnableVtkOutput parameters as a property
query it as a parameter should be queried instead
2024-06-28 13:19:43 +02:00
Atgeirr Flø Rasmussen
8699cec954 Avoid call to FaceDir::FromIntersectionIndex() in hot path.
Call is expensive, might also be good to improve the function in opm-common. (FaceDir.cpp)
2024-04-26 16:43:50 +02:00
Arne Morten Kvarving
ac909fefc4 replace iterators with range based loops 2024-04-15 11:38:32 +02:00
Arne Morten Kvarving
fee52d410a ParameterSystem: drop unnecessary Param struct
move code to the appropriate template functions instead
2024-04-15 11:38:32 +02:00
Arne Morten Kvarving
43cbc059bd remove Param::check_
there is no way to inconsistently access parameters any more
so this sanity check is unnecessary
2024-04-15 11:19:12 +02:00
Arne Morten Kvarving
b02eb95477 Parameters::isSet: pass parameter struct instead of stringified 2024-04-15 10:23:39 +02:00
Timo Koch
cd92d15f05 [fix] Fix missing include dune/common/version.hh 2024-04-10 11:53:21 +02:00
Arne Morten Kvarving
078b0e8679 remove macro EWOMS_GET_PARAM 2024-04-05 14:54:53 +02:00
Arne Morten Kvarving
4d2486196f remove macro EWOMS_GET_PARAM_ 2024-04-05 14:54:53 +02:00
Arne Morten Kvarving
fe06454112 pass property struct to Parameters::get
use this to obtain default value and parameter name
2024-04-05 14:54:53 +02:00
Arne Morten Kvarving
72322ec6ff Parameter::get: remove unused overload 2024-04-05 14:01:44 +02:00
Arne Morten Kvarving
5dea27c960 remove unused propName param in Parameters::get
it is always the same as paramName
2024-04-05 14:01:44 +02:00
Arne Morten Kvarving
04273d31c3 Parameters::hideParam
pass property struct instead of name of stringified parameter.
2024-04-05 12:55:57 +02:00
Bård Skaflestad
bdb93b6e62 Merge pull request #890 from akva2/remove_ewoms_register_param_macro
Remove ewoms register param macro
2024-04-05 12:42:27 +02:00
Arne Morten Kvarving
48fa0f3c59 drop macro EWOMS_REGISTER_PARAM 2024-04-05 10:05:30 +02:00
Arne Morten Kvarving
22a5aab10e Parameters::registerParam: grab name from struct
optionally allow a member to override
2024-04-05 10:03:36 +02:00
Arne Morten Kvarving
069161bd84 Parameters::registerParam: pass Property struct and use parameter type from its definition 2024-04-05 10:03:36 +02:00
Arne Morten Kvarving
6103383c1a fixed: inconsistent parameter setups
registered as int and obtained as unsigned, or registered
as Scalar and obtained as int
2024-04-04 14:34:37 +02:00
Arne Morten Kvarving
8b02ba2efc Parameters::registerParam: remove propertyName
it is always the same as paramName
2024-04-04 12:51:07 +02:00
Arne Morten Kvarving
b3090888b5 remove EWOMS_HIDE_PARAM macro
it adds no simplicity and only obfuscates
2024-04-04 08:17:16 +02:00
Arne Morten Kvarving
f22f51a833 Parameters::hideParam: remove unused parameter 2024-04-04 08:17:16 +02:00
Arne Morten Kvarving
399e39b31b remove EWOMS_GET_PARAM_LISTS macro
it adds no simplicity and only obfuscates
2024-04-03 22:35:40 +02:00
Bård Skaflestad
a2ff5e98ee Merge pull request #885 from akva2/remove_ewoms_param_is_set_macro
remove macro EWOMS_PARAM_IS_SET macro
2024-04-03 21:46:25 +02:00
Arne Morten Kvarving
4f6bc9280d remove macro EWOMS_PARAM_IS_SET macro
it simplifies nothing, only obscures.
remove unused different propTagName and use paramName.
2024-04-03 19:54:10 +02:00
Arne Morten Kvarving
783eaa2882 remove EWOMS_END_PARAM_REGISTRATION macro
it adds no simplicity and only obfuscates
2024-04-03 16:23:21 +02:00
Arne Morten Kvarving
0da838faa3 remove unused macro EWOMS_RESET_PARAMS_ 2024-04-03 13:39:46 +02:00
Arne Morten Kvarving
967738ee91 use OPM, not EWOMS in header guard 2024-04-03 13:39:46 +02:00
Bård Skaflestad
6fd995caab Merge pull request #882 from akva2/remove_propsystem_macros
remove last remnants of property system macros
2024-03-22 13:09:38 +01:00
Arne Morten Kvarving
0d9312b5ee remove last remnants of property system macros
these have been deactivated for years
2024-03-22 12:11:55 +01:00
Kai Bao
1898a1681b changing including guard name for two diffusionmodule
they used to use the same EWOMS_DIFFUSION_MODULE_HH
2024-03-21 15:11:42 +01:00
Arne Morten Kvarving
99ac834401 fixed: initialize meaning variables
in particular the solventMeaning can lead to
out-of-bounds dereferences in updatePrimaryVariables
2024-03-11 14:40:22 +01:00
Kai Bao
6f9ab6189f Merge pull request #875 from akva2/adjust_outputmodule
adjust to output module accessor change
2024-03-05 23:31:34 +01:00
Bård Skaflestad
2b0d9a7d55 Tag Certain Parameters As Maybe-Unused
These parameters get referenced only in certain configurations.
2024-03-01 12:03:11 +01:00
Tor Harald Sandve
e6c8eedeb8 Fix Flows/Flores for NNCs 2024-02-12 15:57:50 +01:00
Arne Morten Kvarving
c76c3b8fc6 adjust to output module accessor change 2024-02-12 12:05:33 +01:00
Atgeirr Flø Rasmussen
edbe1a113a Merge pull request #873 from blattms/nnc-fix-flows-flores
[bugfix] Do not try to save FLOWS or FLOWRES values for NNCs.
2024-02-07 11:50:40 +01:00
Markus Blatt
57da17b591 [bugfix] Do not try to save FLOWS or FLOWRES values for NNCs.
If we would try that then we would index vectors with index -1 and
possibly overwriting other system information. This was the case for
some models resulting in cryptic errror " corrupted size vs. prev_size"

Now we simply do nothing for NNCs.
2024-02-06 16:06:11 +01:00
Tor Harald Sandve
d0951e83ff Merge pull request #869 from totto82/vapwatdiff
Enables diffusion of water in gas phase
2024-02-06 14:57:31 +01:00
Arne Morten Kvarving
feec519be8 add missing include 2024-02-06 10:40:35 +01:00
Tor Harald Sandve
2d697eb240 Enables diffusion for vapporized water 2024-02-05 09:09:57 +01:00
Tor Harald Sandve
4c8d6b5a22 Merge pull request #868 from totto82/massFractionDiffusion
Add mass fraction diffusion coefficients
2024-02-05 08:48:40 +01:00
Tor Harald Sandve
521de7a6e5 Add mass fraction diffusion coeficients 2024-02-02 16:02:24 +01:00
Tor Harald Sandve
fe1a488e77 Only output warning if dispersion is activated 2024-02-01 09:28:33 +01:00
Tor Harald Sandve
d5d7ad2d20 Merge pull request #866 from totto82/fixSolventRs
BUGFIX allow for solvent flux when disgasw
2024-01-26 12:08:08 +01:00
Tor Harald Sandve
14786bcba5 BUGFIX allow for solvent flux when disgasw 2024-01-26 10:35:05 +01:00
David Landa Marban
e513e3deb6 Thermal BC for spe11bc 2024-01-26 09:08:16 +01:00
Atgeirr Flø Rasmussen
ec8f84429e Merge pull request #859 from totto82/nodispgas
ignore dispersion in gas phase
2024-01-23 09:25:33 +01:00
Atgeirr Flø Rasmussen
073fe7594a Fix compile errors for non-blackoil models.
Also fix minor nitpicks.
2024-01-19 09:08:17 +01:00
hnil
ac2556895f fixed 2024-01-18 18:50:43 +01:00
hnil
fa37773008 - based on earlier pullrequest which is outdated reintroduced pressure scaling for reservoir
- the missing scaling is for RS/RV
2024-01-18 18:50:15 +01:00
Kai Bao
aad3f10f13 adapting to std::string_view
for componentName and phaseName
2024-01-17 12:10:03 +01:00
Kai Bao
75ced1df73 Merge pull request #863 from totto82/fixThermalAqu
avoid divition by zero for case without conductivity
2024-01-16 22:59:44 +01:00
Tor Harald Sandve
e956bfb029 Merge pull request #862 from hnil/add_maxmin_pressure
added max and minpressure
2024-01-16 15:35:21 +01:00
Tor Harald Sandve
ef198675f1 avoid divition by zero for case without conductivity 2024-01-16 15:34:09 +01:00
David Landa Marban
30ded37687 Support for dynamic capillary pressure 2024-01-12 18:29:06 +01:00
Tor Harald Sandve
b199d07531 ignore dispersion in gas phase 2024-01-12 08:43:33 +01:00
hnil
3c676f8f99 added max and minpressure 2024-01-11 11:51:56 +01:00
Tor Harald Sandve
15c91d88c6 use arithmetic averaged compaction transmissibility multipliers 2024-01-11 09:53:08 +01:00
Tor Harald Sandve
cad0b92633 Support water + gas + solvent + miscible 2023-12-22 09:44:29 +01:00
Tor Harald Sandve
5c2b577854 Add H2SOL and CO2SOL model. That allows for dissolution of solvent in water 2023-12-21 12:37:23 +01:00
Tor Harald Sandve
f6b5e27e52 factor out flux output 2023-12-13 11:00:23 +01:00
Tor Harald Sandve
415b019cf9 Add boundary flux output for flows 2023-12-05 09:24:19 +01:00
Tor Harald Sandve
7fd3e5b327 Merge pull request #833 from totto82/fixbcprop_none
fix issue when BCPROP is not set initially
2023-11-22 13:40:28 +01:00
Kai Bao
55b8aa7ceb updating based on review comments. 2023-11-22 10:25:28 +01:00
Kai Bao
76899d3751 using EWOMS_GET_PARAM for the PTFlash related run-time arguments 2023-11-21 15:52:56 +01:00
Kai Bao
9f0fb32713 various cleaning up and refactoring for co2 ptflash simulation 2023-11-21 15:52:56 +01:00
Kai Bao
df5ee732fa not dropping derivative for flux term for flashlocalresidual.hh
it contains the derivative of the pressure from the downstream cell.
2023-11-21 15:52:56 +01:00
Trine Mykkeltvedt
83cb5670b7 a simple 1D test demonstrating the usage of the PTFlash compostional modeling 2023-11-21 15:52:56 +01:00
Bård Skaflestad
5398a6977b Remove Closing Brace Semicolon
We don't need these on functions.
2023-11-20 16:56:56 +01:00
David Landa Marban
0293b39ad4 Support for mechanical dispersion 2023-11-16 16:52:55 +01:00
Tor Harald Sandve
66781e52fc Merge pull request #849 from daavid00/renamingToEnableVapwat
Renaming enableEvaporation to enableVapwat
2023-11-13 15:01:27 +01:00
Tor Harald Sandve
72de9d3a9b fix issue when BCPROP is not set initially 2023-11-13 10:38:34 +01:00
Markus Blatt
1e8b51f118 Avoid assert and rely on error handler doing the correct thing.
Checking int return types of MPI functions is inefficient. The default
error handler will abort the problem. If somebody changes that, then
they should know what they are doing.
2023-11-08 16:48:40 +01:00
David Landa Marban
c69f7f2c99 Renaming enableEvaporation to enableVapwat 2023-11-07 18:35:08 +01:00
Markus Blatt
6d70d090a8 [fix] Use return code for error detection (not uninitialized MPI_Status::ERROR
According to MPI standard the ERROR field of MPI_Status might not be initialized
unless for operations that return multiple statuses, see  Section 3.7.5
of the standard. In older OpenMPI versions (<=4.0.x) we were lucky
that ERROR was initialized to 0 always. This is not the case for 4.1.y
at least. See https://github.com/open-mpi/ompi/issues/12049.

Therefore we use the retun code to determine whether there was an
error. Note that the default error handler usually is to abort the
application if errors occur. In that case the error code will always
return success.
2023-11-07 09:44:17 +01:00
David Landa Marban
d6f39954c8 Mult well trans due to perm reduction in salt prec 2023-10-26 13:43:32 +02:00
Atgeirr Flø Rasmussen
6cece6bc49 Merge pull request #841 from totto82/fixBCFree
Fix BC Free for 2p problems
2023-10-17 14:16:48 +02:00
Tor Harald Sandve
7546716a48 Fix BC Free for 2p problems 2023-10-17 12:28:48 +02:00
Arne Morten Kvarving
4b156dd124 Merge pull request #839 from blattms/missing-header
Included missing header causing compile errors with gcc-13
2023-10-13 08:25:30 +02:00
Markus Blatt
2deab0cc49 Included missing header causing compile errors with gcc-13 2023-10-12 22:16:53 +02:00
David Landa Marban
d4bb923b7a Fix to write VTKS when THERMAL is on deck 2023-10-09 17:05:32 +02:00
Kai Bao
ca35fd963f removing flashproperties.hh from multiple files
it does not looks like it is used.
2023-10-09 12:49:06 +02:00
Kai Bao
b526025b1a removing flashintensivequantities.hh from flashratevector.hh 2023-10-09 09:05:08 +02:00
Kai Bao
361f87afe4 removing NCPFlash header file in flashratevector
it does not look like used.
2023-10-03 16:23:02 +02:00
Tor Harald Sandve
0719601e2b Use temperature from depth in primaryvariable switching 2023-09-18 12:34:52 +02:00
Vegard Kippe
06cba05a51 Store flows if any of the vectors BFLOWI|J|K are requested 2023-09-13 09:20:07 +02:00
Atgeirr Flø Rasmussen
42c399d6ff Merge pull request #826 from akva2/janitoring
anonymize unused parameters
2023-09-05 08:54:19 +02:00
Arne Morten Kvarving
b0ecbf58de anonymize unused parameters 2023-09-04 14:34:30 +02:00
Kai Bao
87805ba3ec removing compilation warnings and some cleaning up 2023-09-01 10:42:43 +02:00
hnil
7acecc7e57 modification to add tpfa diffusion
fixed tpfa for diffusion module

fixed type error
2023-08-31 15:14:07 +02:00
Kai Bao
7ec77ada7e Merge pull request #822 from hnil/tpfa_temp
TPFA version for energy
2023-08-31 11:17:23 +02:00
Tor Harald Sandve
63764d715c Merge pull request #816 from totto82/maximum_water_sat
add parameter to set maximum water saturation. Default is 1.0
2023-08-30 12:17:24 +02:00
Kai Bao
2813195e15 reusing ResidualNBInfo class in blackoillocalresidualtpfa
to ResidualNBInfo class in tpfalinearizer.
2023-08-30 10:45:12 +02:00
Tor Harald Sandve
da06e423d5 add parameter to set threshold for only water cells. Default is 1.0 2023-08-30 08:38:22 +02:00
hnil
406ebf7cff - Modification to include thermal in tpfalinearizer
- Some assosiated utilites for evaluation properties on globalIndex
2023-08-29 15:58:48 +02:00
Atgeirr Flø Rasmussen
9b55bd57e7 Avoid collective operations in single-domain calls. 2023-08-25 12:25:30 +02:00
Tor Harald Sandve
60c65ec661 add parameter to set maximum water saturation. Default is 1.0 2023-08-17 09:02:16 +02:00
Bård Skaflestad
72e1bfb749 Merge pull request #820 from blattms/try-to-detect-more-paralel-exceptions
Try to detect more exceptions during parallel simulator setup.
2023-08-11 15:18:11 +02:00
Markus Blatt
79dfb6b2a6 Try to detect more exception during parallel simulator setup.
We have experienced some deadlocks lately because of programming
errors. This change will not result in a clean exit for those
but rather an abort by MPI because of non-matching communications.

Also we cannot forsee whether people will add more exceptions in
those parts that were not protected. We better play it safe here.
2023-08-11 14:08:52 +02:00
hnil
37b87aedb1 move the dynamic refinement part related to dune fem to separate class
introduced base discretization in tagsystem to be able to change between dunefem adaptation or not
2023-08-10 15:12:12 +02:00
hnil
7e1a1b27a2 -- added missing include 2023-08-08 11:12:46 +02:00
Atgeirr Flø Rasmussen
ecfb186c38 Merge pull request #799 from hnil/geomech
added enableMech
2023-07-26 19:26:17 +02:00
Arne Morten Kvarving
9eb80228a6 add missing include 2023-07-03 13:47:26 +02:00
Tor Harald Sandve
466bdafabf support BC in schedule 2023-06-28 14:10:09 +02:00
Atgeirr Flø Rasmussen
8c79af321a Fix OPENMP ifdefs. 2023-06-16 08:46:18 +02:00
Markus Blatt
55fdc62ea7 ThreadManager: Allow querying number of threads from OpenMP in init.
We actually do set the number of OpenMP threads based on
OMP_NUM_THREADS or command line option ThreadsPerProcess for OpenMP already
in opm-simulators and these settings should just be used here, too. Hence
the new flag for skipping the command line parameter and use the
number of threads that OpenMP has available.

Querying it here results in different behavior as for FlowMainEbos.hpp:
In opm-simulators variable OMP_NUM_THREADS takes precedence over the
command line parameter, but here it would only be used if the command
line option was not used at all.
2023-06-14 11:24:19 +02:00
Atgeirr Flø Rasmussen
e7f3a7cdea Add linearization support for local solves.
This is intended to be used for nonlinear domain decomposition methods.
2023-06-08 09:24:01 +02:00