Skip to content
Snippets Groups Projects
Commit e61ad85d authored by Marian Piatkowski's avatar Marian Piatkowski
Browse files

[Cleanup] synchronize files to release branch

parent 675a7b02
No related branches found
No related tags found
No related merge requests found
......@@ -55,6 +55,9 @@ namespace Dune {
template<typename I>
class IntersectionGeometry
{
private:
const I& i;
const unsigned int index;
public:
//! \todo Please doc me!
typedef typename I::Geometry Geometry;
......@@ -212,7 +215,19 @@ namespace Dune {
/*! @brief return EntityPointer to the Entity on the inside of this
intersection. That is the Entity where we started this .
*/
Entity inside() const
#ifdef DOXYGEN
Entity
#else
typename std::conditional<
std::is_same<
decltype(i.inside()),
Entity
>::value,
Entity,
EntityPointer
>::type
#endif
inside() const
{
return i.inside();
}
......@@ -220,7 +235,7 @@ namespace Dune {
/*! @brief return EntityPointer to the Entity on the inside of this
intersection. That is the Entity where we started this .
*/
Entity insideHostEntity() const
EntityPointer insideHostEntity() const
{
DUNE_THROW(Dune::Exception,"This should never be called.");
return i.inside();
......@@ -232,7 +247,19 @@ namespace Dune {
@warning Don't call this method if there is no neighboring Entity
(neighbor() returns false). In this case the result is undefined.
*/
Entity outside() const
#ifdef DOXYGEN
Entity
#else
typename std::conditional<
std::is_same<
decltype(i.inside()),
Entity
>::value,
Entity,
EntityPointer
>::type
#endif
outside() const
{
return i.outside();
}
......@@ -247,10 +274,6 @@ namespace Dune {
{
return index;
}
private:
const I& i;
const unsigned int index;
};
}
......
set(gridoperatordir ${CMAKE_INSTALL_INCLUDEDIR}/dune/pdelab/gridoperator)
set(SUBDIRS
common
default
onestep
multistep
)
add_subdirectory(common)
add_subdirectory(default)
add_subdirectory(multistep)
add_subdirectory(onestep)
set(gridoperator_HEADERS
gridoperator.hh
onestep.hh
multistep.hh
)
# include not needed for CMake
# include $(top_srcdir)/am/global-rules
install(FILES ${gridoperator_HEADERS} DESTINATION ${gridoperatordir})
foreach(i ${SUBDIRS})
if(${i} STREQUAL "test")
set(opt EXCLUDE_FROM_ALL)
endif(${i} STREQUAL "test")
add_subdirectory(${i} ${opt})
unset(opt)
endforeach(i ${SUBDIRS})
install(FILES gridoperator.hh
multistep.hh
onestep.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/pdelab/gridoperator)
// -*- tab-width: 2; indent-tabs-mode: nil -*-
// vi: set et ts=2 sw=2 sts=2:
#ifndef DUNE_PDELAB_INSTATIONARY_UTILITIES_HH
#define DUNE_PDELAB_INSTATIONARY_UTILITIES_HH
#include <iostream>
#include <ostream>
#include <vector>
#include <stdio.h>
namespace Dune {
namespace PDELab {
/**
* @addtogroup OneStepMethod
* @{
*/
class FilenameHelper
{
public:
FilenameHelper(const char *basename_, int i_=0)
: i(i_)
{
sprintf(basename,"%s",basename_);
}
FilenameHelper(const std::string & basename_, int i_=0)
: i(i_)
{
sprintf(basename,"%s",basename_.c_str());
}
const char *getName (int i_)
{
sprintf(fname,"%s-%05d",basename,i_);
return fname;
}
const char *getName ()
{
sprintf(fname,"%s-%05d",basename,i);
return fname;
}
void increment ()
{
i++;
}
private:
char fname[255];
char basename[255];
int i;
};
/** @} */
} // end namespace Dune
} // end namespace PDELab
#endif
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