release version 3.0.4 on 2014-10-30_18-31-03

NTT1508 · Oct 30, 2014 · ce4c8ed · ce4c8ed
1 parent ab4ebfd
commit ce4c8ed
Show file tree

Hide file tree

Showing 90 changed files with 1,134 additions and 207 deletions.
diff --git a/README b/README
@@ -1,12 +1,13 @@
-This is the LIGGGHTS software package.
+This is the LIGGGHTS software package, released by DCS Computing
+www.dcs-computing.com
 
 LIGGGHTS - LAMMPS Improved for General Granular and Granular Heat
 Transfer Simulations
 
 LIGGGHTS is part of the CFDEMproject
 www.liggghts.com | www.cfdem.com
 
-Christoph Kloss, christoph.kloss@cfdem.com
+Christoph Kloss, christoph.kloss@dcs-computing.com
 Copyright 2009-2012 JKU Linz
 Copyright 2012-     DCS Computing GmbH, Linz
 

diff --git a/cMake/FindEigen3.cmake b/cMake/FindEigen3.cmake
diff --git a/doc/Eqs/fix_sph_density_driftcorr_eq1.jpg b/doc/Eqs/fix_sph_density_driftcorr_eq1.jpg
diff --git a/doc/Eqs/fix_sph_integrity_eq1.jpg b/doc/Eqs/fix_sph_integrity_eq1.jpg
diff --git a/doc/Eqs/fix_sph_mixidx_eq1.jpg b/doc/Eqs/fix_sph_mixidx_eq1.jpg
diff --git a/doc/Eqs/fix_sph_mixidx_eq2.jpg b/doc/Eqs/fix_sph_mixidx_eq2.jpg
diff --git a/doc/Eqs/fix_sph_mixidx_eq3.jpg b/doc/Eqs/fix_sph_mixidx_eq3.jpg
diff --git a/doc/Eqs/fix_sph_mixidx_eq4.jpg b/doc/Eqs/fix_sph_mixidx_eq4.jpg
diff --git a/doc/Eqs/fix_sph_mixidx_eq5.jpg b/doc/Eqs/fix_sph_mixidx_eq5.jpg
diff --git a/doc/Eqs/fix_sph_mixidx_eq6.jpg b/doc/Eqs/fix_sph_mixidx_eq6.jpg
diff --git a/doc/Eqs/fix_sph_velgrad_eq1.jpg b/doc/Eqs/fix_sph_velgrad_eq1.jpg
diff --git a/doc/Eqs/model_C2_part_1.png b/doc/Eqs/model_C2_part_1.png
diff --git a/doc/Eqs/pair_sph_morris_tenscorr_eq1.jpg b/doc/Eqs/pair_sph_morris_tenscorr_eq1.jpg
diff --git a/doc/Eqs/pair_sph_morris_tenscorr_eq2.jpg b/doc/Eqs/pair_sph_morris_tenscorr_eq2.jpg
diff --git a/doc/Eqs/pair_sph_morris_tenscorr_eq3.jpg b/doc/Eqs/pair_sph_morris_tenscorr_eq3.jpg
diff --git a/doc/Eqs/pair_sph_morris_tenscorr_eq4.jpg b/doc/Eqs/pair_sph_morris_tenscorr_eq4.jpg
diff --git a/doc/Eqs/pair_sph_morris_tenscorr_eq5.jpg b/doc/Eqs/pair_sph_morris_tenscorr_eq5.jpg
diff --git a/doc/Eqs/pair_sph_morris_tenscorr_eq6.jpg b/doc/Eqs/pair_sph_morris_tenscorr_eq6.jpg
diff --git a/doc/Eqs/pair_sph_morris_tenscorr_eq7.jpg b/doc/Eqs/pair_sph_morris_tenscorr_eq7.jpg
diff --git a/doc/Eqs/roughnessLength.png b/doc/Eqs/roughnessLength.png
diff --git a/doc/Manual.pdf b/doc/Manual.pdf
diff --git a/doc/fix_wall_gran.html b/doc/fix_wall_gran.html
@@ -63,9 +63,9 @@ <H3>fix wall/gran  command
   <I>store_force_contact</I> value = 'yes' or 'no'
     yes, no = determines if the force for each particle-wall contact is stored in a <A HREF = "fix_property.html">fix property/atom</A> with id contactforces_(ID), where (ID) is the id of the fix wall/gran command.  
 </PRE>
