Skip to content
Snippets Groups Projects
Commit de39cd53 authored by Tobias Leibner's avatar Tobias Leibner
Browse files

[boundary-detector] try to fix walker tests

parent ffe1fde6
No related branches found
No related tags found
No related merge requests found
...@@ -14,10 +14,10 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master) ...@@ -14,10 +14,10 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5) 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest) 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest)
0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2) 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2)
263e4997f873692f8aa49627ee051a5df104e5db dune-xt-common (heads/dailywork_tleibner) +111ee6ea9334b68ae841c04ec0b597ad17751fc3 dune-xt-common (heads/dailywork_tleibner)
3e3f3bf06e21cbbf3c0a559891b44c6f5d987d0f dune-xt-data (heads/master) 3e3f3bf06e21cbbf3c0a559891b44c6f5d987d0f dune-xt-data (heads/master)
+f05aa7470ead4150ca7a91894cd2ad77dfcedc46 dune-xt-functions (heads/new-master) +17c0f151b54ab54cadb54217f53a8d3220ed9442 dune-xt-functions (heads/new-master)
+9dcfc1bd1737d3d2ffd1f7a498357ae3c66e72e2 dune-xt-grid (heads/new-master) +ffe1fde668438fc5a9309f9c4447f2672dd1fa5c dune-xt-grid (heads/new-master)
f6904b69f9a3ee5d45ee824d3b244e59cfed7ff4 dune-xt-la (heads/master) f6904b69f9a3ee5d45ee824d3b244e59cfed7ff4 dune-xt-la (heads/master)
09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master) 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
commit = 11b7c1b7e4cc360ec97f4f88684d02264f0e309a commit = 11b7c1b7e4cc360ec97f4f88684d02264f0e309a
...@@ -95,7 +95,7 @@ commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e ...@@ -95,7 +95,7 @@ commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e
[submodule.dune-xt-common] [submodule.dune-xt-common]
remote = git@github.com:dune-community/dune-xt-common.git remote = git@github.com:dune-community/dune-xt-common.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
commit = 263e4997f873692f8aa49627ee051a5df104e5db commit = 111ee6ea9334b68ae841c04ec0b597ad17751fc3
[submodule.dune-xt-data] [submodule.dune-xt-data]
remote = git@github.com:dune-community/dune-xt-data remote = git@github.com:dune-community/dune-xt-data
...@@ -105,12 +105,12 @@ commit = 3e3f3bf06e21cbbf3c0a559891b44c6f5d987d0f ...@@ -105,12 +105,12 @@ commit = 3e3f3bf06e21cbbf3c0a559891b44c6f5d987d0f
[submodule.dune-xt-functions] [submodule.dune-xt-functions]
remote = git@github.com:dune-community/dune-xt-functions.git remote = git@github.com:dune-community/dune-xt-functions.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
commit = f05aa7470ead4150ca7a91894cd2ad77dfcedc46 commit = 17c0f151b54ab54cadb54217f53a8d3220ed9442
[submodule.dune-xt-grid] [submodule.dune-xt-grid]
remote = git@github.com:dune-community/dune-xt-grid.git remote = git@github.com:dune-community/dune-xt-grid.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
commit = 9dcfc1bd1737d3d2ffd1f7a498357ae3c66e72e2 commit = ffe1fde668438fc5a9309f9c4447f2672dd1fa5c
[submodule.dune-xt-la] [submodule.dune-xt-la]
remote = git@github.com:dune-community/dune-xt-la.git remote = git@github.com:dune-community/dune-xt-la.git
......
...@@ -53,15 +53,7 @@ public: ...@@ -53,15 +53,7 @@ public:
{ {
} }
BoundaryDetectorFunctor(const BoundaryDetectorFunctor& other) BoundaryDetectorFunctor(const BoundaryDetectorFunctor& other) = default;
: BaseType(other)
, Propagator(other)
, boundary_info_(other.boundary_info_)
, boundary_type_(other.boundary_type_)
, found_(other.found_)
, res_mutex_()
{
}
virtual void prepare() override final virtual void prepare() override final
{ {
...@@ -103,17 +95,10 @@ protected: ...@@ -103,17 +95,10 @@ protected:
found_ = res; found_ = res;
} }
void add_to_result(size_t res)
{
std::lock_guard<std::mutex>{res_mutex_};
found_ += res;
}
private: private:
const BoundaryInfo<IntersectionType>& boundary_info_; const BoundaryInfo<IntersectionType>& boundary_info_;
const std::shared_ptr<BoundaryType> boundary_type_; const std::shared_ptr<BoundaryType> boundary_type_;
size_t found_; size_t found_;
std::mutex res_mutex_;
}; // class BoundaryDetectorFunctor }; // class BoundaryDetectorFunctor
...@@ -121,4 +106,5 @@ private: ...@@ -121,4 +106,5 @@ private:
} // namespace XT } // namespace XT
} // namespace Dune } // namespace Dune
#endif // DUNE_XT_GRID_FUNCTORS_BOUNDARY_DETECTOR_HH #endif // DUNE_XT_GRID_FUNCTORS_BOUNDARY_DETECTOR_HH
...@@ -182,7 +182,7 @@ struct Dimensions ...@@ -182,7 +182,7 @@ struct Dimensions
box[1][i] = coord_limits[i].max(); box[1][i] = coord_limits[i].max();
} }
return box; return box;
}; }
}; };
template <class GridType> template <class GridType>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment