From b48781938461b7374c7dc4f536eddb034a1903b6 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 23 Dec 2022 13:09:40 +0100 Subject: [PATCH] Evaluation: remove unnecessary includes --- bin/genEvalSpecializations.py | 9 ++++----- opm/material/densead/DynamicEvaluation.hpp | 5 +---- opm/material/densead/Evaluation.hpp | 4 +--- opm/material/densead/Evaluation1.hpp | 3 --- opm/material/densead/Evaluation10.hpp | 3 --- opm/material/densead/Evaluation11.hpp | 3 --- opm/material/densead/Evaluation12.hpp | 3 --- opm/material/densead/Evaluation2.hpp | 3 --- opm/material/densead/Evaluation3.hpp | 3 --- opm/material/densead/Evaluation4.hpp | 3 --- opm/material/densead/Evaluation5.hpp | 3 --- opm/material/densead/Evaluation6.hpp | 3 --- opm/material/densead/Evaluation7.hpp | 3 --- opm/material/densead/Evaluation8.hpp | 3 --- opm/material/densead/Evaluation9.hpp | 3 --- 15 files changed, 6 insertions(+), 48 deletions(-) diff --git a/bin/genEvalSpecializations.py b/bin/genEvalSpecializations.py index 668cb5001..179ab4ec0 100755 --- a/bin/genEvalSpecializations.py +++ b/bin/genEvalSpecializations.py @@ -79,27 +79,26 @@ specializationTemplate = \ #ifndef NDEBUG #include #endif - {% if numDerivs < 0 %}\ #include + {% else %}\ + #include {% endif %}\ -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { + {% if numDerivs == 0 %}\ //! Indicates that the number of derivatives considered by an Evaluation object //! is run-time determined static constexpr int DynamicSize = -1; -{% endif %}\ +{% endif %}\ {% if numDerivs < 0 %}\ /*! * \\brief Represents a function evaluation and its derivatives w.r.t. a diff --git a/opm/material/densead/DynamicEvaluation.hpp b/opm/material/densead/DynamicEvaluation.hpp index e5cde0d0b..7da8b2d4f 100644 --- a/opm/material/densead/DynamicEvaluation.hpp +++ b/opm/material/densead/DynamicEvaluation.hpp @@ -38,14 +38,11 @@ #ifndef NDEBUG #include #endif - #include -#include + #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation.hpp b/opm/material/densead/Evaluation.hpp index 7fd667332..4a80d0c50 100644 --- a/opm/material/densead/Evaluation.hpp +++ b/opm/material/densead/Evaluation.hpp @@ -40,15 +40,13 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { + //! Indicates that the number of derivatives considered by an Evaluation object //! is run-time determined static constexpr int DynamicSize = -1; diff --git a/opm/material/densead/Evaluation1.hpp b/opm/material/densead/Evaluation1.hpp index 2f616fdbe..6b9d94984 100644 --- a/opm/material/densead/Evaluation1.hpp +++ b/opm/material/densead/Evaluation1.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation10.hpp b/opm/material/densead/Evaluation10.hpp index 39a7ffa39..6e7218d3e 100644 --- a/opm/material/densead/Evaluation10.hpp +++ b/opm/material/densead/Evaluation10.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation11.hpp b/opm/material/densead/Evaluation11.hpp index 6abde66a4..ea152f0cc 100644 --- a/opm/material/densead/Evaluation11.hpp +++ b/opm/material/densead/Evaluation11.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation12.hpp b/opm/material/densead/Evaluation12.hpp index 41cf20f21..c2b9e0c4e 100644 --- a/opm/material/densead/Evaluation12.hpp +++ b/opm/material/densead/Evaluation12.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation2.hpp b/opm/material/densead/Evaluation2.hpp index cdc699736..c7a50115f 100644 --- a/opm/material/densead/Evaluation2.hpp +++ b/opm/material/densead/Evaluation2.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation3.hpp b/opm/material/densead/Evaluation3.hpp index a22acfe26..06fe1307d 100644 --- a/opm/material/densead/Evaluation3.hpp +++ b/opm/material/densead/Evaluation3.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation4.hpp b/opm/material/densead/Evaluation4.hpp index 8e98ada03..b444680ee 100644 --- a/opm/material/densead/Evaluation4.hpp +++ b/opm/material/densead/Evaluation4.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation5.hpp b/opm/material/densead/Evaluation5.hpp index d4ea7ee67..44d97ea09 100644 --- a/opm/material/densead/Evaluation5.hpp +++ b/opm/material/densead/Evaluation5.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation6.hpp b/opm/material/densead/Evaluation6.hpp index 0ba2e4801..5f2243b26 100644 --- a/opm/material/densead/Evaluation6.hpp +++ b/opm/material/densead/Evaluation6.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation7.hpp b/opm/material/densead/Evaluation7.hpp index f3dfb4b41..6e0cc3bb4 100644 --- a/opm/material/densead/Evaluation7.hpp +++ b/opm/material/densead/Evaluation7.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation8.hpp b/opm/material/densead/Evaluation8.hpp index 90c0389e6..5dfe3637d 100644 --- a/opm/material/densead/Evaluation8.hpp +++ b/opm/material/densead/Evaluation8.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd { diff --git a/opm/material/densead/Evaluation9.hpp b/opm/material/densead/Evaluation9.hpp index 85a1c8f20..626e681a1 100644 --- a/opm/material/densead/Evaluation9.hpp +++ b/opm/material/densead/Evaluation9.hpp @@ -39,12 +39,9 @@ #endif #include -#include #include -#include #include #include -#include namespace Opm { namespace DenseAd {