-<LI>following the general_keyword/value pairs, zero or more model_keyword/model_valuezero pairs may be appended in arbitrary order 
+<LI>following the general_keyword/value pairs, zero or more model_keyword/model_value pairs may be appended in arbitrary order 
 
-  model_type/model_name pairs = described for each model separately <A HREF = "Section_gran_models.html">here</A> 
+  model_keyword/model_value pairs = described for each model separately <A HREF = "Section_gran_models.html">here</A> 
 
 </UL>
 <P><B>Examples:</B>

diff --git a/doc/fix_wall_gran.txt b/doc/fix_wall_gran.txt
@@ -51,8 +51,8 @@ general_keyword =  {shear} or {store_force} or {store_force_contact} :l
   {store_force_contact} value = 'yes' or 'no'
     yes, no = determines if the force for each particle-wall contact is stored in a "fix property/atom"_fix_property.html with id contactforces_(ID), where (ID) is the id of the fix wall/gran command.  :pre    
 
-following the general_keyword/value pairs, zero or more model_keyword/model_valuezero pairs may be appended in arbitrary order :l
-  model_type/model_name pairs = described for each model separately "here"_Section_gran_models.html 
+following the general_keyword/value pairs, zero or more model_keyword/model_value pairs may be appended in arbitrary order :l
+  model_keyword/model_value pairs = described for each model separately "here"_Section_gran_models.html 
 :ule
 
 [Examples:]

diff --git a/doc/gran_model_hertz.html b/doc/gran_model_hertz.html
@@ -15,7 +15,7 @@ <H3>gran model hertz
 </H3>
 <P><B>Syntax:</B>
 </P>
-<PRE>model hertz <B>other model_type/model_name pairs as described <A HREF = "pair_gran.html</B>">here</A> keyword values 
+<PRE>model hertz [other model_type/model_name pairs as described <A HREF = "pair_gran.html">here</A> ] keyword values 
 </PRE>
 <LI>zero or more keyword/value pairs may be appended 
 

diff --git a/doc/gran_model_hertz.txt b/doc/gran_model_hertz.txt
@@ -11,7 +11,7 @@ gran model hertz :h3
 
 [Syntax:]
 
-model hertz [other model_type/model_name pairs as described "here"_pair_gran.html] keyword values :pre
+model hertz \[other model_type/model_name pairs as described "here"_pair_gran.html \] keyword values :pre
 zero or more keyword/value pairs may be appended :l
   {limitForce} values = 'on' or 'off'
     on = ensures that the normal force is never attractive (an artefact that can occur at the end of a collision).

diff --git a/doc/gran_model_hertz_stiffness.html b/doc/gran_model_hertz_stiffness.html
@@ -15,7 +15,7 @@ <H3>gran model hertz/stiffness
 </H3>
 <P><B>Syntax:</B>
 </P>
-<PRE>model hertz <B>other model_type/model_name pairs as described <A HREF = "pair_gran.html</B>">here</A> keyword values 
+<PRE>model hertz [other model_type/model_name pairs as described <A HREF = "pair_gran.html">here</A> ] keyword values 
 </PRE>
 <LI>zero or more keyword/value pairs may be appended 
 

diff --git a/doc/gran_model_hertz_stiffness.txt b/doc/gran_model_hertz_stiffness.txt
@@ -11,7 +11,7 @@ gran model hertz/stiffness :h3
 
 [Syntax:]
 
