ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7009 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2011-09-23 21:01:08 +00:00
parent c0a3d0aa9a
commit 6b73c2cdf8
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.lib
View File

@ -29,7 +29,11 @@ clean:
@if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi @if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi
@cp -p $(SRC) $(INC) Obj_$@ @cp -p $(SRC) $(INC) Obj_$@
@cp MAKE/Makefile.$@ Obj_$@/Makefile @cp MAKE/Makefile.$@ Obj_$@/Makefile
@cp Makefile.package Obj_$@ @if [ ! -e Makefile.package ]; \
then cp Makefile.package.empty Makefile.package; fi
@if [ ! -e Makefile.package.settings ]; \
then cp Makefile.package.settings.empty Makefile.package.settings; fi
@cp Makefile.package Makefile.package.settings Obj_$@
@cd Obj_$@; \ @cd Obj_$@; \
$(MAKE) $(MFLAGS) "OBJ = $(OBJ)" "INC = $(INC)" "EXE = ../$(EXE)" lib $(MAKE) $(MFLAGS) "OBJ = $(OBJ)" "INC = $(INC)" "EXE = ../$(EXE)" lib
@if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi @if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi

6
src/Makefile.list
View File

@ -29,7 +29,11 @@ clean:
@if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi @if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi
@cp -p $(SRC) $(INC) Obj_$@ @cp -p $(SRC) $(INC) Obj_$@
@cp MAKE/Makefile.$@ Obj_$@/Makefile @cp MAKE/Makefile.$@ Obj_$@/Makefile
@cp Makefile.package Obj_$@ @if [ ! -e Makefile.package ]; \
then cp Makefile.package.empty Makefile.package; fi
@if [ ! -e Makefile.package.settings ]; \
then cp Makefile.package.settings.empty Makefile.package.settings; fi
@cp Makefile.package Makefile.package.settings Obj_$@
@cd Obj_$@; \ @cd Obj_$@; \
$(MAKE) $(MFLAGS) "OBJ = $(OBJ)" "INC = $(INC)" "EXE = ../$(EXE)" ../$(EXE) $(MAKE) $(MFLAGS) "OBJ = $(OBJ)" "INC = $(INC)" "EXE = ../$(EXE)" ../$(EXE)
@if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi @if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi

7
src/random_park.cpp
View File

@ -15,7 +15,6 @@
#include "math.h" #include "math.h"
#include "random_park.h" #include "random_park.h"
#include "domain.h"
#include "error.h" #include "error.h"
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
@ -40,7 +39,8 @@ using namespace LAMMPS_NS;
RanPark::RanPark(LAMMPS *lmp, int seed_init) : Pointers(lmp) RanPark::RanPark(LAMMPS *lmp, int seed_init) : Pointers(lmp)
{ {
if (seed_init <= 0) error->all(FLERR,"Invalid seed for Park random # generator"); if (seed_init <= 0)
error->all(FLERR,"Invalid seed for Park random # generator");
seed = seed_init; seed = seed_init;
save = 0; save = 0;
} }
@ -89,7 +89,8 @@ double RanPark::gaussian()
void RanPark::reset(int seed_init) void RanPark::reset(int seed_init)
{ {
if (seed_init <= 0) error->all(FLERR,"Invalid seed for Park random # generator"); if (seed_init <= 0)
error->all(FLERR,"Invalid seed for Park random # generator");
seed = seed_init; seed = seed_init;
save = 0; save = 0;
} }

2
src/variable.cpp
View File

@ -1,5 +1,5 @@
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
http://lammps.sandia.gov, Sandia National Laboratories http://lammps.sandia.gov, Sandia National Laboratories
Steve Plimpton, sjplimp@sandia.gov Steve Plimpton, sjplimp@sandia.gov