From 691041fbcfd1600922635fc6f1b92fc7d334d40b Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 31 May 2014 02:13:05 +0200
Subject: [PATCH] [Build] Rename problem
---
.gitignore | 2 +-
configure.ac | 2 +-
src/Makefile.am | 15 ++++++---------
.../boundaryconditions.py} | 0
src/{ => sliding-block-data}/mybody.hh | 4 ++--
src/{ => sliding-block-data}/mygeometry.hh | 4 ++--
.../myglobalfrictiondata.hh | 4 ++--
src/{ => sliding-block-data}/mygrid.hh | 4 ++++
.../parset.cfg} | 0
src/{one-body-sample.cc => sliding-block.cc} | 19 +++++++++----------
10 files changed, 27 insertions(+), 27 deletions(-)
rename src/{one-body-sample.py => sliding-block-data/boundaryconditions.py} (100%)
rename src/{ => sliding-block-data}/mybody.hh (95%)
rename src/{ => sliding-block-data}/mygeometry.hh (88%)
rename src/{ => sliding-block-data}/myglobalfrictiondata.hh (92%)
rename src/{ => sliding-block-data}/mygrid.hh (91%)
rename src/{one-body-sample.parset => sliding-block-data/parset.cfg} (100%)
rename src/{one-body-sample.cc => sliding-block.cc} (97%)
diff --git a/.gitignore b/.gitignore
index b76375a1..c68e2924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,4 @@
/test-driver
Makefile
Makefile.in
-src/one-body-sample-?D
+src/sliding-block-?D
diff --git a/configure.ac b/configure.ac
index f1c6b266..0ff34a54 100644
--- a/configure.ac
+++ b/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
diff --git a/src/Makefile.am b/src/Makefile.am
index b648151d..b8a7ad36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,17 @@
-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 = \
diff --git a/src/one-body-sample.py b/src/sliding-block-data/boundaryconditions.py
similarity index 100%
rename from src/one-body-sample.py
rename to src/sliding-block-data/boundaryconditions.py
diff --git a/src/mybody.hh b/src/sliding-block-data/mybody.hh
similarity index 95%
rename from src/mybody.hh
rename to src/sliding-block-data/mybody.hh
index 185b53d3..e21d9f1a 100644
--- a/src/mybody.hh
+++ b/src/sliding-block-data/mybody.hh
@@ -1,5 +1,5 @@
-#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>
diff --git a/src/mygeometry.hh b/src/sliding-block-data/mygeometry.hh
similarity index 88%
rename from src/mygeometry.hh
rename to src/sliding-block-data/mygeometry.hh
index 42f1fa60..25bd7736 100644
--- a/src/mygeometry.hh
+++ b/src/sliding-block-data/mygeometry.hh
@@ -1,5 +1,5 @@
-#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>
diff --git a/src/myglobalfrictiondata.hh b/src/sliding-block-data/myglobalfrictiondata.hh
similarity index 92%
rename from src/myglobalfrictiondata.hh
rename to src/sliding-block-data/myglobalfrictiondata.hh
index 9215edc5..f511c13e 100644
--- a/src/myglobalfrictiondata.hh
+++ b/src/sliding-block-data/myglobalfrictiondata.hh
@@ -1,5 +1,5 @@
-#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>
diff --git a/src/mygrid.hh b/src/sliding-block-data/mygrid.hh
similarity index 91%
rename from src/mygrid.hh
rename to src/sliding-block-data/mygrid.hh
index 964c82dc..732bff45 100644
--- a/src/mygrid.hh
+++ b/src/sliding-block-data/mygrid.hh
@@ -1,3 +1,6 @@
+#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
diff --git a/src/one-body-sample.parset b/src/sliding-block-data/parset.cfg
similarity index 100%
rename from src/one-body-sample.parset
rename to src/sliding-block-data/parset.cfg
diff --git a/src/one-body-sample.cc b/src/sliding-block.cc
similarity index 97%
rename from src/one-body-sample.cc
rename to src/sliding-block.cc
index ea51fa26..d3872be8 100644
--- a/src/one-body-sample.cc
+++ b/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);
}
--
GitLab