Commit c8056208 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[multidomain] Adjust types to reflect deprecated and removed types.

(reviewed and tested by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13973 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 60f5ce07
......@@ -312,13 +312,13 @@ public:
/*!
* \brief Returns the ID of the first domain
*/
const typename MultiDomainGrid::SubDomainType sdID1() const
const typename MultiDomainGrid::SubDomainIndex sdID1() const
{ return sdID1_; }
/*!
* \brief Returns the ID of the second domain
*/
const typename MultiDomainGrid::SubDomainType sdID2() const
const typename MultiDomainGrid::SubDomainIndex sdID2() const
{ return sdID2_; }
/*!
......@@ -455,8 +455,8 @@ private:
const MultiDomainGridView mdGridView_;
VertexMapper mdVertexMapper_;
typename MultiDomainGrid::SubDomainType sdID1_;
typename MultiDomainGrid::SubDomainType sdID2_;
typename MultiDomainGrid::SubDomainIndex sdID1_;
typename MultiDomainGrid::SubDomainIndex sdID2_;
const SubDomainGrid& sdGrid1_;
const SubDomainGrid& sdGrid2_;
......
......@@ -68,7 +68,7 @@ SET_PROP(TwoCNIStokesTwoPTwoCNIProblem, Grid)
#elif HAVE_ALUGRID || HAVE_DUNE_ALUGRID
typedef typename Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming> type;
#else
#error Required UG or ALUGrid.
typedef typename Dune::YaspGrid<2> type;
#endif
};
......@@ -801,8 +801,8 @@ public:
{ return this->sdProblem2(); }
private:
typename MDGrid::SubDomainType stokes2cni_;
typename MDGrid::SubDomainType twoPtwoCNI_;
typename MDGrid::SubDomainIndex stokes2cni_;
typename MDGrid::SubDomainIndex twoPtwoCNI_;
unsigned counter_;
unsigned freqRestart_;
......
......@@ -16,4 +16,4 @@ add_dumux_test(test_2cnistokes2p2cni_2pm test_2cnistokes2p2cni test_2cnistokes2p
${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input
)
\ No newline at end of file
)
......@@ -66,7 +66,7 @@ SET_PROP(TwoCStokesTwoPTwoCProblem, Grid)
#elif HAVE_ALUGRID || HAVE_DUNE_ALUGRID
typedef typename Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming> type;
#else
#error Required UG or ALUGrid.
typedef typename Dune::YaspGrid<2> type;
#endif
};
......@@ -774,8 +774,8 @@ public:
{ return this->sdProblem2(); }
private:
typename MDGrid::SubDomainType stokes2c_;
typename MDGrid::SubDomainType twoPtwoC_;
typename MDGrid::SubDomainIndex stokes2c_;
typename MDGrid::SubDomainIndex twoPtwoC_;
unsigned counter_;
unsigned freqRestart_;
......
......@@ -16,4 +16,4 @@ add_dumux_test(test_2cstokes2p2c_2pm test_2cstokes2p2c test_2cstokes2p2c.cc
${CMAKE_CURRENT_BINARY_DIR}/2p2c-00007.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input
)
\ No newline at end of file
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment