From 3d6a034c9e2a1b53f2d28221aded346fd36b1134 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 5 Mar 2016 22:17:59 +0100 Subject: [PATCH] added build directory to ignore list and simplified dir layout --- .gitignore | 1 + build_FEM.sh | 8 ++++---- build_spectral.sh | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ea92bb425..c5b6e9866 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *.bak *~ PRIVATE +build diff --git a/build_FEM.sh b/build_FEM.sh index 0def3760a..9c154670b 100755 --- a/build_FEM.sh +++ b/build_FEM.sh @@ -16,10 +16,10 @@ if [ ! -d build ]; then fi cd build if [ -d build_FEM ] ; then - rm -rf build_FEM + rm -rf FEM fi -mkdir build_FEM -cd build_FEM +mkdir FEM +cd FEM ## # CMake call @@ -43,4 +43,4 @@ echo echo "Please move to the build directory using" echo " cd build/build_spectral" echo "Using the following command to build DAMASK spectral solver" -echo " make clean all install" \ No newline at end of file +echo " make clean all install" diff --git a/build_spectral.sh b/build_spectral.sh index a48d8d360..a26175b65 100755 --- a/build_spectral.sh +++ b/build_spectral.sh @@ -15,11 +15,11 @@ if [ ! -d build ]; then mkdir build fi cd build -if [ -d build_spectral ] ; then - rm -rf build_spectral +if [ -d build ] ; then + rm -rf build fi -mkdir build_spectral -cd build_spectral +mkdir build +cd build ## # CMake call @@ -41,6 +41,6 @@ cmake -D PETSC_DIR=${PETSC_DIR} \ echo echo "Please move to the build directory using" -echo " cd build/build_spectral" +echo " cd build/spectral" echo "Using the following command to build DAMASK spectral solver" -echo " make clean all install" \ No newline at end of file +echo " make clean all install"