Created new CMake files and updated headers to new structure

Signed-off-by: Santiago Ospina De Los Ríos's avatarSantiago Ospina <santiago.ospina@iup.uni-heidelberg.de>
parent a3af99be
add_subdirectory(interface)
add_subdirectory(solver)
add_subdirectory(impl)
add_subdirectory("common")
add_subdirectory("model")
if(dune-testtools_FOUND)
add_subdirectory("test")
endif()
......
#install headers
install(FILES
boundary_condition.hh
grid_creator.hh
grid_function_writer.hh
h5tools.hh
interpolator.hh
setup_inifile.hh
simulation_base.hh
time_controller.hh
typedefs.hh
util.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/dorie/common)
\ No newline at end of file
......@@ -10,7 +10,7 @@
#include <dune/common/exceptions.hh>
#include "util_typedefs.hh"
#include <dune/dorie/common/typedefs.hh>
namespace Dune{
namespace Dorie{
......
......@@ -16,11 +16,9 @@
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/uggrid.hh>
#include "interface/richards_simulation.hh"
#include "solver/util_grid_creator.hh"
#include "interface/setup_inifile.hh"
// #include <dune/dorie/dorie.hh> // System and DUNE Headers
#include "common/grid_creator.hh"
#include "common/setup_inifile.hh"
#include "model/richards/richards.hh"
//===============================================================
......
add_subdirectory("richards")
\ No newline at end of file
add_subdirectory("adaptivity")
add_subdirectory("adapters")
add_subdirectory("impl")
add_subdirectory("parametrization")
#install headers
install(FILES
flow_boundary.hh
flow_initial.hh
flow_source.hh
knofu.hh
local_operator.hh
richards.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/dorie/model/richards)
\ No newline at end of file
#install headers
install(FILES
conductivity.hh
discrete_grid_function_gradient.hh
saturation.hh
water_content.hh
water_flux.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/dorie/model/richards)
\ No newline at end of file
#ifndef DUNE_DORIE_CONDUCTIVITY_ADAPTER_HH
#define DUNE_DORIE_CONDUCTIVITY_ADAPTER_HH
#include "../param_richards.hh"
#include <dune/pdelab/common/function.hh>
namespace Dune{
namespace Dorie{
......
#ifndef DUNE_DORIE_SATURATION_ADAPTER_HH
#define DUNE_DORIE_SATURATION_ADAPTER_HH
#include <dune/pdelab/common/function.hh>
namespace Dune{
namespace Dorie{
......
#ifndef DUNE_DORIE_WATER_CONTENT_ADAPTER_HH
#define DUNE_DORIE_WATER_CONTENT_ADAPTER_HH
#include <dune/pdelab/common/function.hh>
namespace Dune{
namespace Dorie{
......
#ifndef DUNE_DORIE_RICHARDS_WATER_FLUX_ADAPTER_HH
#define DUNE_DORIE_RICHARDS_WATER_FLUX_ADAPTER_HH
#include "discrete_grid_function_gradient.hh"
#include <dune/pdelab/common/function.hh>
#include <dune/dorie/model/richards/adapters/discrete_grid_function_gradient.hh>
namespace Dune{
namespace Dorie{
......
#install headers
install(FILES
handler.hh
operator_error_indicator.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/dorie/model/richards)
\ No newline at end of file
#ifndef DUNE_DORIE_ADAPTIVITY_HH
#define DUNE_DORIE_ADAPTIVITY_HH
#ifndef DUNE_DORIE_ADAPTIVITY_HANDLER_HH
#define DUNE_DORIE_ADAPTIVITY_HANDLER_HH
#include <iostream>
#include <string>
......@@ -16,7 +16,7 @@
#include <dune/pdelab/backend/istl.hh>
#include <dune/pdelab/adaptivity/adaptivity.hh>
#include "../solver/operator_error_indicator.hh"
#include <dune/dorie/model/richards/adaptivity/operator_error_indicator.hh>
namespace Dune{
namespace Dorie{
......@@ -322,4 +322,4 @@ public:
} // namespace Dune
#endif // DUNE_DORIE_ADAPTIVITY_HH
#endif // DUNE_DORIE_ADAPTIVITY_HANDLER_HH
......@@ -15,7 +15,7 @@
#include <dune/pdelab/localoperator/defaultimp.hh>
#include <dune/pdelab/finiteelement/localbasiscache.hh>
#include "operator_DG.hh"
#include <dune/dorie/model/richards/local_operator.hh>
namespace Dune {
namespace Dorie {
......
......@@ -7,7 +7,7 @@
#include <dune/common/exceptions.hh>
#include <dune/common/parametertree.hh>
#include "util_boundary_condition.hh"
#include <dune/dorie/common/boundary_condition.hh>
namespace Dune{
namespace Dorie{
......
#ifndef DUNE_DORIE_IMPL_HH
#define DUNE_DORIE_IMPL_HH
#ifndef DUNE_DORIE_RICHARDS_IMPL_HH
#define DUNE_DORIE_RICHARDS_IMPL_HH
#include <dune/grid/yaspgrid.hh>
#include <dune/geometry/type.hh>
......@@ -12,4 +12,4 @@ using Geo = Dune::GeometryType::BasicType;
}
}
#endif // DUNE_DORIE_IMPL_HH
\ No newline at end of file
#endif // DUNE_DORIE_RICHARDS_IMPL_HH
\ No newline at end of file
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/model/richards/impl/impl.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune{
namespace Dorie{
......
......@@ -2,8 +2,8 @@
#include "config.h"
#endif
#include <dune/dorie/impl/impl.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include "impl.hh"
#include "../richards.cc"
namespace Dune{
namespace Dorie{
......
......@@ -21,7 +21,7 @@
#include <dune/pdelab/localoperator/defaultimp.hh>
#include <dune/pdelab/finiteelement/localbasiscache.hh>
#include "util_typedefs.hh"
#include <dune/dorie/common/typedefs.hh>
namespace Dune {
namespace Dorie {
......
#install headers
install(FILES
base.hh
factorty.hh
interface.hh
mualem_van_genuchten.hh
richards.hh
van_genuchten.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/dorie/model/richards)
\ No newline at end of file
......@@ -9,7 +9,7 @@
#include <dune/common/parametertree.hh>
#include <dune/common/parallel/mpihelper.hh>
#include "util_h5tools.hh"
#include <dune/dorie/common/h5tools.hh>
namespace Dune {
namespace Dorie {
......
......@@ -9,7 +9,7 @@
#include <dune/common/parametertree.hh>
#include <dune/common/parallel/mpihelper.hh>
#include "param_van_genuchten.hh"
#include <dune/dorie/model/richards/parametrization/van_genuchten.hh>
namespace Dune {
namespace Dorie {
......
......@@ -11,8 +11,8 @@
#include <dune/common/exceptions.hh>
#include <dune/grid/common/mcmgmapper.hh>
#include <dune/dorie/solver/param_richards.hh>
#include <dune/dorie/solver/param_mvg.hh>
#include <dune/dorie/model/richards/parametrization/richards.hh>
#include <dune/dorie/model/richards/parametrization/mualem_van_genuchten.hh>
namespace Dune {
namespace Dorie {
......
......@@ -5,7 +5,7 @@
#include <functional>
#include <string>
#include <dune/dorie/solver/param_richards.hh>
#include <dune/dorie/model/richards/parametrization/richards.hh>
namespace Dune {
namespace Dorie {
......
......@@ -8,7 +8,7 @@
#include <dune/common/parametertree.hh>
#include <dune/common/parallel/mpihelper.hh>
#include "param_base.hh"
#include <dune/dorie/model/richards/parametrization/base.hh>
namespace Dune {
namespace Dorie {
......
#include "richards_simulation.hh"
#include <dune/dorie/model/richards/richards.hh>
namespace Dune{
namespace Dorie{
......
......@@ -13,24 +13,27 @@
#include <dune/pdelab/gridoperator/onestep.hh>
#include <dune/pdelab/newton/newton.hh>
#include "simulation_base.hh"
#include "util.hh"
#include "adaptivity.hh"
#include "../solver/util_interpolator.hh"
#include "../solver/param_base.hh"
#include "../solver/param_factory.hh"
#include "../solver/param_interface.hh"
#include "../solver/richards_initial.hh"
#include "../solver/richards_boundary.hh"
#include "../solver/richards_source.hh"
#include "../solver/operator_DG.hh"
#include "../solver/util_controller.hh"
#include "../solver/util_writer.hh"
#include "../solver/adapters/water_content.hh"
#include "../solver/adapters/saturation.hh"
#include "../solver/adapters/water_flux.hh"
#include "../solver/adapters/conductivity.hh"
#include <dune/dorie/common/simulation_base.hh>
#include <dune/dorie/common/util.hh>
#include <dune/dorie/common/interpolator.hh>
#include <dune/dorie/common/time_controller.hh>
#include <dune/dorie/common/grid_function_writer.hh>
#include <dune/dorie/model/richards/adaptivity/handler.hh>
#include <dune/dorie/model/richards/parametrization/base.hh>
#include <dune/dorie/model/richards/parametrization/factory.hh>
#include <dune/dorie/model/richards/parametrization/interface.hh>
#include <dune/dorie/model/richards/adapters/water_content.hh>
#include <dune/dorie/model/richards/adapters/saturation.hh>
#include <dune/dorie/model/richards/adapters/water_flux.hh>
#include <dune/dorie/model/richards/adapters/conductivity.hh>
#include <dune/dorie/model/richards/flow_initial.hh>
#include <dune/dorie/model/richards/flow_boundary.hh>
#include <dune/dorie/model/richards/flow_source.hh>
#include <dune/dorie/model/richards/local_operator.hh>
#ifndef DUNE_DORIE_RICHARDS_IMPL_HH
#include <dune/dorie/model/richards/richards.cc>
#endif
namespace Dune{
namespace Dorie{
......
......@@ -9,8 +9,8 @@ except NameError:
pass
# paths set by cmake
DORIEDIR = "/Users/lriedel/dune/dorie/build-cmake"
MPIEXEC = "/usr/local/bin/mpiexec"
DORIEDIR = "/home/saospina/Codes/DUNE_INSTALL/Debug/dorie"
MPIEXEC = "/usr/bin/mpiexec"
MPIEXEC_NUMPROC_FLAG = "-n"
MPIEXEC_PREFLAG = ""
MPIEXEC_POSTFLAGS = ""
......
Markdown is supported
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