From df1e2a64d2503f8e108b19a46bbba8a6c5e15d4a Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 23 Aug 2023 19:03:34 -0400 Subject: [PATCH] the MESONT package depends on the MOLECULE package since the last upgrade --- cmake/CMakeLists.txt | 1 + src/Depend.sh | 1 + src/MESONT/Install.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100755 src/MESONT/Install.sh diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 0b852d5ea9..b075fc8f8d 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -387,6 +387,7 @@ pkg_depends(CG-DNA MOLECULE) pkg_depends(CG-DNA ASPHERE) pkg_depends(ELECTRODE KSPACE) pkg_depends(EXTRA-MOLECULE MOLECULE) +pkg_depends(MESONT MOLECULE) # detect if we may enable OpenMP support by default set(BUILD_OMP_DEFAULT OFF) diff --git a/src/Depend.sh b/src/Depend.sh index 1701be2577..4004f12686 100755 --- a/src/Depend.sh +++ b/src/Depend.sh @@ -150,6 +150,7 @@ if (test $1 = "MOLECULE") then depend GPU depend KOKKOS depend FEP + depend MESONT depend OPENMP depend INTEL fi diff --git a/src/MESONT/Install.sh b/src/MESONT/Install.sh new file mode 100755 index 0000000000..6a9940f3ed --- /dev/null +++ b/src/MESONT/Install.sh @@ -0,0 +1,40 @@ +# Install/unInstall package files in LAMMPS +# mode = 0/1/2 for uninstall/install/update + +mode=$1 + +# enforce using portable C locale +LC_ALL=C +export LC_ALL + +# arg1 = file, arg2 = file it depends on + +action () { + if (test $mode = 0) then + rm -f ../$1 + elif (! cmp -s $1 ../$1) then + if (test -z "$2" || test -e ../$2) then + cp $1 .. + if (test $mode = 2) then + echo " updating src/$1" + fi + fi + elif (test -n "$2") then + if (test ! -e ../$2) then + rm -f ../$1 + fi + fi +} + +# some styles in MESONT have base classes in MOLECULE + +if (test $1 = 1) then + if (test ! -e ../bond_harmonic.cpp) then + echo "Must install MOLECULE package with MESONT" + exit 1 + fi +fi + +for file in *.cpp *.h; do + action ${file} +done