-model hertz [other model_type/model_name pairs as described "here"_pair_gran.html] keyword values :pre
+model hertz \[other model_type/model_name pairs as described "here"_pair_gran.html \] keyword values :pre
 zero or more keyword/value pairs may be appended :l
   {limitForce} values = 'on' or 'off'
     on = ensures that the normal force is never attractive (an artefact that can occur at the end of a collision).

diff --git a/doc/gran_model_hooke.html b/doc/gran_model_hooke.html
@@ -15,7 +15,7 @@ <H3>gran model hooke
 </H3>
 <P><B>Syntax:</B>
 </P>
-<PRE>model hertz <B>other model_type/model_name pairs as described <A HREF = "pair_gran.html</B>">here</A> keyword values 
+<PRE>model hertz [other model_type/model_name pairs as described <A HREF = "pair_gran.html">here</A> ] keyword values 
 </PRE>
 <LI>zero or more keyword/value pairs may be appended 
 

diff --git a/doc/gran_model_hooke.txt b/doc/gran_model_hooke.txt
@@ -11,7 +11,7 @@ gran model hooke :h3
 
 [Syntax:]
 
-model hertz [other model_type/model_name pairs as described "here"_pair_gran.html] keyword values :pre
+model hertz \[other model_type/model_name pairs as described "here"_pair_gran.html \] keyword values :pre
 zero or more keyword/value pairs may be appended :l
   {tangential_damping} values = 'on' or 'off'
     on = activates tangential damping

diff --git a/doc/gran_model_hooke_stiffness.html b/doc/gran_model_hooke_stiffness.html
@@ -15,7 +15,7 @@ <H3>gran model hooke/stiffness
 </H3>
 <P><B>Syntax:</B>
 </P>
-<PRE>model hooke/stiffness <B>other model_type/model_name pairs as described <A HREF = "pair_gran.html</B>">here</A> keyword values 
+<PRE>model hooke/stiffness [other model_type/model_name pairs as described <A HREF = "pair_gran.html">here</A> ] keyword values 
 </PRE>
 <LI>zero or more keyword/value pairs may be appended 
 

diff --git a/doc/gran_model_hooke_stiffness.txt b/doc/gran_model_hooke_stiffness.txt
@@ -11,7 +11,7 @@ gran model hooke/stiffness :h3
 
 [Syntax:]
 
-model hooke/stiffness [other model_type/model_name pairs as described "here"_pair_gran.html] keyword values :pre
+model hooke/stiffness \[other model_type/model_name pairs as described "here"_pair_gran.html \] keyword values :pre
 zero or more keyword/value pairs may be appended :l
   {absolute_damping} values = 'on' or 'off'
     on = activates tangential damping

diff --git a/doc/gran_tangential_history.html b/doc/gran_tangential_history.html
@@ -32,10 +32,9 @@ <H3>gran tangential history
 that accounts for the tangential displacement ("tangential overlap") 
 between the particles for the duration of the time they are in contact.
 </P>
-<P>If this model is chose, then this "tangential overlap" spring force is
+<P>If this model is chosen, then this "tangential overlap" spring force is
 actually calculated / taken into account.
-</P>
-<P>The coefficient of friction cof is the upper limit of the tangential force through 
+The coefficient of friction cof is the upper limit of the tangential force through 
 the Coulomb criterion Ft = cof*Fn, where Ft and Fn are the tangential spring and normal 
 force components in the formulas above.
 </P>

diff --git a/doc/gran_tangential_history.txt b/doc/gran_tangential_history.txt
@@ -28,9 +28,8 @@ The spring part of the tangential force (k_t) is a "history" effect
 that accounts for the tangential displacement ("tangential overlap") 
 between the particles for the duration of the time they are in contact.
 
-If this model is chose, then this "tangential overlap" spring force is
+If this model is chosen, then this "tangential overlap" spring force is
 actually calculated / taken into account.
-
 The coefficient of friction cof is the upper limit of the tangential force through 
 the Coulomb criterion Ft = cof*Fn, where Ft and Fn are the tangential spring and normal 
 force components in the formulas above.
