From e3bb9d6333d26d4d0c127b7d92a4039c4fc32571 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 22 Feb 2008 14:28:58 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1554
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/Makefile | 6 +++---
src/Makefile.lib | 4 ++--
src/Makefile.list | 4 ++--
src/pair_hybrid.cpp | 2 ++
src/special.cpp | 4 ++--
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index aa79f16b93..d4bb44a059 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -65,7 +65,7 @@ help:
@cp MAKE/Makefile.$@ Obj_$@/Makefile
@cd Obj_$@; \
$(MAKE) "OBJ = $(OBJ)" "INC = $(INC)" "EXE = ../$(EXE)" ../$(EXE)
- @if [ -d Obj_$@ ]; then cd Obj_$@; rm $(SRC) $(INC) Makefile*; fi
+ @if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi
# Remove machine-specific object files
@@ -74,10 +74,10 @@ clean:
@echo 'make clean-machine delete object files for one machine'
clean-all:
- rm -r Obj_*
+ rm -rf Obj_*
clean-%:
- rm -r Obj_$(@:clean-%=%)
+ rm -rf Obj_$(@:clean-%=%)
# Create a tarball of src dir and packages
diff --git a/src/Makefile.lib b/src/Makefile.lib
index 11dd9abed6..6f96456e28 100644
--- a/src/Makefile.lib
+++ b/src/Makefile.lib
@@ -22,7 +22,7 @@ help:
for file in $$files; do head -1 $$file; done
clean:
- rm -r Obj_*
+ rm -rf Obj_*
.DEFAULT:
@test -f MAKE/Makefile.$@
@@ -31,4 +31,4 @@ clean:
@cp MAKE/Makefile.$@ Obj_$@/Makefile
@cd Obj_$@; \
$(MAKE) "OBJ = $(OBJ)" "INC = $(INC)" "EXE = ../$(EXE)" lib
- @if [ -d Obj_$@ ]; then cd Obj_$@; rm $(SRC) $(INC) Makefile*; fi
+ @if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi
diff --git a/src/Makefile.list b/src/Makefile.list
index 379914b371..1d0352ae91 100644
--- a/src/Makefile.list
+++ b/src/Makefile.list
@@ -22,7 +22,7 @@ help:
for file in $$files; do head -1 $$file; done
clean:
- rm -r Obj_*
+ rm -rf Obj_*
.DEFAULT:
@test -f MAKE/Makefile.$@
@@ -31,4 +31,4 @@ clean:
@cp MAKE/Makefile.$@ Obj_$@/Makefile
@cd Obj_$@; \
$(MAKE) "OBJ = $(OBJ)" "INC = $(INC)" "EXE = ../$(EXE)" ../$(EXE)
- @if [ -d Obj_$@ ]; then cd Obj_$@; rm $(SRC) $(INC) Makefile*; fi
+ @if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi
diff --git a/src/pair_hybrid.cpp b/src/pair_hybrid.cpp
index 91abbe5a97..493f6fe376 100644
--- a/src/pair_hybrid.cpp
+++ b/src/pair_hybrid.cpp
@@ -435,6 +435,8 @@ double PairHybrid::init_one(int i, int j)
double cutmax = 0.0;
if (tail_flag) etail_ij = ptail_ij = 0.0;
+ nmap[j][i] = nmap[i][j];
+
for (int k = 0; k < nmap[i][j]; k++) {
map[j][i][k] = map[i][j][k];
double cut = styles[map[i][j][k]]->init_one(i,j);
diff --git a/src/special.cpp b/src/special.cpp
index 96dc1d5302..54953ddde9 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -551,7 +551,7 @@ void Special::build()
/* ----------------------------------------------------------------------
concatenate onetwo, onethree, onefour into master atom->special list
remove duplicates
- convert nspecial[0], nspecial[1], nspecial[2] into cummulative counters
+ convert nspecial[0], nspecial[1], nspecial[2] into cumulative counters
------------------------------------------------------------------------- */
void Special::combine()
@@ -646,7 +646,7 @@ void Special::combine()
// again use map to cull duplicates
// exclude original atom explicitly
// adjust nspecial[i] values to reflect removed duplicates
- // nspecial[i][1] and nspecial[i][2] now become cummulative counters
+ // nspecial[i][1] and nspecial[i][2] now become cumulative counters
for (i = 0; i < nlocal; i++) {
--
GitLab