diff --git a/src/MAKE/Makefile.g++ b/src/MAKE/Makefile.g++ index 486742e87d..a884c91fd7 100755 --- a/src/MAKE/Makefile.g++ +++ b/src/MAKE/Makefile.g++ @@ -85,9 +85,6 @@ $(EXE): $(OBJ) lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ) -#shlib: $(OBJ) -# $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ) - shlib: $(OBJ) $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \ $(OBJ) $(EXTRA_LIB) $(LIB) diff --git a/src/Make.sh b/src/Make.sh index 7144bf37a3..e554ba6353 100644 --- a/src/Make.sh +++ b/src/Make.sh @@ -1,6 +1,8 @@ -# Make.sh = update Makefile.lib or Makefile.list or style_*.h files +# Make.sh = update Makefile.lib, Makefile.shlib, Makefile.list +# or style_*.h files # Syntax: sh Make.sh style # sh Make.sh Makefile.lib +# sh Make.sh Makefile.shlib # sh Make.sh Makefile.list # function to create one style_*.h file diff --git a/src/Makefile b/src/Makefile index 5ad4251822..b0cf43b46b 100755 --- a/src/Makefile +++ b/src/Makefile @@ -130,7 +130,7 @@ makelist: @$(SHELL) Make.sh style @$(SHELL) Make.sh Makefile.list -# install LAMMPS shared lib and Python wrapper in Python +# install LAMMPS shared lib and Python wrapper for Python usage install-python: @python ../python/install.py diff --git a/src/Makefile.lib b/src/Makefile.lib index 3c7504c9e8..7e27fef24d 100644 --- a/src/Makefile.lib +++ b/src/Makefile.lib @@ -21,9 +21,6 @@ help: @files="`ls MAKE/Makefile.*`"; \ for file in $$files; do head -1 $$file; done -clean: - rm -rf Obj_* - .DEFAULT: @test -f MAKE/Makefile.$@ @if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi diff --git a/src/Makefile.list b/src/Makefile.list index 5f755f6ecd..65bbebca09 100644 --- a/src/Makefile.list +++ b/src/Makefile.list @@ -21,9 +21,6 @@ help: @files="`ls MAKE/Makefile.*`"; \ for file in $$files; do head -1 $$file; done -clean: - rm -rf Obj_* - .DEFAULT: @test -f MAKE/Makefile.$@ @if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 8ce14d8d58..a331230b73 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -22,7 +22,7 @@ help: for file in $$files; do head -1 $$file; done clean: - rm -rf Obj_* + rm -rf Obj_shlib_* .DEFAULT: @test -f MAKE/Makefile.$@ diff --git a/src/USER-CUDA/cuda.cpp b/src/USER-CUDA/cuda.cpp index 22dd2ceaed..e3f4d47d81 100644 --- a/src/USER-CUDA/cuda.cpp +++ b/src/USER-CUDA/cuda.cpp @@ -410,6 +410,8 @@ void Cuda::setDomainParams() cu_domain->boxlo_lamda[i] = domain->boxlo_lamda[i]; cu_domain->boxhi_lamda[i] = domain->boxhi_lamda[i]; cu_domain->prd_lamda[i] = domain->prd_lamda[i]; + cu_domain->sublo[i] = domain->sublo_lamda[i]; + cu_domain->subhi[i] = domain->subhi_lamda[i]; } cu_domain->xy = domain->xy;