diff --git a/src/MAKE/Makefile.g++ b/src/MAKE/Makefile.g++ index 486742e87def0bb18f23108424e704a8bd88f0ed..a884c91fd7b91230dfd747e3e6c8d215249779dd 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 7144bf37a3bdb7b3bffa04e09e811f4f2b02c394..e554ba6353e69004a96a0621221d1b04c9d66c1b 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 5ad425182253662f0a48c19bfd8922fa33e6e0df..b0cf43b46bdf7b87fdaa69f762d761ba7908e470 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 3c7504c9e88de81262f3394a8d62c5a31004353d..7e27fef24d4c880d3a7cfc41a7b41069e689cf9b 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 5f755f6ecdf5d88a56e9df5bad81f17e95ba21c2..65bbebca097084e137a30d5e472cabc0d875d292 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 8ce14d8d5820ac9cd62f71e03a17c201fc74d93e..a331230b7366acb4e64e19cb9737cccf43fc0892 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 22dd2ceaed5e2c6812755e606175175ae77dcce8..e3f4d47d813c03cdd41fce46cc01387b1ad2a831 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;