Skip to content
Snippets Groups Projects

adjust boilerplate to non-overlapping fixes

Merged René Heß requested to merge rhess/dune-pdelab:master into master

Merge request reports

Merged by avatar (Apr 18, 2025 2:39pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
699 692 };
700 693
694 // template specialization for nonoverlapping case
695 template<typename T, typename N, unsigned int degree, typename BCType,
696 Dune::GeometryType::BasicType gt, MeshType mt,
697 typename VBET>
698 class CGSpace<T, N, degree, BCType, gt, mt, SolverCategory::nonoverlapping, VBET> {
699 public:
700
701 // export types
702 typedef T Grid;
703 typedef typename T::LeafGridView GV;
704 typedef typename T::ctype ctype;
705 typedef typename Dune::PDELab::NonOverlappingEntitySet<GV> ES;
706 static const int dim = T::dimension;
707 static const int dimworld = T::dimensionworld;
  • dimensionworld is deprecated in dune-grid-2.4 and needs to be replaced by coorddimension. I think that this needs to be changed at more places.

  • 1298 1412 {
    1299 1413 public:
    1300 1414 // export types
    1301 typedef istl::BCRSMatrixBackend<> MBE;
    1415 typedef ISTLMatrixBackend MBE;
    1302 1416 typedef Dune::PDELab::GridOperator<typename FS::GFS,typename FS::GFS,LOP,MBE,
    1303 1417 typename FS::NT,typename FS::NT,typename FS::NT,
    1304 1418 typename FS::CC,typename FS::CC> GO;
    1305 1419 typedef typename GO::Jacobian MAT;
    1306 1420
    1307 DUNE_DEPRECATED_MSG("This constructor is deprecated and will removed after the release of PDELab 2.4. Use GalerkinGlobalAssembler(const FS& fs, LOP& lop, const std::size_t nonzeros) instead! The number of nonzeros can be determined with patternStatistics()!")
    • The deprecation of the old constructor and the introduction of the new one must not be removed. Same thing above for the istl::BCRSMatrixBackend.

  • 1525 1519 {
    1526 1520 public:
    1527 1521 // export types
    1528 typedef istl::BCRSMatrixBackend<> MBE;
  • 1525 1519 {
    1526 1520 public:
    1527 1521 // export types
    1528 typedef istl::BCRSMatrixBackend<> MBE;
    1522 typedef ISTLMatrixBackend MBE;
    1529 1523 typedef Dune::PDELab::GridOperator<typename FSU::GFS,typename FSV::GFS,LOP,MBE,
    1530 1524 typename FSU::NT,typename FSU::NT,typename FSU::NT,
    1531 1525 typename FSU::CC,typename FSV::CC> GO;
    1532 1526 typedef typename GO::Jacobian MAT;
    1533 1527
    1534 DUNE_DEPRECATED_MSG("This constructor is deprecated and will removed after the release of PDELab 2.4. Use GalerkinGlobalAssembler(const FSU& fsu, const FSV& fsv, LOP& lop, const std::size_t nonzeros) instead! The number of nonzeros can be determined with patternStatistics()!")
  • Even if GitLab shows that this branch can be merged automatically it cannot go to the master in the current state because the deprecated ISTLMatrixBackend is still present. My proposition is that the current pdelab master is merged into this branch.

    Edited by Marian Piatkowski
  • René Heß Added 14 commits:

    Added 14 commits:

    • a2a47b30...f13fc735 - 11 commits from branch pdelab:master
    • 92bb6607 - adjust boilerplate to non-overlapping fixes
    • 7ccd7a4c - add test for nonoverlappingsinglephaseflow using boilerplate
    • 41914df5 - include matrix backend changes from pdelab master
  • René Heß Added 1 commit:

    Added 1 commit:

    • 5545faa3 - update boilerplate test to new matrix backend
  • Thanks for fixing the issues with the original request! :thumbsup:

  • mentioned in commit d426da0d

  • Steffen Müthing Status changed to merged

    Status changed to merged

  • Please register or sign in to reply
    Loading