(e3bb9d63) · Commits · 郑智淋 / lammps

src/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);

+2 −2

Original line number	Diff line number	Diff line
		@@ -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++) {