Add missing parts.

simphony · Aug 31, 2016 · a3ba550 · a3ba550
1 parent 0f86606
commit a3ba550
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 7 deletions.
diff --git a/simliggghts/bench/util.py → bench/util.py b/simliggghts/bench/util.py → bench/util.py
diff --git a/simliggghts/bench/wrapper_bench.py → bench/wrapper_bench.py b/simliggghts/bench/wrapper_bench.py → bench/wrapper_bench.py
diff --git a/install_external.sh b/install_external.sh
@@ -10,18 +10,17 @@ PYTHON_LIB_DIR=${PYTHON_LIB_DIR:-$VIRTUAL_ENV/lib/python2.7/site-packages/}
 echo "Checking out the most recent release of liggghts - 3.4.0 from 17 May 2016"
 git clone --branch 3.4.0 --depth 1 git://github.com/CFDEMproject/LIGGGHTS-PUBLIC.git myliggghts
 
-echo "Building LIGGGHTS executable"
-pushd myliggghts/src
-
+pushd myliggghts
 # Apply our patch to rename namespaces and lammps references with liggghts ones
-git apply ../../liggghts.patch
+git apply ../liggghts.patch
 echo "Patched liggghts source code"
+popd
 
+echo "Building LIGGGHTS executable"
+pushd myliggghts/src
 make -j 2 fedora
 ln -s lgt_fedora liggghts
-popd
 
-pushd myliggghts/src
 echo "Making shared library for LIGGGHTS python wrapper"
 make makeshlib
 make  -j 2 -f Makefile.shlib fedora_fpic
@@ -32,6 +31,6 @@ echo "Installing LIGGGHTS python wrapper"
 pushd myliggghts/python
 # The install script expects `liggghts.py` name.
 cp lammps.py liggghts.py
-python install.py $PYTHON_LIB_DIR 
+python install.py $PYTHON_LIB_DIR $PYTHON_LIB_DIR
 popd
 python check_liggghts_python.py
diff --git a/simliggghts/common/__init__.py b/simliggghts/common/__init__.py
diff --git a/simliggghts/config/__init__.py b/simliggghts/config/__init__.py
diff --git a/simliggghts/internal/__init__.py b/simliggghts/internal/__init__.py
diff --git a/simliggghts/io/__init__.py b/simliggghts/io/__init__.py
diff --git a/simliggghts/testing/__init__.py b/simliggghts/testing/__init__.py