Commit ff1cc35f authored by Lukas Riedel's avatar Lukas Riedel

Remove unused files and directories from repository

* Remove unused test files.
* Remove unused directories.
* Remove Makefile.am files.
* Clean up CMake source code by deleting out-commented tests.
parent 2d1d9666
......@@ -43,12 +43,10 @@ set(DORIE_EXE_PATH ${PROJECT_BINARY_DIR}/dune/dorie/
# add subdirectories
add_subdirectory("plugins/vendor")
add_subdirectory("m4")
add_subdirectory("cmake/modules")
add_subdirectory("python")
add_subdirectory("doc")
add_subdirectory("dune")
add_subdirectory("lib")
if(DORIE_TESTING)
add_subdirectory("test")
add_subdirectory("doc/cookbook")
......
MODULES = DorieMacros.cmake
modulesdir = $(datadir)/dune/cmake/modules
dist_modules_DATA = ${MODULES}
include $(top_srcdir)/am/global-rules
EXTRA_DIST = CMakeLists.txt
BASEDIR=../..
CURDIR=doc/doxygen
EXTRA_DIST = CMakeLists.txt
include $(top_srcdir)/am/doxygen
include $(top_srcdir)/am/global-rules
install(PROGRAMS dorie.m4 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/aclocal)
dnl -*- autoconf -*-
# Macros needed to find dorie and dependent libraries. They are called by
# the macros in ${top_src_dir}/dependencies.m4, which is generated by
# "dunecontrol autogen"
# Additional checks needed to build dorie
# This macro should be invoked by every module which depends on dorie, as
# well as by dorie itself
AC_DEFUN([DORIE_CHECKS])
# Additional checks needed to find dorie
# This macro should be invoked by every module which depends on dorie, but
# not by dorie itself
AC_DEFUN([DORIE_CHECK_MODULE],
[
DUNE_CHECK_MODULES([dorie],[dorie/dorie.hh])
])
......@@ -26,11 +26,6 @@ add_custom_target(test_run_ref
COMMAND ctest --output-on-failure --tests-regex ^.+_ref_.+$
)
# dorie_add_metaini_test(TARGET dorie_test METAINI reference_2d.mini.in)
# dorie_add_metaini_test(TARGET dorie_test METAINI reference_3d.mini.in)
# dorie_add_metaini_test(TARGET dorie_test METAINI reference_evaporation.mini.in)
# dorie_add_metaini_test(TARGET dorie_test METAINI reference_interpolators.mini.in)
# dorie in parallel
dorie_add_metaini_test(TARGET dorie_test METAINI parallel_reference.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI parallel_reference_compare.mini.in)
......
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = reference_2d
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = reference
_reference.path = {_asset_path}/references/2d/
_reference.abstol = 1e-8
grid.initialLevel = 1
grid.gridType = gmsh, rectangular | expand
grid.cells = 20 20
grid.extensions = 1 1
grid.gridFile = "{_asset_path}/meshes/square.msh"
adaptivity.policy = none
adaptivity.threshold = 5E-8
adaptivity.refinementFraction = 0.05
adaptivity.maxLevel = 7
[richards]
output.fileName = reference_2d | unique name
output.outputPath = reference_2d | unique name
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
parameters.arrayFile = "{_asset_path}/parfields/fft_2d.h5", "{_asset_path}/parfields/fft_2d_miller.h5" | expand distribution
time.end = 1E5
time.maxTimestep = 1E5
time.startTimestep = 1E3
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = reference_3d
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = reference
_reference.path = {_asset_path}/references/3d/
grid.dimensions = 3
grid.initialLevel = 1
grid.gridType = gmsh
grid.extensions = 1 1 1
grid.gridFile = "{_asset_path}/meshes/3dcube.msh"
adaptivity.policy = none
adaptivity.threshold = 1E-6
[richards]
output.fileName = reference_3d | unique name
output.outputPath = reference_3d | unique name
boundary.file = "{_asset_path}/bcs/infiltration_3d.dat"
parameters.arrayFile = "{_asset_path}/parfields/fft_3d.h5", "{_asset_path}/parfields/fft_3d_miller.h5" | expand
parameters.scale = 1 1 1
parameters.offset = 0 0 0
parameters.interpolation = linear
time.end = 1E5
time.maxTimestep = 1E5
time.startTimestep = 1E4
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = reference_evaporation
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = reference
_reference.path = {_asset_path}/references/evaporation/
_reference.abstol = 1e-8
grid.initialLevel = 2
grid.gridType = gmsh, rectangular | expand
grid.cells = 20 20
grid.extensions = 1 1
grid.gridFile = "{_asset_path}/meshes/square.msh"
adaptivity.policy = none
adaptivity.threshold = 1E-7
[richards]
output.fileName = reference_evaporation | unique name
output.outputPath = reference_evaporation | unique name
boundary.file = "{_asset_path}/bcs/infiltration_evaporation_2d.dat"
parameters.arrayFile = "{_asset_path}/parfields/fft_2d.h5"
time.end = 1E6
time.maxTimestep = 1E6
time.startTimestep = 1E3
\ No newline at end of file
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = reference_interpolators
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = reference
_reference.path = {_asset_path}/references/interpolators/
_reference.abstol = 0.05
grid.initialLevel = 2
grid.gridType = gmsh, rectangular | expand
grid.cells = 20 20
grid.extensions = 1 1
grid.gridFile = "{_asset_path}/meshes/square.msh"
adaptivity.policy = waterFlux
adaptivity.threshold = 7E-8
[richards]
output.fileName = reference_interpolators | unique name
output.outputPath = reference_interpolators | unique name
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
parameters.arrayFile = "{_asset_path}/parfields/fft_2d_miller.h5"
parameters.interpolation = linear, cubic | expand
time.end = 1E5
time.maxTimestep = 1E5
time.startTimestep = 1E3
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
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