diff --git a/lib/poems/Makefile.lammps b/lib/poems/Makefile.lammps
@@ -0,0 +1,5 @@
+# Settings that the LAMMPS build will import when this package library is used
+
+poems_SYSINC =
+poems_SYSLIB =
+poems_SYSPATH =
diff --git a/src/MAKE/Makefile.ubuntuVTK_fpic b/src/MAKE/Makefile.ubuntuVTK_fpic
@@ -0,0 +1,117 @@
+# openmpi = Ubuntu 12.04, mpic++, OpenMPI-1.6
+
+SHELL = /bin/sh
+
+# ---------------------------------------------------------------------
+# compiler/linker settings
+# specify flags and libraries needed for your compiler
+
+CC =		mpic++
+CCFLAGS =	-O2 \
+		-funroll-loops -fstrict-aliasing -Wall -Wno-uninitialized -fPIC
+SHFLAGS =       -fPIC
+DEPFLAGS =	-M
+LINK =		mpic++
+LINKFLAGS =	-O2
+LIB =           -lstdc++
+ARCHIVE =	ar
+ARFLAGS =	-rcsv
+SIZE =		size
+SHLIBFLAGS =	-shared
+
+# ---------------------------------------------------------------------
+# LAMMPS-specific settings
+# specify settings for LAMMPS features you will use
+# if you change any -D setting, do full re-compile after "make clean"
+
+# LAMMPS ifdef settings, OPTIONAL
+# see possible settings in doc/Section_start.html#2_2 (step 4)
+
+LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_VTK
+
+# MPI library, REQUIRED
+# see discussion in doc/Section_start.html#2_2 (step 5)
+# can point to dummy MPI library in src/STUBS as in Makefile.serial
+# INC = path for mpi.h, MPI compiler settings
+# PATH = path for MPI library
+# LIB = name of MPI library
+
+MPI_INC =       
+MPI_PATH = 
+MPI_LIB =	
+
+# FFT library, OPTIONAL
+# see discussion in doc/Section_start.html#2_2 (step 6)
+# can be left blank to use provided KISS FFT library
+# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
+# PATH = path for FFT library
+# LIB = name of FFT library
+
+FFT_INC = 
+FFT_PATH = 
+FFT_LIB =
+
+# JPEG and/or PNG library, OPTIONAL
+# see discussion in doc/Section_start.html#2_2 (step 7)
+# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
+# INC = path(s) for jpeglib.h and/or png.h
+# PATH = path(s) for JPEG library and/or PNG library
+# LIB = name(s) of JPEG library and/or PNG library
+
+JPG_INC =       
+JPG_PATH = 	
+JPG_LIB =	
+
+# VTK library, OPTIONAL
+# INC = path for VTK header files
+# PATH = path for VTK library
+# LIB = name of VTK library
+##################################### ADD THESE ITEMS TO OPTIONS FILE OF SOLVER APP IN CFDEM
+
+VTK_INC = -I/usr/include/vtk-5.8
+VTK_PATH = 
+VTK_LIB = -lvtkCommon -lvtkFiltering -lvtkIO
+
+# ---------------------------------------------------------------------
+# build rules and dependencies
+# no need to edit this section
+
+include	Makefile.package.settings
+include	Makefile.package
+
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(VTK_INC) $(PKG_SYSINC)
+EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(VTK_PATH) $(PKG_SYSPATH)
+EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(VTK_LIB) $(PKG_SYSLIB)
+
+# Path to src files
+
+vpath %.cpp ..
+vpath %.h ..
+
+# Link target
+
+$(EXE):	$(OBJ)
+	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
+	$(SIZE) $(EXE)
+
+# Library target
+
+lib:	$(OBJ)
+	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
+
+shlib:	$(OBJ)
+	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
+        $(OBJ) $(EXTRA_LIB) $(LIB)
+
+# Compilation rules
+
+%.o:%.cpp
+	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
+
+%.d:%.cpp
+	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
+
+# Individual dependencies
+
+DEPENDS = $(OBJ:.o=.d)
+sinclude $(DEPENDS)