From 799585f9d73fe0db274dc91d8e898998f7e6ff5f Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 5 Sep 2019 16:21:10 +0200 Subject: [PATCH] changed: namespace Ewoms -> namespace Opm --- examples/co2injection_flash_ecfv.cpp | 6 +++--- examples/co2injection_flash_ni_ecfv.cpp | 6 +++--- examples/co2injection_flash_ni_vcfv.cpp | 6 +++--- examples/co2injection_flash_vcfv.cpp | 6 +++--- examples/co2injection_immiscible_ecfv.cpp | 2 +- examples/co2injection_immiscible_ni_ecfv.cpp | 2 +- examples/co2injection_immiscible_ni_vcfv.cpp | 2 +- examples/co2injection_immiscible_vcfv.cpp | 2 +- examples/co2injection_ncp_ecfv.cpp | 2 +- examples/co2injection_ncp_ni_ecfv.cpp | 2 +- examples/co2injection_ncp_ni_vcfv.cpp | 2 +- examples/co2injection_ncp_vcfv.cpp | 2 +- examples/co2injection_pvs_ecfv.cpp | 2 +- examples/co2injection_pvs_ni_ecfv.cpp | 2 +- examples/co2injection_pvs_ni_vcfv.cpp | 2 +- examples/co2injection_pvs_vcfv.cpp | 2 +- examples/cuvette_pvs.cpp | 2 +- examples/diffusion_flash.cpp | 2 +- examples/diffusion_ncp.cpp | 2 +- examples/diffusion_pvs.cpp | 2 +- examples/finger_immiscible_ecfv.cpp | 2 +- examples/finger_immiscible_vcfv.cpp | 2 +- examples/fracture_discretefracture.cpp | 2 +- examples/groundwater_immiscible.cpp | 2 +- examples/infiltration_pvs.cpp | 2 +- examples/lens_immiscible_ecfv_ad.cpp | 2 +- examples/lens_immiscible_ecfv_ad_23.cpp | 2 +- examples/lens_immiscible_ecfv_ad_cu1.cpp | 2 +- examples/lens_immiscible_ecfv_ad_cu2.cpp | 2 +- examples/lens_immiscible_vcfv_ad.cpp | 2 +- examples/lens_immiscible_vcfv_fd.cpp | 2 +- examples/lens_richards_ecfv.cpp | 2 +- examples/lens_richards_vcfv.cpp | 2 +- examples/obstacle_immiscible.cpp | 2 +- examples/obstacle_ncp.cpp | 2 +- examples/obstacle_pvs.cpp | 2 +- examples/outflow_pvs.cpp | 2 +- examples/powerinjection_darcy_ad.cpp | 4 ++-- examples/powerinjection_darcy_fd.cpp | 4 ++-- examples/powerinjection_forchheimer_ad.cpp | 4 ++-- examples/powerinjection_forchheimer_fd.cpp | 4 ++-- examples/problems/co2injectionflash.hh | 6 +++--- examples/problems/co2injectionproblem.hh | 12 ++++++------ examples/problems/cuvetteproblem.hh | 10 +++++----- examples/problems/diffusionproblem.hh | 12 ++++++------ examples/problems/fingerproblem.hh | 12 ++++++------ examples/problems/fractureproblem.hh | 14 +++++++------- examples/problems/groundwaterproblem.hh | 12 ++++++------ examples/problems/infiltrationproblem.hh | 10 +++++----- examples/problems/lensproblem.hh | 12 ++++++------ examples/problems/obstacleproblem.hh | 10 +++++----- examples/problems/outflowproblem.hh | 10 +++++----- examples/problems/powerinjectionproblem.hh | 14 +++++++------- examples/problems/reservoirproblem.hh | 12 ++++++------ examples/problems/richardslensproblem.hh | 12 ++++++------ examples/problems/waterairproblem.hh | 16 ++++++++-------- examples/reservoir_blackoil_ecfv.cpp | 2 +- examples/reservoir_blackoil_vcfv.cpp | 2 +- examples/reservoir_ncp_ecfv.cpp | 2 +- examples/reservoir_ncp_vcfv.cpp | 2 +- examples/tutorial1.cpp | 2 +- examples/tutorial1problem.hh | 12 ++++++------ examples/waterair_pvs_ni.cpp | 2 +- tests/models/test_propertysystem.cpp | 2 +- tests/models/test_quadrature.cpp | 8 ++++---- tests/models/test_tasklets.cpp | 6 +++--- 66 files changed, 160 insertions(+), 160 deletions(-) diff --git a/examples/co2injection_flash_ecfv.cpp b/examples/co2injection_flash_ecfv.cpp index e91528a73..389cbb76b 100644 --- a/examples/co2injection_flash_ecfv.cpp +++ b/examples/co2injection_flash_ecfv.cpp @@ -49,8 +49,8 @@ SET_TAG_PROP(Co2InjectionFlashEcfvProblem, LocalLinearizerSplice, AutoDiffLocalL // use the flash solver adapted to the CO2 injection problem SET_TYPE_PROP( Co2InjectionFlashEcfvProblem, FlashSolver, - Ewoms::Co2InjectionFlash); + Opm::Co2InjectionFlash); // the flash model has serious problems with the numerical // precision. if quadruple precision math is available, we use it, @@ -70,5 +70,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionFlashEcfvProblem) EcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_flash_ni_ecfv.cpp b/examples/co2injection_flash_ni_ecfv.cpp index 1072a9f27..e8f8b3f86 100644 --- a/examples/co2injection_flash_ni_ecfv.cpp +++ b/examples/co2injection_flash_ni_ecfv.cpp @@ -48,8 +48,8 @@ SET_TAG_PROP(Co2InjectionFlashNiEcfvProblem, LocalLinearizerSplice, AutoDiffLoca // use the CO2 injection problem adapted flash solver SET_TYPE_PROP( Co2InjectionFlashNiEcfvProblem, FlashSolver, - Ewoms::Co2InjectionFlash); + Opm::Co2InjectionFlash); // the flash model has serious problems with the numerical // precision. if quadruple precision math is available, we use it, @@ -69,5 +69,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionFlashNiEcfvProblem) EcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_flash_ni_vcfv.cpp b/examples/co2injection_flash_ni_vcfv.cpp index 8a890e2b0..3e628d663 100644 --- a/examples/co2injection_flash_ni_vcfv.cpp +++ b/examples/co2injection_flash_ni_vcfv.cpp @@ -45,8 +45,8 @@ SET_BOOL_PROP(Co2InjectionFlashNiVcfvProblem, EnableEnergy, true); // use the CO2 injection problem adapted flash solver SET_TYPE_PROP( Co2InjectionFlashNiVcfvProblem, FlashSolver, - Ewoms::Co2InjectionFlash); + Opm::Co2InjectionFlash); // the flash model has serious problems with the numerical // precision. if quadruple precision math is available, we use it, @@ -66,5 +66,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionFlashNiVcfvProblem) VcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_flash_vcfv.cpp b/examples/co2injection_flash_vcfv.cpp index b7ac5842d..45545d429 100644 --- a/examples/co2injection_flash_vcfv.cpp +++ b/examples/co2injection_flash_vcfv.cpp @@ -46,8 +46,8 @@ SET_TAG_PROP(Co2InjectionFlashVcfvProblem, SpatialDiscretizationSplice, VcfvDisc // use the flash solver adapted to the CO2 injection problem SET_TYPE_PROP( Co2InjectionFlashVcfvProblem, FlashSolver, - Ewoms::Co2InjectionFlash); + Opm::Co2InjectionFlash); // the flash model has serious problems with the numerical // precision. if quadruple precision math is available, we use it, @@ -67,5 +67,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionFlashVcfvProblem) VcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_immiscible_ecfv.cpp b/examples/co2injection_immiscible_ecfv.cpp index c88eff8d3..9a1c101e8 100644 --- a/examples/co2injection_immiscible_ecfv.cpp +++ b/examples/co2injection_immiscible_ecfv.cpp @@ -50,5 +50,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionImmiscibleEcfvProblem) EcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_immiscible_ni_ecfv.cpp b/examples/co2injection_immiscible_ni_ecfv.cpp index 096c56ca8..26a3a9183 100644 --- a/examples/co2injection_immiscible_ni_ecfv.cpp +++ b/examples/co2injection_immiscible_ni_ecfv.cpp @@ -53,5 +53,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionImmiscibleNiEcfvProblem) EcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_immiscible_ni_vcfv.cpp b/examples/co2injection_immiscible_ni_vcfv.cpp index e60e690e8..4cdfd8283 100644 --- a/examples/co2injection_immiscible_ni_vcfv.cpp +++ b/examples/co2injection_immiscible_ni_vcfv.cpp @@ -49,5 +49,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionImmiscibleNiVcfvProblem) VcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_immiscible_vcfv.cpp b/examples/co2injection_immiscible_vcfv.cpp index 4891fe690..2ad04c1ec 100644 --- a/examples/co2injection_immiscible_vcfv.cpp +++ b/examples/co2injection_immiscible_vcfv.cpp @@ -48,5 +48,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionImmiscibleVcfvProblem) VcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_ncp_ecfv.cpp b/examples/co2injection_ncp_ecfv.cpp index c0c08e358..d1c573c3b 100644 --- a/examples/co2injection_ncp_ecfv.cpp +++ b/examples/co2injection_ncp_ecfv.cpp @@ -43,5 +43,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionNcpEcfvProblem) EcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_ncp_ni_ecfv.cpp b/examples/co2injection_ncp_ni_ecfv.cpp index 1d1f0a64a..a5e4b22a0 100644 --- a/examples/co2injection_ncp_ni_ecfv.cpp +++ b/examples/co2injection_ncp_ni_ecfv.cpp @@ -47,5 +47,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionNcpNiEcfvProblem) EcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_ncp_ni_vcfv.cpp b/examples/co2injection_ncp_ni_vcfv.cpp index c4efffb07..8d02be162 100644 --- a/examples/co2injection_ncp_ni_vcfv.cpp +++ b/examples/co2injection_ncp_ni_vcfv.cpp @@ -44,5 +44,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionNcpNiVcfvProblem) VcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_ncp_vcfv.cpp b/examples/co2injection_ncp_vcfv.cpp index c1d7e7251..9d947f59a 100644 --- a/examples/co2injection_ncp_vcfv.cpp +++ b/examples/co2injection_ncp_vcfv.cpp @@ -44,5 +44,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionNcpVcfvProblem) VcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_pvs_ecfv.cpp b/examples/co2injection_pvs_ecfv.cpp index 743e99ad6..95e8d6dac 100644 --- a/examples/co2injection_pvs_ecfv.cpp +++ b/examples/co2injection_pvs_ecfv.cpp @@ -43,5 +43,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionPvsEcfvProblem) EcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_pvs_ni_ecfv.cpp b/examples/co2injection_pvs_ni_ecfv.cpp index be7c04933..bb29a4f90 100644 --- a/examples/co2injection_pvs_ni_ecfv.cpp +++ b/examples/co2injection_pvs_ni_ecfv.cpp @@ -48,5 +48,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionPvsNiEcfvProblem) EcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_pvs_ni_vcfv.cpp b/examples/co2injection_pvs_ni_vcfv.cpp index 84839023e..fdbd23fb8 100644 --- a/examples/co2injection_pvs_ni_vcfv.cpp +++ b/examples/co2injection_pvs_ni_vcfv.cpp @@ -45,5 +45,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionPvsNiVcfvProblem) VcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/co2injection_pvs_vcfv.cpp b/examples/co2injection_pvs_vcfv.cpp index bcce3a6b3..8959d8b28 100644 --- a/examples/co2injection_pvs_vcfv.cpp +++ b/examples/co2injection_pvs_vcfv.cpp @@ -44,5 +44,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(Co2InjectionPvsVcfvProblem) VcfvProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/cuvette_pvs.cpp b/examples/cuvette_pvs.cpp index be1996744..cdf52ae6a 100644 --- a/examples/cuvette_pvs.cpp +++ b/examples/cuvette_pvs.cpp @@ -40,5 +40,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(CuvetteProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/diffusion_flash.cpp b/examples/diffusion_flash.cpp index d9d0883b4..bdcd158d2 100644 --- a/examples/diffusion_flash.cpp +++ b/examples/diffusion_flash.cpp @@ -40,5 +40,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(DiffusionProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/diffusion_ncp.cpp b/examples/diffusion_ncp.cpp index d8a3364c3..b72fd2657 100644 --- a/examples/diffusion_ncp.cpp +++ b/examples/diffusion_ncp.cpp @@ -40,5 +40,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(DiffusionProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/diffusion_pvs.cpp b/examples/diffusion_pvs.cpp index 7912ec469..f2f310e98 100644 --- a/examples/diffusion_pvs.cpp +++ b/examples/diffusion_pvs.cpp @@ -40,5 +40,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(DiffusionProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/finger_immiscible_ecfv.cpp b/examples/finger_immiscible_ecfv.cpp index 36cb65ed6..d6de1ac8b 100644 --- a/examples/finger_immiscible_ecfv.cpp +++ b/examples/finger_immiscible_ecfv.cpp @@ -42,5 +42,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(FingerProblemEcfv) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/finger_immiscible_vcfv.cpp b/examples/finger_immiscible_vcfv.cpp index 869358ab2..4898c43db 100644 --- a/examples/finger_immiscible_vcfv.cpp +++ b/examples/finger_immiscible_vcfv.cpp @@ -42,5 +42,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(FingerProblemVcfv) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/fracture_discretefracture.cpp b/examples/fracture_discretefracture.cpp index b8c2777ce..34a81868d 100644 --- a/examples/fracture_discretefracture.cpp +++ b/examples/fracture_discretefracture.cpp @@ -33,5 +33,5 @@ int main(int argc, char **argv) { typedef TTAG(FractureProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/groundwater_immiscible.cpp b/examples/groundwater_immiscible.cpp index 2419e7a0d..b9f00aa7e 100644 --- a/examples/groundwater_immiscible.cpp +++ b/examples/groundwater_immiscible.cpp @@ -40,5 +40,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(GroundWaterProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/infiltration_pvs.cpp b/examples/infiltration_pvs.cpp index af4f30d76..7b7e89763 100644 --- a/examples/infiltration_pvs.cpp +++ b/examples/infiltration_pvs.cpp @@ -40,5 +40,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(InfiltrationProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/lens_immiscible_ecfv_ad.cpp b/examples/lens_immiscible_ecfv_ad.cpp index 06aeedad7..3dbc96a57 100644 --- a/examples/lens_immiscible_ecfv_ad.cpp +++ b/examples/lens_immiscible_ecfv_ad.cpp @@ -35,5 +35,5 @@ int main(int argc, char **argv) { typedef TTAG(LensProblemEcfvAd) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/lens_immiscible_ecfv_ad_23.cpp b/examples/lens_immiscible_ecfv_ad_23.cpp index b3b7f89dc..d9266e463 100644 --- a/examples/lens_immiscible_ecfv_ad_23.cpp +++ b/examples/lens_immiscible_ecfv_ad_23.cpp @@ -87,5 +87,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(LensProblemEcfvAd) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/lens_immiscible_ecfv_ad_cu1.cpp b/examples/lens_immiscible_ecfv_ad_cu1.cpp index 6e8f3f5c4..bf1e99341 100644 --- a/examples/lens_immiscible_ecfv_ad_cu1.cpp +++ b/examples/lens_immiscible_ecfv_ad_cu1.cpp @@ -44,5 +44,5 @@ int mainCU1(int argc, char **argv); int mainCU1(int argc, char **argv) { typedef TTAG(LensProblemEcfvAd) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/lens_immiscible_ecfv_ad_cu2.cpp b/examples/lens_immiscible_ecfv_ad_cu2.cpp index 25836eaee..71e9de88b 100644 --- a/examples/lens_immiscible_ecfv_ad_cu2.cpp +++ b/examples/lens_immiscible_ecfv_ad_cu2.cpp @@ -44,5 +44,5 @@ int mainCU2(int argc, char **argv); int mainCU2(int argc, char **argv) { typedef TTAG(LensProblemEcfvAd) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/lens_immiscible_vcfv_ad.cpp b/examples/lens_immiscible_vcfv_ad.cpp index 111282ccf..d51992156 100644 --- a/examples/lens_immiscible_vcfv_ad.cpp +++ b/examples/lens_immiscible_vcfv_ad.cpp @@ -49,5 +49,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(LensProblemVcfvAd) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/lens_immiscible_vcfv_fd.cpp b/examples/lens_immiscible_vcfv_fd.cpp index de6dbb6f2..55f539e00 100644 --- a/examples/lens_immiscible_vcfv_fd.cpp +++ b/examples/lens_immiscible_vcfv_fd.cpp @@ -49,5 +49,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(LensProblemVcfvFd) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/lens_richards_ecfv.cpp b/examples/lens_richards_ecfv.cpp index a50b18ffe..8ad79058d 100644 --- a/examples/lens_richards_ecfv.cpp +++ b/examples/lens_richards_ecfv.cpp @@ -45,5 +45,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(RichardsLensEcfvProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/lens_richards_vcfv.cpp b/examples/lens_richards_vcfv.cpp index 29ed148db..990dff8d0 100644 --- a/examples/lens_richards_vcfv.cpp +++ b/examples/lens_richards_vcfv.cpp @@ -42,5 +42,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(RichardsLensVcfvProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/obstacle_immiscible.cpp b/examples/obstacle_immiscible.cpp index 0705fe37f..a545a8f76 100644 --- a/examples/obstacle_immiscible.cpp +++ b/examples/obstacle_immiscible.cpp @@ -41,5 +41,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(ObstacleProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/obstacle_ncp.cpp b/examples/obstacle_ncp.cpp index 2ff26bad4..0c5f50294 100644 --- a/examples/obstacle_ncp.cpp +++ b/examples/obstacle_ncp.cpp @@ -41,5 +41,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(ObstacleProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/obstacle_pvs.cpp b/examples/obstacle_pvs.cpp index 4ffaa5d53..d35b5a34d 100644 --- a/examples/obstacle_pvs.cpp +++ b/examples/obstacle_pvs.cpp @@ -45,5 +45,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(ObstacleProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/outflow_pvs.cpp b/examples/outflow_pvs.cpp index 9b9aaf6da..4c495b4d1 100644 --- a/examples/outflow_pvs.cpp +++ b/examples/outflow_pvs.cpp @@ -43,5 +43,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(OutflowProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/powerinjection_darcy_ad.cpp b/examples/powerinjection_darcy_ad.cpp index bc7915179..452d62d75 100644 --- a/examples/powerinjection_darcy_ad.cpp +++ b/examples/powerinjection_darcy_ad.cpp @@ -37,7 +37,7 @@ NEW_TYPE_TAG(PowerInjectionDarcyAdProblem, INHERITS_FROM(ImmiscibleTwoPhaseModel, PowerInjectionBaseProblem)); -SET_TYPE_PROP(PowerInjectionDarcyAdProblem, FluxModule, Ewoms::DarcyFluxModule); +SET_TYPE_PROP(PowerInjectionDarcyAdProblem, FluxModule, Opm::DarcyFluxModule); SET_TAG_PROP(PowerInjectionDarcyAdProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer); END_PROPERTIES @@ -45,5 +45,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(PowerInjectionDarcyAdProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/powerinjection_darcy_fd.cpp b/examples/powerinjection_darcy_fd.cpp index fb04c72d1..65cae1c95 100644 --- a/examples/powerinjection_darcy_fd.cpp +++ b/examples/powerinjection_darcy_fd.cpp @@ -37,7 +37,7 @@ NEW_TYPE_TAG(PowerInjectionDarcyFdProblem, INHERITS_FROM(ImmiscibleTwoPhaseModel, PowerInjectionBaseProblem)); -SET_TYPE_PROP(PowerInjectionDarcyFdProblem, FluxModule, Ewoms::DarcyFluxModule); +SET_TYPE_PROP(PowerInjectionDarcyFdProblem, FluxModule, Opm::DarcyFluxModule); SET_TAG_PROP(PowerInjectionDarcyFdProblem, LocalLinearizerSplice, FiniteDifferenceLocalLinearizer); END_PROPERTIES @@ -45,5 +45,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(PowerInjectionDarcyFdProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/powerinjection_forchheimer_ad.cpp b/examples/powerinjection_forchheimer_ad.cpp index 3c5f527e9..6284c548b 100644 --- a/examples/powerinjection_forchheimer_ad.cpp +++ b/examples/powerinjection_forchheimer_ad.cpp @@ -37,7 +37,7 @@ NEW_TYPE_TAG(PowerInjectionForchheimerAdProblem, INHERITS_FROM(ImmiscibleTwoPhaseModel, PowerInjectionBaseProblem)); -SET_TYPE_PROP(PowerInjectionForchheimerAdProblem, FluxModule, Ewoms::ForchheimerFluxModule); +SET_TYPE_PROP(PowerInjectionForchheimerAdProblem, FluxModule, Opm::ForchheimerFluxModule); SET_TAG_PROP(PowerInjectionForchheimerAdProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer); END_PROPERTIES @@ -45,5 +45,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(PowerInjectionForchheimerAdProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/powerinjection_forchheimer_fd.cpp b/examples/powerinjection_forchheimer_fd.cpp index a8d582b07..56d3a5520 100644 --- a/examples/powerinjection_forchheimer_fd.cpp +++ b/examples/powerinjection_forchheimer_fd.cpp @@ -37,7 +37,7 @@ NEW_TYPE_TAG(PowerInjectionForchheimerFdProblem, INHERITS_FROM(ImmiscibleTwoPhaseModel, PowerInjectionBaseProblem)); -SET_TYPE_PROP(PowerInjectionForchheimerFdProblem, FluxModule, Ewoms::ForchheimerFluxModule); +SET_TYPE_PROP(PowerInjectionForchheimerFdProblem, FluxModule, Opm::ForchheimerFluxModule); SET_TAG_PROP(PowerInjectionForchheimerFdProblem, LocalLinearizerSplice, FiniteDifferenceLocalLinearizer); END_PROPERTIES @@ -45,5 +45,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(PowerInjectionForchheimerFdProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/problems/co2injectionflash.hh b/examples/problems/co2injectionflash.hh index 7a9e7da58..04bd81f53 100644 --- a/examples/problems/co2injectionflash.hh +++ b/examples/problems/co2injectionflash.hh @@ -23,14 +23,14 @@ /*! * \file * - * \copydoc Ewoms::Co2InjectionFlash + * \copydoc Opm::Co2InjectionFlash */ #ifndef EWOMS_CO2_INJECTION_FLASH_HH #define EWOMS_CO2_INJECTION_FLASH_HH #include -namespace Ewoms { +namespace Opm { /*! * \brief Flash solver used by the CO2 injection problem. * @@ -61,6 +61,6 @@ public: } }; -} // namespace Ewoms +} // namespace Opm #endif // EWOMS_CO2_INJECTION_FLASH_HH diff --git a/examples/problems/co2injectionproblem.hh b/examples/problems/co2injectionproblem.hh index 1c38dba76..00264db20 100644 --- a/examples/problems/co2injectionproblem.hh +++ b/examples/problems/co2injectionproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::Co2InjectionProblem + * \copydoc Opm::Co2InjectionProblem */ #ifndef EWOMS_CO2_INJECTION_PROBLEM_HH #define EWOMS_CO2_INJECTION_PROBLEM_HH @@ -57,7 +57,7 @@ #include #include -namespace Ewoms { +namespace Opm { //! \cond SKIP_THIS template class Co2InjectionProblem; @@ -89,14 +89,14 @@ SET_TYPE_PROP(Co2InjectionBaseProblem, Grid, Dune::YaspGrid<2>); // Set the problem property SET_TYPE_PROP(Co2InjectionBaseProblem, Problem, - Ewoms::Co2InjectionProblem); + Opm::Co2InjectionProblem); // Set fluid configuration SET_PROP(Co2InjectionBaseProblem, FluidSystem) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; - typedef Ewoms::Co2Injection::CO2Tables CO2Tables; + typedef Opm::Co2Injection::CO2Tables CO2Tables; public: typedef Opm::BrineCO2FluidSystem type; @@ -173,7 +173,7 @@ SET_STRING_PROP(Co2InjectionBaseProblem, GridFile, "data/co2injection.dgf"); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * @@ -649,6 +649,6 @@ private: Scalar pressureLow_, pressureHigh_; Scalar temperatureLow_, temperatureHigh_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/cuvetteproblem.hh b/examples/problems/cuvetteproblem.hh index 481e2c2d9..4e263e4d7 100644 --- a/examples/problems/cuvetteproblem.hh +++ b/examples/problems/cuvetteproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::CuvetteProblem + * \copydoc Opm::CuvetteProblem */ #ifndef EWOMS_CUVETTE_PROBLEM_HH #define EWOMS_CUVETTE_PROBLEM_HH @@ -51,7 +51,7 @@ #include -namespace Ewoms { +namespace Opm { template class CuvetteProblem; } @@ -66,7 +66,7 @@ NEW_TYPE_TAG(CuvetteBaseProblem); SET_TYPE_PROP(CuvetteBaseProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(CuvetteBaseProblem, Problem, Ewoms::CuvetteProblem); +SET_TYPE_PROP(CuvetteBaseProblem, Problem, Opm::CuvetteProblem); // Set the fluid system SET_TYPE_PROP( @@ -123,7 +123,7 @@ SET_STRING_PROP(CuvetteBaseProblem, GridFile, "./data/cuvette_11x4.dgf"); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * @@ -632,6 +632,6 @@ private: const Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/diffusionproblem.hh b/examples/problems/diffusionproblem.hh index 3563baece..4105f287c 100644 --- a/examples/problems/diffusionproblem.hh +++ b/examples/problems/diffusionproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::DiffusionProblem + * \copydoc Opm::DiffusionProblem */ #ifndef EWOMS_POWER_INJECTION_PROBLEM_HH #define EWOMS_POWER_INJECTION_PROBLEM_HH @@ -47,7 +47,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class DiffusionProblem; } @@ -60,10 +60,10 @@ NEW_TYPE_TAG(DiffusionBaseProblem); SET_TYPE_PROP(DiffusionBaseProblem, Grid, Dune::YaspGrid); // set the Vanguard property -SET_TYPE_PROP(DiffusionBaseProblem, Vanguard, Ewoms::CubeGridVanguard); +SET_TYPE_PROP(DiffusionBaseProblem, Vanguard, Opm::CubeGridVanguard); // Set the problem property -SET_TYPE_PROP(DiffusionBaseProblem, Problem, Ewoms::DiffusionProblem); +SET_TYPE_PROP(DiffusionBaseProblem, Problem, Opm::DiffusionProblem); // Set the fluid system SET_PROP(DiffusionBaseProblem, FluidSystem) @@ -117,7 +117,7 @@ SET_SCALAR_PROP(DiffusionBaseProblem, InitialTimeStepSize, 1000); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * \brief 1D problem which is driven by molecular diffusion. @@ -369,6 +369,6 @@ private: Scalar temperature_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/fingerproblem.hh b/examples/problems/fingerproblem.hh index 19e2ff7ca..84b17580c 100644 --- a/examples/problems/fingerproblem.hh +++ b/examples/problems/fingerproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::FingerProblem + * \copydoc Opm::FingerProblem */ #ifndef EWOMS_FINGER_PROBLEM_HH #define EWOMS_FINGER_PROBLEM_HH @@ -56,11 +56,11 @@ #include #include -namespace Ewoms { +namespace Opm { template class FingerProblem; -} // namespace Ewoms +} // namespace Opm BEGIN_PROPERTIES @@ -80,7 +80,7 @@ SET_TYPE_PROP(FingerBaseProblem, NEW_PROP_TAG(InitialWaterSaturation); // Set the problem property -SET_TYPE_PROP(FingerBaseProblem, Problem, Ewoms::FingerProblem); +SET_TYPE_PROP(FingerBaseProblem, Problem, Opm::FingerProblem); // Set the wetting phase SET_PROP(FingerBaseProblem, WettingPhase) @@ -147,7 +147,7 @@ SET_SCALAR_PROP(FingerBaseProblem, InitialTimeStepSize, 10); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems @@ -550,6 +550,6 @@ private: Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/fractureproblem.hh b/examples/problems/fractureproblem.hh index efee5ba87..8b18b0ad0 100644 --- a/examples/problems/fractureproblem.hh +++ b/examples/problems/fractureproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::FractureProblem + * \copydoc Opm::FractureProblem */ #ifndef EWOMS_FRACTURE_PROBLEM_HH #define EWOMS_FRACTURE_PROBLEM_HH @@ -60,7 +60,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class FractureProblem; } @@ -76,10 +76,10 @@ SET_TYPE_PROP( Dune::ALUGrid); // Set the Vanguard property -SET_TYPE_PROP(FractureProblem, Vanguard, Ewoms::DgfVanguard); +SET_TYPE_PROP(FractureProblem, Vanguard, Opm::DgfVanguard); // Set the problem property -SET_TYPE_PROP(FractureProblem, Problem, Ewoms::FractureProblem); +SET_TYPE_PROP(FractureProblem, Problem, Opm::FractureProblem); // Set the wetting phase SET_PROP(FractureProblem, WettingPhase) @@ -160,7 +160,7 @@ SET_SCALAR_PROP(FractureProblem, InitialTimeStepSize, 100); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * @@ -220,7 +220,7 @@ class FractureProblem : public GET_PROP_TYPE(TypeTag, BaseProblem) }; typedef Dune::MultipleCodimMultipleGeomTypeMapper FaceMapper; - typedef Ewoms::FractureMapper FractureMapper; + typedef Opm::FractureMapper FractureMapper; public: /*! @@ -648,6 +648,6 @@ private: Scalar temperature_; Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif // EWOMS_FRACTURE_PROBLEM_HH diff --git a/examples/problems/groundwaterproblem.hh b/examples/problems/groundwaterproblem.hh index 06722806d..84acc99e1 100644 --- a/examples/problems/groundwaterproblem.hh +++ b/examples/problems/groundwaterproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::GroundWaterProblem + * \copydoc Opm::GroundWaterProblem */ #ifndef EWOMS_GROUND_WATER_PROBLEM_HH #define EWOMS_GROUND_WATER_PROBLEM_HH @@ -46,7 +46,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class GroundWaterProblem; } @@ -78,7 +78,7 @@ SET_TYPE_PROP(GroundWaterBaseProblem, Grid, Dune::YaspGrid<2>); // SET_TYPE_PROP(GroundWaterBaseProblem, Grid, Dune::SGrid<2, 2>); SET_TYPE_PROP(GroundWaterBaseProblem, Problem, - Ewoms::GroundWaterProblem); + Opm::GroundWaterProblem); SET_SCALAR_PROP(GroundWaterBaseProblem, LensLowerLeftX, 0.25); SET_SCALAR_PROP(GroundWaterBaseProblem, LensLowerLeftY, 0.25); @@ -105,11 +105,11 @@ SET_STRING_PROP(GroundWaterBaseProblem, GridFile, "./data/groundwater_2d.dgf"); // ILU-0) from dune-istl SET_TAG_PROP(GroundWaterBaseProblem, LinearSolverSplice, ParallelIstlLinearSolver); SET_TYPE_PROP(GroundWaterBaseProblem, LinearSolverWrapper, - Ewoms::Linear::SolverWrapperConjugatedGradients); + Opm::Linear::SolverWrapperConjugatedGradients); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * @@ -392,6 +392,6 @@ private: Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/infiltrationproblem.hh b/examples/problems/infiltrationproblem.hh index 58a2351cd..632f6df15 100644 --- a/examples/problems/infiltrationproblem.hh +++ b/examples/problems/infiltrationproblem.hh @@ -22,7 +22,7 @@ */ /*! * \file - * \copydoc Ewoms::InfiltrationProblem + * \copydoc Opm::InfiltrationProblem */ #ifndef EWOMS_INFILTRATION_PROBLEM_HH #define EWOMS_INFILTRATION_PROBLEM_HH @@ -47,7 +47,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class InfiltrationProblem; } @@ -61,7 +61,7 @@ SET_TYPE_PROP(InfiltrationBaseProblem, Grid, Dune::YaspGrid<2>); // Set the problem property SET_TYPE_PROP(InfiltrationBaseProblem, Problem, - Ewoms::InfiltrationProblem); + Opm::InfiltrationProblem); // Set the fluid system SET_TYPE_PROP( @@ -106,7 +106,7 @@ SET_STRING_PROP(InfiltrationBaseProblem, GridFile, END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * \brief Isothermal NAPL infiltration problem where LNAPL @@ -469,6 +469,6 @@ private: Scalar temperature_; Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/lensproblem.hh b/examples/problems/lensproblem.hh index 766f2744f..01b1304c3 100644 --- a/examples/problems/lensproblem.hh +++ b/examples/problems/lensproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::LensProblem + * \copydoc Opm::LensProblem */ #ifndef EWOMS_LENS_PROBLEM_HH #define EWOMS_LENS_PROBLEM_HH @@ -51,7 +51,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class LensProblem; } @@ -69,7 +69,7 @@ NEW_PROP_TAG(LensUpperRightY); NEW_PROP_TAG(LensUpperRightZ); // Set the problem property -SET_TYPE_PROP(LensBaseProblem, Problem, Ewoms::LensProblem); +SET_TYPE_PROP(LensBaseProblem, Problem, Opm::LensProblem); // Use Dune-grid's YaspGrid SET_TYPE_PROP(LensBaseProblem, Grid, Dune::YaspGrid<2>); @@ -158,7 +158,7 @@ SET_BOOL_PROP(LensBaseProblem, EnableIntensiveQuantityCache, true); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems @@ -326,7 +326,7 @@ public: std::string disc = "vertex centered finite volume"; typedef typename GET_PROP_TYPE(TypeTag, Discretization) D; - bool useEcfv = std::is_same>::value; + bool useEcfv = std::is_same>::value; if (useEcfv) disc = "element centered finite volume"; @@ -625,6 +625,6 @@ private: Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/obstacleproblem.hh b/examples/problems/obstacleproblem.hh index 5b9a31d94..7a50bb711 100644 --- a/examples/problems/obstacleproblem.hh +++ b/examples/problems/obstacleproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::ObstacleProblem + * \copydoc Opm::ObstacleProblem */ #ifndef EWOMS_OBSTACLE_PROBLEM_HH #define EWOMS_OBSTACLE_PROBLEM_HH @@ -52,7 +52,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class ObstacleProblem; } @@ -65,7 +65,7 @@ NEW_TYPE_TAG(ObstacleBaseProblem); SET_TYPE_PROP(ObstacleBaseProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(ObstacleBaseProblem, Problem, Ewoms::ObstacleProblem); +SET_TYPE_PROP(ObstacleBaseProblem, Problem, Opm::ObstacleProblem); // Set fluid configuration SET_TYPE_PROP(ObstacleBaseProblem, FluidSystem, @@ -119,7 +119,7 @@ SET_STRING_PROP(ObstacleBaseProblem, GridFile, "./data/obstacle_24x16.dgf"); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * @@ -569,6 +569,6 @@ private: Scalar temperature_; Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/outflowproblem.hh b/examples/problems/outflowproblem.hh index a98130581..08dfa0803 100644 --- a/examples/problems/outflowproblem.hh +++ b/examples/problems/outflowproblem.hh @@ -22,7 +22,7 @@ */ /*! * \file - * \copydoc Ewoms::OutflowProblem + * \copydoc Opm::OutflowProblem */ #ifndef EWOMS_OUTFLOW_PROBLEM_HH #define EWOMS_OUTFLOW_PROBLEM_HH @@ -40,7 +40,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class OutflowProblem; } @@ -53,7 +53,7 @@ NEW_TYPE_TAG(OutflowBaseProblem); SET_TYPE_PROP(OutflowBaseProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(OutflowBaseProblem, Problem, Ewoms::OutflowProblem); +SET_TYPE_PROP(OutflowBaseProblem, Problem, Opm::OutflowProblem); // Set fluid system SET_PROP(OutflowBaseProblem, FluidSystem) @@ -83,7 +83,7 @@ SET_STRING_PROP(OutflowBaseProblem, GridFile, "./data/outflow.dgf"); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * @@ -369,6 +369,6 @@ private: Scalar porosity_; Scalar tortuosity_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/powerinjectionproblem.hh b/examples/problems/powerinjectionproblem.hh index ad1bfb75c..18e7bd9aa 100644 --- a/examples/problems/powerinjectionproblem.hh +++ b/examples/problems/powerinjectionproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::PowerInjectionProblem + * \copydoc Opm::PowerInjectionProblem */ #ifndef EWOMS_POWER_INJECTION_PROBLEM_HH #define EWOMS_POWER_INJECTION_PROBLEM_HH @@ -52,7 +52,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class PowerInjectionProblem; } @@ -66,11 +66,11 @@ SET_TYPE_PROP(PowerInjectionBaseProblem, Grid, Dune::YaspGrid); // set the Vanguard property SET_TYPE_PROP(PowerInjectionBaseProblem, Vanguard, - Ewoms::CubeGridVanguard); + Opm::CubeGridVanguard); // Set the problem property SET_TYPE_PROP(PowerInjectionBaseProblem, Problem, - Ewoms::PowerInjectionProblem); + Opm::PowerInjectionProblem); // Set the wetting phase SET_PROP(PowerInjectionBaseProblem, WettingPhase) @@ -138,7 +138,7 @@ SET_SCALAR_PROP(PowerInjectionBaseProblem, InitialTimeStepSize, 1e-3); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * \brief 1D Problem with very fast injection of gas on the left. @@ -236,7 +236,7 @@ public: std::ostringstream oss; oss << "powerinjection_"; if (std::is_same >::value) + Opm::DarcyFluxModule >::value) oss << "darcy"; else oss << "forchheimer"; @@ -429,6 +429,6 @@ private: Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/reservoirproblem.hh b/examples/problems/reservoirproblem.hh index 12246526e..fdffd3e1d 100644 --- a/examples/problems/reservoirproblem.hh +++ b/examples/problems/reservoirproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::ReservoirProblem + * \copydoc Opm::ReservoirProblem */ #ifndef EWOMS_RESERVOIR_PROBLEM_HH #define EWOMS_RESERVOIR_PROBLEM_HH @@ -50,11 +50,11 @@ #include #include -namespace Ewoms { +namespace Opm { template class ReservoirProblem; -} // namespace Ewoms +} // namespace Opm BEGIN_PROPERTIES @@ -72,7 +72,7 @@ NEW_PROP_TAG(WellWidth); SET_TYPE_PROP(ReservoirBaseProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(ReservoirBaseProblem, Problem, Ewoms::ReservoirProblem); +SET_TYPE_PROP(ReservoirBaseProblem, Problem, Opm::ReservoirProblem); // Set the material Law SET_PROP(ReservoirBaseProblem, MaterialLaw) @@ -141,7 +141,7 @@ SET_SCALAR_PROP(ReservoirBaseProblem, NewtonTolerance, 1e-6); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems @@ -746,6 +746,6 @@ private: Scalar maxDepth_; Scalar wellWidth_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/richardslensproblem.hh b/examples/problems/richardslensproblem.hh index 4a330c75f..a75add460 100644 --- a/examples/problems/richardslensproblem.hh +++ b/examples/problems/richardslensproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::RichardsLensProblem + * \copydoc Opm::RichardsLensProblem */ #ifndef EWOMS_RICHARDS_LENS_PROBLEM_HH #define EWOMS_RICHARDS_LENS_PROBLEM_HH @@ -45,11 +45,11 @@ #include #include -namespace Ewoms { +namespace Opm { template class RichardsLensProblem; -} // namespace Ewoms +} // namespace Opm BEGIN_PROPERTIES @@ -59,7 +59,7 @@ NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(Richards)); SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>); // Set the physical problem to be solved -SET_TYPE_PROP(RichardsLensProblem, Problem, Ewoms::RichardsLensProblem); +SET_TYPE_PROP(RichardsLensProblem, Problem, Opm::RichardsLensProblem); // Set the wetting phase SET_PROP(RichardsLensProblem, WettingFluid) @@ -120,7 +120,7 @@ SET_STRING_PROP(RichardsLensProblem, GridFile, "./data/richardslens_24x16.dgf"); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems @@ -481,6 +481,6 @@ private: Scalar eps_; Scalar pnRef_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/problems/waterairproblem.hh b/examples/problems/waterairproblem.hh index 75a401009..67d93495d 100644 --- a/examples/problems/waterairproblem.hh +++ b/examples/problems/waterairproblem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::WaterAirProblem + * \copydoc Opm::WaterAirProblem */ #ifndef EWOMS_WATER_AIR_PROBLEM_HH #define EWOMS_WATER_AIR_PROBLEM_HH @@ -53,7 +53,7 @@ #include #include -namespace Ewoms { +namespace Opm { template class WaterAirProblem; } @@ -66,7 +66,7 @@ NEW_TYPE_TAG(WaterAirBaseProblem); SET_TYPE_PROP(WaterAirBaseProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(WaterAirBaseProblem, Problem, Ewoms::WaterAirProblem); +SET_TYPE_PROP(WaterAirBaseProblem, Problem, Opm::WaterAirProblem); // Set the material Law SET_PROP(WaterAirBaseProblem, MaterialLaw) @@ -130,19 +130,19 @@ SET_STRING_PROP(WaterAirBaseProblem, GridFile, "./data/waterair.dgf"); // Use the restarted GMRES linear solver with the ILU-2 preconditioner from dune-istl SET_TAG_PROP(WaterAirBaseProblem, LinearSolverSplice, ParallelIstlLinearSolver); SET_TYPE_PROP(WaterAirBaseProblem, LinearSolverWrapper, - Ewoms::Linear::SolverWrapperRestartedGMRes); + Opm::Linear::SolverWrapperRestartedGMRes); #if DUNE_VERSION_NEWER(DUNE_ISTL, 2,7) SET_TYPE_PROP(WaterAirBaseProblem, PreconditionerWrapper, - Ewoms::Linear::PreconditionerWrapperILU); + Opm::Linear::PreconditionerWrapperILU); #else SET_TYPE_PROP(WaterAirBaseProblem, PreconditionerWrapper, - Ewoms::Linear::PreconditionerWrapperILUn); + Opm::Linear::PreconditionerWrapperILUn); #endif SET_INT_PROP(WaterAirBaseProblem, PreconditionerOrder, 2); END_PROPERTIES -namespace Ewoms { +namespace Opm { /*! * \ingroup TestProblems * \brief Non-isothermal gas injection problem where a air @@ -589,6 +589,6 @@ private: Scalar maxDepth_; Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/reservoir_blackoil_ecfv.cpp b/examples/reservoir_blackoil_ecfv.cpp index 2e6782eef..3832d4351 100644 --- a/examples/reservoir_blackoil_ecfv.cpp +++ b/examples/reservoir_blackoil_ecfv.cpp @@ -48,5 +48,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(ReservoirBlackOilEcfvProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/reservoir_blackoil_vcfv.cpp b/examples/reservoir_blackoil_vcfv.cpp index 090946754..d10d5bbe5 100644 --- a/examples/reservoir_blackoil_vcfv.cpp +++ b/examples/reservoir_blackoil_vcfv.cpp @@ -44,5 +44,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(ReservoirBlackOilVcfvProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/reservoir_ncp_ecfv.cpp b/examples/reservoir_ncp_ecfv.cpp index 72f83677b..b78af5455 100644 --- a/examples/reservoir_ncp_ecfv.cpp +++ b/examples/reservoir_ncp_ecfv.cpp @@ -47,5 +47,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(ReservoirNcpEcfvProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/reservoir_ncp_vcfv.cpp b/examples/reservoir_ncp_vcfv.cpp index b609001ca..73aec4e75 100644 --- a/examples/reservoir_ncp_vcfv.cpp +++ b/examples/reservoir_ncp_vcfv.cpp @@ -54,5 +54,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(ReservoirNcpVcfvProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/examples/tutorial1.cpp b/examples/tutorial1.cpp index 25691ff7a..e8509e4ba 100644 --- a/examples/tutorial1.cpp +++ b/examples/tutorial1.cpp @@ -33,5 +33,5 @@ int main(int argc, char **argv) { typedef TTAG(Tutorial1Problem) TypeTag; /*@\label{tutorial1:set-type-tag}@*/ - return Ewoms::start(argc, argv); /*@\label{tutorial1:call-start}@*/ + return Opm::start(argc, argv); /*@\label{tutorial1:call-start}@*/ } diff --git a/examples/tutorial1problem.hh b/examples/tutorial1problem.hh index 316b83458..7d54f1511 100644 --- a/examples/tutorial1problem.hh +++ b/examples/tutorial1problem.hh @@ -23,7 +23,7 @@ /*! * \file * - * \copydoc Ewoms::Tutorial1Problem + * \copydoc Opm::Tutorial1Problem */ #ifndef EWOMS_TUTORIAL1_PROBLEM_HH /*@\label{tutorial1:guardian1}@*/ #define EWOMS_TUTORIAL1_PROBLEM_HH /*@\label{tutorial1:guardian2}@*/ @@ -51,7 +51,7 @@ #include #include -namespace Ewoms { +namespace Opm { // forward declaration of the problem class template class Tutorial1Problem; @@ -68,11 +68,11 @@ SET_TAG_PROP(Tutorial1Problem, SpatialDiscretizationSplice, // Set the "Problem" property SET_TYPE_PROP(Tutorial1Problem, Problem, - Ewoms::Tutorial1Problem); /*@\label{tutorial1:set-problem}@*/ + Opm::Tutorial1Problem); /*@\label{tutorial1:set-problem}@*/ // Set grid and the grid manager to be used SET_TYPE_PROP(Tutorial1Problem, Grid, Dune::YaspGrid); /*@\label{tutorial1:set-grid}@*/ -SET_TYPE_PROP(Tutorial1Problem, Vanguard, Ewoms::CubeGridVanguard); /*@\label{tutorial1:set-grid-manager}@*/ +SET_TYPE_PROP(Tutorial1Problem, Vanguard, Opm::CubeGridVanguard); /*@\label{tutorial1:set-grid-manager}@*/ // Set the wetting phase /*@\label{tutorial1:2p-system-start}@*/ SET_TYPE_PROP(Tutorial1Problem, @@ -129,7 +129,7 @@ SET_INT_PROP(Tutorial1Problem, CellsZ, 1); /*@\label{tutorial1:default-params-en END_PROPERTIES -namespace Ewoms { +namespace Opm { //! Tutorial problem using the "immiscible" model. template class Tutorial1Problem @@ -309,7 +309,7 @@ private: // small epsilon value Scalar eps_; }; -} // namespace Ewoms +} // namespace Opm #endif diff --git a/examples/waterair_pvs_ni.cpp b/examples/waterair_pvs_ni.cpp index 480714d62..ce77a8e18 100644 --- a/examples/waterair_pvs_ni.cpp +++ b/examples/waterair_pvs_ni.cpp @@ -42,5 +42,5 @@ END_PROPERTIES int main(int argc, char **argv) { typedef TTAG(WaterAirProblem) ProblemTypeTag; - return Ewoms::start(argc, argv); + return Opm::start(argc, argv); } diff --git a/tests/models/test_propertysystem.cpp b/tests/models/test_propertysystem.cpp index 2a69a33cc..d6933b407 100644 --- a/tests/models/test_propertysystem.cpp +++ b/tests/models/test_propertysystem.cpp @@ -185,7 +185,7 @@ int main() std::cout << "---------------------------------------\n"; std::cout << "---- All properties for Sedan ---\n"; - Ewoms::Properties::printValues(); + Opm::Properties::printValues(); std::cout << "---- Message for (HummerH1, CanonCaliber) ---\n" << PROP_DIAGNOSTIC(TTAG(HummerH1), CanonCaliber); diff --git a/tests/models/test_quadrature.cpp b/tests/models/test_quadrature.cpp index d5546ff56..fa9ea487e 100644 --- a/tests/models/test_quadrature.cpp +++ b/tests/models/test_quadrature.cpp @@ -51,7 +51,7 @@ const unsigned dim = 3; typedef double Scalar; -typedef Ewoms::QuadrialteralQuadratureGeometry QuadratureGeom; +typedef Opm::QuadrialteralQuadratureGeometry QuadratureGeom; typedef QuadratureGeom::LocalPosition LocalPosition; typedef QuadratureGeom::GlobalPosition GlobalPosition; @@ -121,7 +121,7 @@ void writeTetrahedronSubControlVolumes(const Grid& EWOMS_NO_ALUGRID_UNUSED grid) GridFactory2 gf2; const auto &gridView = grid.leafView(); - typedef Ewoms::VcfvStencil Stencil; + typedef Opm::VcfvStencil Stencil; typedef typename Stencil :: Mapper Mapper; #if DUNE_VERSION_NEWER(DUNE_GRID, 2,6) @@ -206,7 +206,7 @@ void writeCubeSubControlVolumes(const Grid& EWOMS_NO_ALUGRID_UNUSED grid) typedef Dune::ALUGrid Grid2; typedef typename Grid2::LeafGridView GridView2; typedef Dune::GridFactory GridFactory2; - typedef Ewoms::VcfvStencil Stencil; + typedef Opm::VcfvStencil Stencil; GridFactory2 gf2; const auto &gridView = grid.leafView(); @@ -312,7 +312,7 @@ void testQuadrature() const auto eEndIt = gridView.end<0>(); Scalar result = 0; // instanciate a stencil - typedef Ewoms::VcfvStencil Stencil; + typedef Opm::VcfvStencil Stencil; typedef typename Stencil :: Mapper Mapper; #if DUNE_VERSION_NEWER(DUNE_GRID, 2,6) diff --git a/tests/models/test_tasklets.cpp b/tests/models/test_tasklets.cpp index c8d9724c4..d890d70cf 100644 --- a/tests/models/test_tasklets.cpp +++ b/tests/models/test_tasklets.cpp @@ -35,9 +35,9 @@ std::mutex outputMutex; -Ewoms::TaskletRunner *runner; +Opm::TaskletRunner *runner; -class SleepTasklet : public Ewoms::TaskletInterface +class SleepTasklet : public Opm::TaskletInterface { public: SleepTasklet(int mseconds) @@ -77,7 +77,7 @@ int SleepTasklet::numInstantiated_ = 0; int main() { int numWorkers = 2; - runner = new Ewoms::TaskletRunner(numWorkers); + runner = new Opm::TaskletRunner(numWorkers); // the master thread is not a worker thread assert(runner->workerThreadIndex() < 0);