changed: move setting of default vanguard to basicproperties.hh

use forwarding to avoid including dgfvanguard.hh unless it is actually used
2024-12-22 15:33:29 -06:00 · 2024-07-01 09:33:44 +02:00 · 2024-07-01 09:33:44 +02:00 · 59a246e178
commit 59a246e178
parent 23e9bc5ebc
33 changed files with 51 additions and 11 deletions
--- a/examples/co2injection_flash_ecfv.cpp
+++ b/examples/co2injection_flash_ecfv.cpp
@ -32,6 +32,7 @@
 #include <opm/material/common/quad.hpp>
 #endif

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/flash/flashmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/co2injection_flash_ni_ecfv.cpp
+++ b/examples/co2injection_flash_ni_ecfv.cpp
@ -28,7 +28,10 @@
 */
 #include "config.h"

+// this must be included before the vanguard
 #include <opm/material/common/quad.hpp>
+
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/flash/flashmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/co2injection_flash_ni_vcfv.cpp
+++ b/examples/co2injection_flash_ni_vcfv.cpp
@ -28,7 +28,10 @@
 */
 #include "config.h"

+// this must be included before the vanguard
 #include <opm/material/common/quad.hpp>
+
+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/flash/flashmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/co2injection_flash_vcfv.cpp
+++ b/examples/co2injection_flash_vcfv.cpp
@ -32,6 +32,7 @@
 #include <opm/material/common/quad.hpp>
 #endif

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/flash/flashmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/co2injection_immiscible_ecfv.cpp
+++ b/examples/co2injection_immiscible_ecfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/co2injection_immiscible_ni_ecfv.cpp
+++ b/examples/co2injection_immiscible_ni_ecfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/co2injection_immiscible_ni_vcfv.cpp
+++ b/examples/co2injection_immiscible_ni_vcfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/co2injection_immiscible_vcfv.cpp
+++ b/examples/co2injection_immiscible_vcfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/co2injection_ncp_ecfv.cpp
+++ b/examples/co2injection_ncp_ecfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/co2injection_ncp_ni_ecfv.cpp
+++ b/examples/co2injection_ncp_ni_ecfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/co2injection_ncp_ni_vcfv.cpp
+++ b/examples/co2injection_ncp_ni_vcfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/co2injection_ncp_vcfv.cpp
+++ b/examples/co2injection_ncp_vcfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/co2injection_pvs_ecfv.cpp
+++ b/examples/co2injection_pvs_ecfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/co2injection_pvs_ni_ecfv.cpp
+++ b/examples/co2injection_pvs_ni_ecfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/co2injection_pvs_ni_vcfv.cpp
+++ b/examples/co2injection_pvs_ni_vcfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/co2injection_pvs_vcfv.cpp
+++ b/examples/co2injection_pvs_vcfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/cuvette_pvs.cpp
+++ b/examples/cuvette_pvs.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
--- a/examples/groundwater_immiscible.cpp
+++ b/examples/groundwater_immiscible.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/groundwaterproblem.hh"
--- a/examples/infiltration_pvs.cpp
+++ b/examples/infiltration_pvs.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
--- a/examples/lens_richards_ecfv.cpp
+++ b/examples/lens_richards_ecfv.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
--- a/examples/lens_richards_vcfv.cpp
+++ b/examples/lens_richards_vcfv.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
--- a/examples/obstacle_immiscible.cpp
+++ b/examples/obstacle_immiscible.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 #include <opm/models/immiscible/immisciblemodel.hh>
--- a/examples/obstacle_ncp.cpp
+++ b/examples/obstacle_ncp.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
--- a/examples/obstacle_pvs.cpp
+++ b/examples/obstacle_pvs.cpp
@ -29,6 +29,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
--- a/examples/outflow_pvs.cpp
+++ b/examples/outflow_pvs.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
--- a/examples/reservoir_blackoil_ecfv.cpp
+++ b/examples/reservoir_blackoil_ecfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/reservoir_blackoil_vcfv.cpp
+++ b/examples/reservoir_blackoil_vcfv.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/reservoir_ncp_ecfv.cpp
+++ b/examples/reservoir_ncp_ecfv.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
--- a/examples/reservoir_ncp_vcfv.cpp
+++ b/examples/reservoir_ncp_vcfv.cpp
@ -28,6 +28,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/ncp/ncpmodel.hh>
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
--- a/examples/waterair_pvs_ni.cpp
+++ b/examples/waterair_pvs_ni.cpp
@ -27,6 +27,7 @@
 */
 #include "config.h"

+#include <opm/models/io/dgfvanguard.hh>
 #include <opm/models/utils/start.hh>
 #include <opm/models/pvs/pvsmodel.hh>
 #include "problems/waterairproblem.hh"
--- a/opm/models/common/multiphasebaseproblem.hh
+++ b/opm/models/common/multiphasebaseproblem.hh
@ -28,20 +28,22 @@
 #ifndef EWOMS_MULTI_PHASE_BASE_PROBLEM_HH
 #define EWOMS_MULTI_PHASE_BASE_PROBLEM_HH

-#include "multiphasebaseproperties.hh"
+#include <dune/common/fvector.hh>
+#include <dune/common/fmatrix.hh>

-#include <opm/models/common/directionalmobility.hh>
-#include <opm/models/discretization/common/fvbaseproblem.hh>
-#include <opm/models/discretization/common/fvbaseproperties.hh>
+#include <dune/grid/common/partitionset.hh>

 #include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
 #include <opm/material/common/Means.hpp>
 #include <opm/material/densead/Evaluation.hpp>

-#include <opm/utility/CopyablePtr.hpp>
+#include <opm/models/common/directionalmobility.hh>
+#include <opm/models/common/multiphasebaseproperties.hh>

-#include <dune/common/fvector.hh>
-#include <dune/common/fmatrix.hh>
+#include <opm/models/discretization/common/fvbaseproblem.hh>
+#include <opm/models/discretization/common/fvbaseproperties.hh>
+
+#include <opm/utility/CopyablePtr.hpp>

 namespace Opm {
 /*!
--- a/opm/models/discretization/common/fvbaseproperties.hh
+++ b/opm/models/discretization/common/fvbaseproperties.hh
@ -31,7 +31,6 @@
 #define EWOMS_FV_BASE_PROPERTIES_HH

 #include <opm/models/utils/basicproperties.hh>
-#include <opm/models/io/dgfvanguard.hh>

 namespace Opm::Properties {

@ -257,9 +256,6 @@ struct UseVolumetricResidual { using type = UndefinedProperty; };
 template<class TypeTag, class MyTypeTag>
 struct EnableExperiments { using type = UndefinedProperty; };

-template<class TypeTag>
-struct Vanguard<TypeTag, TTag::NumericModel> { using type = Opm::DgfVanguard<TypeTag>; };
-
 } // namespace Opm::Properties

 #endif
--- a/opm/models/utils/basicproperties.hh
+++ b/opm/models/utils/basicproperties.hh
@ -38,6 +38,12 @@
 #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
 #endif

+namespace Opm {
+
+template<class TypeTag> class DgfVanguard;
+
+}
+
 namespace Opm::Properties {

 ///////////////////////////////////
@ -254,6 +260,8 @@ struct RestartTime<TypeTag, TTag::NumericModel>
 template<class TypeTag>
 struct PredeterminedTimeStepsFile<TypeTag, TTag::NumericModel> { static constexpr auto value = ""; };

+template<class TypeTag>
+struct Vanguard<TypeTag, TTag::NumericModel> { using type = Opm::DgfVanguard<TypeTag>; };

 } // namespace Opm::Properties