Commit a8260b27 authored by Lukas Riedel's avatar Lukas Riedel

changed module structure: moved executables into 'src' directory

parent 1691c526
......@@ -34,6 +34,7 @@ dune_require_cxx_standard(MODULE "dorie" VERSION 14)
# add subdirectories
add_subdirectory("bin")
add_subdirectory("src")
add_subdirectory("m4")
add_subdirectory("dune")
add_subdirectory("python")
......
......@@ -22,7 +22,7 @@ MPIEXEC_POSTFLAGS = "@MPIEXEC_POSTFLAGS@"
#
# set some paths
DORIE_EXECUTABLE = os.path.join(DORIEDIR, "dune/dorie/dorie")
DORIE_EXECUTABLE = os.path.join(DORIEDIR, "src/dorie")
PARAMETERDIR = os.path.join(DORIEDIR, "doc/default_files")
DORIE_PYTHON = os.path.join(DORIEDIR, "dune-env")
MPIRUN = lambda nproc, exe, *args: [k for k in [MPIEXEC,MPIEXEC_NUMPROC_FLAG,str(nproc),MPIEXEC_PREFLAG,str(exe),MPIEXEC_POSTFLAGS] + list(args) if k]
......
add_executable("dorie-rfg" dorie-rfg.cc)
target_link_dune_default_libraries("dorie-rfg")
add_executable("dorie" dorie.cc)
target_link_dune_default_libraries("dorie")
......@@ -22,7 +22,7 @@ MPIEXEC_PREFLAG = "@MPIEXEC_PREFLAG@"
MPIEXEC_POSTFLAGS = "@MPIEXEC_POSTFLAGS@"
#
RFG_EXEC = os.path.join(DORIEDIR, "dune/dorie-rfg/dorie-rfg")
RFG_EXEC = os.path.join(DORIEDIR, "src/dorie-rfg")
MPIRUN = lambda nproc, exe, *args: [k for k in [MPIEXEC,MPIEXEC_NUMPROC_FLAG,str(nproc),MPIEXEC_PREFLAG,str(exe),MPIEXEC_POSTFLAGS] + list(args) if k]
if __name__ == "__main__":
......
add_executable("dorie-rfg" dorie-rfg.cc)
target_link_dune_default_libraries("dorie-rfg")
add_executable("dorie" dorie.cc)
target_link_dune_default_libraries("dorie")
\ No newline at end of file
......@@ -26,16 +26,16 @@
#include <dune/grid/common/gridenums.hh>
// dorie-rfg includes
#include "datatypes.hh"
#include "Vector.hh"
#include "tools.hh"
#include <dune/dorie-rfg/datatypes.hh>
#include <dune/dorie-rfg/Vector.hh>
#include <dune/dorie-rfg/tools.hh>
#if HDF5_PARALLEL
#include "H5Tools_parallel.hh"
#include <dune/dorie-rfg/H5Tools_parallel.hh>
#else
#include "H5Tools_sequential.hh"
#include <dune/dorie-rfg/H5Tools_sequential.hh>
#endif
#include "FieldData.hh"
#include "random_field_generator.hh"
#include <dune/dorie-rfg/FieldData.hh>
#include <dune/dorie-rfg/random_field_generator.hh>
int main(int argc, char** argv)
{
......
// -*- tab-width: 4; indent-tabs-mode: nil -*-
/** \file
// -*- tab-width: 2; indent-tabs-mode: nil -*-
*/
#include "dorie.hh" // System and DUNE Headers
#include "util_typedefs.hh"
#include "util_vtk_adapters.hh"
#include "util_grid_creator.hh"
#include "util_boundary_condition.hh"
#include "util_controller.hh"
#include "util_adaptivity.hh"
#include "util_h5tools.hh"
#include "richards_initial.hh"
#include "richards_boundary.hh"
#include "richards_source.hh"
#include "util_interpolator.hh"
#include "param_base.hh"
#include "param_van_genuchten.hh"
#include "param_factory.hh"
#include "operator_DG.hh"
#include "operator_error_indicator.hh"
#include "dune_implicitonestep.hh"
#include "solver.hh"
#include "solver_prep.hh"
#include <dune/dorie/dorie.hh> // System and DUNE Headers
#include <dune/dorie/util_typedefs.hh>
#include <dune/dorie/util_vtk_adapters.hh>
#include <dune/dorie/util_grid_creator.hh>
#include <dune/dorie/util_boundary_condition.hh>
#include <dune/dorie/util_controller.hh>
#include <dune/dorie/util_adaptivity.hh>
#include <dune/dorie/util_h5tools.hh>
#include <dune/dorie/richards_initial.hh>
#include <dune/dorie/richards_boundary.hh>
#include <dune/dorie/richards_source.hh>
#include <dune/dorie/util_interpolator.hh>
#include <dune/dorie/param_base.hh>
#include <dune/dorie/param_van_genuchten.hh>
#include <dune/dorie/param_factory.hh>
#include <dune/dorie/operator_DG.hh>
#include <dune/dorie/operator_error_indicator.hh>
#include <dune/dorie/dune_implicitonestep.hh>
#include <dune/dorie/solver.hh>
#include <dune/dorie/solver_prep.hh>
//===============================================================
......
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