diff --git a/.gitsuper b/.gitsuper index 6bb42045f31aa351740b4d0f0c84bcc64766601a..1dde67337108fefdabe5514f6b2042c0a93d6829 100644 --- a/.gitsuper +++ b/.gitsuper @@ -4,23 +4,23 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master) 20a673b9dad7e2e25bd97defa8849debb59d247c config.opts (heads/master) 8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5) 707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20) - +4b7aa3639381b0b1a66d88574e509a48ccaa0443 dune-gdt (heads/entropy_flux_even_newer) + +b970966098de3d96005a3a09cdfd3ca8c5874d26 dune-gdt (heads/entropy_flux_even_newer) 390a2c503783bbed778a8ff610f8c5ca09c238d0 dune-geometry (v2.5.1-5-g390a2c5) d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e dune-grid (v2.5.1-2-gd7b20bbc5) - +e9d9a3336735090648637e044e279866bbea3597 dune-grid-glue (v2.4.0-60-ge9d9a33) + 9e29a333e8af02382d80b95335a784d5ce1ea2c8 dune-grid-glue (v2.4.0-70-g9e29a33) 63df56a54f81eda308233a683eb329e77e69f0a9 dune-istl (v2.5.1rc1) 0d757d65e5d57134a7ecf304e35d063f4ccc7116 dune-localfunctions (v2.5.1rc1) 8a69fc68165780921bbba77da338b6932daf983c dune-pybindxi (v2.2.1-16-g8a69fc6) 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5) 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest) 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2) - +57d7e1c163873483a1a44a059ee94d0e6163f01f dune-xt-common (heads/dailywork_tleibner) - +6686c4ae087a87a944351f4bf112a8b371d42d18 dune-xt-data (heads/dailywork_tleibner) - 0c9df39934e23b950f357c912b4c800b86de683f dune-xt-functions (heads/dailywork_tleibner) - dd30fcd7d4485eb2a8158d5ddf01333f58502c40 dune-xt-grid (heads/dailywork-ftschindler-35-gdd30fcd) - d1d9de55f3aabac187fd25a86453303f83dfad80 dune-xt-la (heads/master) + aa99fc15ae0bc467e0f0df0e48721ab66a9bb74a dune-xt-common (heads/dailywork_tleibner) + f93419066883a68c4e0ba96acc3d451ba971876a dune-xt-data (heads/dailywork_tleibner) + 83b29cbe84d0af6579d6904f59598ad3dd132996 dune-xt-functions (heads/dailywork_tleibner) + 9432a18b5de2931e06bf1b4eeefa8de1d1820c0f dune-xt-grid (heads/dailywork_tleibner) + +c1565897fdd8e0ed37487b43511518c2d29acb51 dune-xt-la (heads/remove_cow) 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master) -commit = 307074d1e2f1a09b1f71520fd5d69ec0601e7781 +commit = 2967bdedc638aa2ba19ebfcaf4dd5735758aeba0 [submodule.bin] remote = git@github.com:dune-community/local-bin.git @@ -45,7 +45,7 @@ commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f [submodule.dune-gdt] remote = git@github.com:dune-community/dune-gdt.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = 4b7aa3639381b0b1a66d88574e509a48ccaa0443 +commit = b970966098de3d96005a3a09cdfd3ca8c5874d26 [submodule.dune-geometry] remote = git@github.com:dune-community/dune-geometry.git @@ -60,7 +60,7 @@ commit = d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e [submodule.dune-grid-glue] remote = https://github.com/dune-mirrors/dune-grid-glue.git status = -commit = e9d9a3336735090648637e044e279866bbea3597 +commit = 9e29a333e8af02382d80b95335a784d5ce1ea2c8 [submodule.dune-istl] remote = https://github.com/dune-mirrors/dune-istl.git @@ -95,27 +95,27 @@ commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e [submodule.dune-xt-common] remote = git@github.com:dune-community/dune-xt-common.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = 57d7e1c163873483a1a44a059ee94d0e6163f01f +commit = aa99fc15ae0bc467e0f0df0e48721ab66a9bb74a [submodule.dune-xt-data] -remote = https://github.com/dune-community/dune-xt-data +remote = git@github.com:dune-community/dune-xt-data status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = 6686c4ae087a87a944351f4bf112a8b371d42d18 +commit = f93419066883a68c4e0ba96acc3d451ba971876a [submodule.dune-xt-functions] remote = git@github.com:dune-community/dune-xt-functions.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = 0c9df39934e23b950f357c912b4c800b86de683f +commit = 83b29cbe84d0af6579d6904f59598ad3dd132996 [submodule.dune-xt-grid] remote = git@github.com:dune-community/dune-xt-grid.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = dd30fcd7d4485eb2a8158d5ddf01333f58502c40 +commit = 9432a18b5de2931e06bf1b4eeefa8de1d1820c0f [submodule.dune-xt-la] remote = git@github.com:dune-community/dune-xt-la.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = d1d9de55f3aabac187fd25a86453303f83dfad80 +commit = c1565897fdd8e0ed37487b43511518c2d29acb51 [submodule.scripts] remote = https://github.com/wwu-numerik/scripts.git diff --git a/dune/xt/common/fvector.hh b/dune/xt/common/fvector.hh index 98deedd7e4aa410e00573a4618e938e21406f72e..78badf7c72dcb77a98635214a2596a298ea90e32 100644 --- a/dune/xt/common/fvector.hh +++ b/dune/xt/common/fvector.hh @@ -402,6 +402,22 @@ struct FieldVectorLess } }; +struct FieldVectorFloatLess +{ + template <class FieldType, int dimDomain> + bool operator()(const Dune::FieldVector<FieldType, dimDomain>& a, + const Dune::FieldVector<FieldType, dimDomain>& b) const + { + for (size_t dd = 0; dd < dimDomain; ++dd) { + if (XT::Common::FloatCmp::lt(a[dd], b[dd])) + return true; + else if (XT::Common::FloatCmp::gt(a[dd], b[dd])) + return false; + } + return false; + } +}; + //! Specialization of VectorAbstraction for Dune::XT::Common::FieldVector template <class K, int SIZE> diff --git a/dune/xt/common/math.hh b/dune/xt/common/math.hh index 8b21adf7dcce43ab6d20af0a30fcc5ff62f61f53..e6f8c8069c384203170dcdea9f7ee013926af397 100644 --- a/dune/xt/common/math.hh +++ b/dune/xt/common/math.hh @@ -325,6 +325,14 @@ typename PromotionTraits<L, R>::PromotedType min(const L& left, const R& right) } +// avoid Wfloat-equal warning +template <class FieldType> +inline bool is_zero(const FieldType& val) +{ + return std::equal_to<FieldType>()(val, FieldType(0)); +} + + } // namespace Common } // namespace XT } // namespace Dune