diff --git a/.gitsuper b/.gitsuper index 87d2ac75e4dbdc73b7521251d0b4b879f495e473..adf37ca66638a26bcf091ba9a5281f03d36bb675 100644 --- a/.gitsuper +++ b/.gitsuper @@ -1,25 +1,26 @@ [supermodule] -remote = git@github.com:dune-community/dune-xt-super.git +remote = git@github.com:dune-community/dune-gdt-super.git status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master) - 5af7224dda0addd6cde1a0073ff93fc9be1f5095 config.opts (heads/master) + 20a673b9dad7e2e25bd97defa8849debb59d247c config.opts (heads/master) 8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5) 707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20) - e6350271b8d014adab51467a35b6ad8ef48212a0 dune-geometry (v2.5.1-6-ge635027) + +319ee44af8a7e1809b53770fd78199158554e0e1 dune-gdt (heads/dailywork_tleibner) + 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) + +e9d9a3336735090648637e044e279866bbea3597 dune-grid-glue (v2.4.0-60-ge9d9a33) 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 (heads/dune_xt) - 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9 dune-uggrid (v2.5.2-1-g8fe883e9) - 09ca2e4e1de1c8024b44cd912cbfd5d25e3e872a dune-xt-common (heads/introduce_xt-data) - +e5f87cc3bf140d553134ee05bfd0ce42eb6c232e dune-xt-data (heads/master) - 640c82c5e6ce2fc97c4d57911d5e5ef7723ec025 dune-xt-functions (heads/introduce_xt-data) - +d883505a56cc83c1015074c4f427d64792e65a8a dune-xt-grid (heads/refactor_py_imports) - fab7ebec48ebafb5cf541ea3ff696955b480a768 dune-xt-la (heads/master) - 60cd896bf3f1eb99066563aa1a07113e5a791d47 scripts (remotes/origin/HEAD) -commit = 0ab6599d5dbc4f2e7442a4b6cd7d7609902f08e6 + 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest) + 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2) + c3ee5cbe84b1e7f6c77b371d84f99f8f94dfc7df dune-xt-common (heads/master) + b8cf8efc32e46511990b691afee55da3b7af15c8 dune-xt-data (heads/master) + 0c9df39934e23b950f357c912b4c800b86de683f dune-xt-functions (heads/dailywork_tleibner) + dd30fcd7d4485eb2a8158d5ddf01333f58502c40 dune-xt-grid (heads/dailywork_tleibner) + +0a9e28f4dabfbfd5d7492f3bf1317131b466c8b1 dune-xt-la (heads/remove_cow) + 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master) +commit = 307074d1e2f1a09b1f71520fd5d69ec0601e7781 [submodule.bin] remote = git@github.com:dune-community/local-bin.git @@ -29,7 +30,7 @@ commit = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 [submodule.config.opts] remote = git@github.com:dune-community/config.opts.git status = -commit = 5af7224dda0addd6cde1a0073ff93fc9be1f5095 +commit = 20a673b9dad7e2e25bd97defa8849debb59d247c [submodule.dune-alugrid] remote = https://github.com/dune-mirrors/dune-alugrid.git @@ -41,13 +42,18 @@ remote = git@github.com:dune-community/dune-common.git status = commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f +[submodule.dune-gdt] +remote = git@github.com:dune-community/dune-gdt.git +status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) +commit = 319ee44af8a7e1809b53770fd78199158554e0e1 + [submodule.dune-geometry] -remote = http://github.com/dune-community/dune-geometry.git +remote = git@github.com:dune-community/dune-geometry.git status = -commit = e6350271b8d014adab51467a35b6ad8ef48212a0 +commit = 390a2c503783bbed778a8ff610f8c5ca09c238d0 [submodule.dune-grid] -remote = http://github.com/dune-community/dune-grid.git +remote = git@github.com:dune-community/dune-grid.git status = commit = d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e @@ -57,18 +63,18 @@ status = commit = e9d9a3336735090648637e044e279866bbea3597 [submodule.dune-istl] -remote = http://github.com/dune-mirrors/dune-istl.git +remote = https://github.com/dune-mirrors/dune-istl.git status = commit = 63df56a54f81eda308233a683eb329e77e69f0a9 [submodule.dune-localfunctions] -remote = http://github.com/dune-mirrors/dune-localfunctions.git +remote = https://github.com/dune-mirrors/dune-localfunctions.git status = commit = 0d757d65e5d57134a7ecf304e35d063f4ccc7116 [submodule.dune-pybindxi] remote = git@github.com:dune-community/dune-pybindxi.git -status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (heads/master) +status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (a18500d) commit = 8a69fc68165780921bbba77da338b6932daf983c [submodule.dune-python] @@ -77,42 +83,42 @@ status = commit = 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c [submodule.dune-testtools] -remote = https://github.com/dune-community/dune-testtools +remote = https://github.com/dune-mirrors/dune-testtools.git status = commit = 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 [submodule.dune-uggrid] remote = https://github.com/dune-mirrors/dune-uggrid.git status = -commit = 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9 +commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e [submodule.dune-xt-common] remote = git@github.com:dune-community/dune-xt-common.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = 09ca2e4e1de1c8024b44cd912cbfd5d25e3e872a +commit = c3ee5cbe84b1e7f6c77b371d84f99f8f94dfc7df [submodule.dune-xt-data] remote = https://github.com/dune-community/dune-xt-data -status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = e5f87cc3bf140d553134ee05bfd0ce42eb6c232e +status = -2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup +commit = b8cf8efc32e46511990b691afee55da3b7af15c8 [submodule.dune-xt-functions] remote = git@github.com:dune-community/dune-xt-functions.git -status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = 640c82c5e6ce2fc97c4d57911d5e5ef7723ec025 +status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup ((null)) +commit = 0c9df39934e23b950f357c912b4c800b86de683f [submodule.dune-xt-grid] remote = git@github.com:dune-community/dune-xt-grid.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = d883505a56cc83c1015074c4f427d64792e65a8a +commit = dd30fcd7d4485eb2a8158d5ddf01333f58502c40 [submodule.dune-xt-la] remote = git@github.com:dune-community/dune-xt-la.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = fab7ebec48ebafb5cf541ea3ff696955b480a768 +commit = 0a9e28f4dabfbfd5d7492f3bf1317131b466c8b1 [submodule.scripts] remote = https://github.com/wwu-numerik/scripts.git -status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (fb5ebc1) -commit = 60cd896bf3f1eb99066563aa1a07113e5a791d47 +status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (v0.2.0~10) +commit = 09d0378f616b94d68bcdd9fc6114813181849ec0 diff --git a/dune/xt/grid/gridprovider/factory.hh b/dune/xt/grid/gridprovider/factory.hh index aaf66614aa78aadfca165d715a17f49d1d23f2d6..bb42f0b51f881cc02e5bd90557542c269bcbf3d2 100644 --- a/dune/xt/grid/gridprovider/factory.hh +++ b/dune/xt/grid/gridprovider/factory.hh @@ -95,7 +95,7 @@ public: return call_create<CubeType>(config, mpi_comm); else if (DgfType::static_id() == type) return call_create<DgfType>(config, mpi_comm); - else if (GmshType::static_id() == type, mpi_comm) + else if (GmshType::static_id() == type) return call_create<GmshType>(config, mpi_comm); else if (available().empty()) DUNE_THROW(Common::Exceptions::wrong_input_given,