[Build] Rename problem

.gitignore

@@ -26,4 +26,4 @@
 /test-driver
 Makefile
 Makefile.in
-src/one-body-sample-?D
+src/sliding-block-?D

configure.ac

@@ -4,7 +4,7 @@ AC_PREREQ(2.50)
 DUNE_AC_INIT # gets module version from dune.module file
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES
-AC_CONFIG_SRCDIR([src/one-body-sample.cc])
+AC_CONFIG_SRCDIR([dune-tectonic.pc.in])
 AC_CONFIG_HEADERS([config.h])
 
 DUNE_CHECK_ALL

src/Makefile.am

-bin_PROGRAMS = \
-	one-body-sample-2D
+bin_PROGRAMS = sliding-block-2D
 
-SOURCES = \
+common_sources = \
 	assemblers.cc \
 	boundary_writer.cc \
 	friction_writer.cc \
 	solverfactory.cc \
-	one-body-sample.cc \
 	timestepping.cc \
 	vtk.cc
 
-## 2D
-one_body_sample_2D_SOURCES = $(SOURCES)
-
-one_body_sample_2D_CPPFLAGS = \
-	$(AM_CPPFLAGS) -Dsrcdir=\"$(abs_srcdir)\" -DDIM=2
+sliding_block_2D_SOURCES = $(common_sources) sliding-block.cc
+sliding_block_2D_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-Ddatadir=\"$(abs_srcdir)/sliding-block-data/\" -DDIM=2
 
 # Some are for clang, others are for gcc
 AM_CXXFLAGS = \

src/mybody.hh → src/sliding-block-data/mybody.hh

-#ifndef MY_BODY_HH
-#define MY_BODY_HH
+#ifndef SRC_SLIDING_BLOCK_DATA_MYBODY_HH
+#define SRC_SLIDING_BLOCK_DATA_MYBODY_HH
 
 #include <dune/common/fvector.hh>
 

src/mygeometry.hh → src/sliding-block-data/mygeometry.hh

-#ifndef MY_GEOMETRY_HH
-#define MY_GEOMETRY_HH
+#ifndef SRC_SLIDING_BLOCK_DATA_MYGEOMETRY_HH
+#define SRC_SLIDING_BLOCK_DATA_MYGEOMETRY_HH
 
 #include <dune/common/fassign.hh>
 #include <dune/common/fvector.hh>

src/myglobalfrictiondata.hh → src/sliding-block-data/myglobalfrictiondata.hh

-#ifndef MY_GLOBAL_FRICTION_DATA_HH
-#define MY_GLOBAL_FRICTION_DATA_HH
+#ifndef SRC_SLIDING_BLOCK_DATA_MYGLOBALFRICTIONDATA_HH
+#define SRC_SLIDING_BLOCK_DATA_MYGLOBALFRICTIONDATA_HH
 
 #include <dune/common/function.hh>
 #include <dune/common/fvector.hh>

src/mygrid.hh → src/sliding-block-data/mygrid.hh

+#ifndef SRC_SLIDING_BLOCK_DATA_MYGRID_HH
+#define SRC_SLIDING_BLOCK_DATA_MYGRID_HH
+
 #include <dune/grid/common/gridfactory.hh>
 
 #include <dune/fufem/boundarypatch.hh>
@@ -32,3 +35,4 @@ template <class GridView, class MyGeometry> class MyFaces {
   BoundaryPatch<GridView> lower;
   BoundaryPatch<GridView> upper;
 };
+#endif

src/one-body-sample.cc → src/sliding-block.cc

@@ -12,8 +12,8 @@
 #undef HAVE_IPOPT
 #endif
 
-#ifndef srcdir
-#error srcdir unset
+#ifndef datadir
+#error datadir unset
 #endif
 
 #ifndef DIM
@@ -74,10 +74,10 @@
 #include "enum_verbosity.cc"
 #include "enums.hh"
 #include "friction_writer.hh"
-#include "mybody.hh"
-#include "mygeometry.hh"
-#include "myglobalfrictiondata.hh"
-#include "mygrid.hh"
+#include "sliding-block-data/mybody.hh"
+#include "sliding-block-data/mygeometry.hh"
+#include "sliding-block-data/myglobalfrictiondata.hh"
+#include "sliding-block-data/mygrid.hh"
 #include "solverfactory.hh"
 #include "state.hh"
 #include "timestepping.hh"
@@ -88,14 +88,13 @@ void initPython() {
   Python::start();
 
   Python::run("import sys");
-  Python::run("sys.path.append('" srcdir "')");
+  Python::run("sys.path.append('" datadir "')");
 }
 
 int main(int argc, char *argv[]) {
   try {
     Dune::ParameterTree parset;
-    Dune::ParameterTreeParser::readINITree(srcdir "/one-body-sample.parset",
-                                           parset);
+    Dune::ParameterTreeParser::readINITree(datadir "/parset.cfg", parset);
     Dune::ParameterTreeParser::readOptions(argc, argv, parset);
 
     MyGeometry const myGeometry;
@@ -140,7 +139,7 @@ int main(int argc, char *argv[]) {
     FunctionMap functions;
     {
       initPython();
-      Python::import("one-body-sample")
+      Python::import("boundaryconditions")
           .get("Functions")
           .toC<typename FunctionMap::Base>(functions);
     }