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

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Browse Source 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/USER-CUDA/fix_set_force_cuda.h
	src/USER-CUDA/pair_lj_sdk_cuda.h
	src/USER-FEP/compute_fep.cpp
This commit is contained in:
Axel Kohlmeyer
2014-10-22 06:49:50 -04:00
parent 83c08fab77 ec18d90fba
commit ff0d7028fe
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Manual.html
View File

@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>LAMMPS-ICMS Users Manual</TITLE>
<META NAME="docnumber" CONTENT="9 Oct 2014 version">
<META NAME="docnumber" CONTENT="21 Oct 2014 version">
<META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">
<META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
</HEAD>
@ -22,7 +22,7 @@
<CENTER><H3>LAMMPS-ICMS Documentation
</H3></CENTER>
<CENTER><H4>9 Oct 2014 version
<CENTER><H4>21 Oct 2014 version
</H4></CENTER>
<H4>Version info:
</H4>

4
doc/Manual.txt
View File

@ -1,7 +1,7 @@
<HEAD>
<TITLE>LAMMPS-ICMS Users Manual</TITLE>
<TITLE>LAMMPS Users Manual</TITLE>
<META NAME="docnumber" CONTENT="9 Oct 2014 version">
<META NAME="docnumber" CONTENT="21 Oct 2014 version">
<META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">
<META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
</HEAD>
@ -19,7 +19,7 @@
<H1></H1>
LAMMPS-ICMS Documentation :c,h3
9 Oct 2014 version :c,h4
21 Oct 2014 version :c,h4
Version info: :h4

1
src/RIGID/fix_rigid_small.cpp
View File

@ -1734,6 +1734,7 @@ void FixRigidSmall::setup_bodies_static()
// dorientflag = 1 if any particle stores dipole orientation
if (extended) {
grow_arrays(atom->nmax);
if (atom->ellipsoid_flag) orientflag = 4;
if (atom->line_flag) orientflag = 1;
if (atom->tri_flag) orientflag = 4;

2
src/USER-CUDA/fix_set_force_cuda.h
View File

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

2
src/USER-CUDA/pair_lj_sdk_cuda.h
View File

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

1
src/VORONOI/compute_voronoi_atom.cpp
View File

@ -15,6 +15,7 @@
Contributing author: Daniel Schwen
------------------------------------------------------------------------- */
#include "mpi.h"
#include "math.h"
#include "string.h"
#include "stdlib.h"

2
src/version.h
View File

@ -1 +1 @@
#define LAMMPS_VERSION "9 Oct 2014"
#define LAMMPS_VERSION "21 Oct 2014"