[liggghts] 02/03: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Thu Oct 27 21:06:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository liggghts.
commit 4101537dfe9a02f1e07850085f95bd35cec6eab3
Author: Anton Gladky <gladk at debian.org>
Date: Thu Oct 27 23:03:44 2016 +0200
Refresh patches.
---
debian/patches/01_add_cmake_files.patch | 10 +-
debian/patches/05_vtk6_support.patch | 6 +-
.../3ccbfc7e7fb8a339ff2566034a8d6809e29c6f92.patch | 690 ---------------------
.../b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch | 6 +-
debian/patches/series | 1 -
5 files changed, 11 insertions(+), 702 deletions(-)
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index fd47380..5616a29 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -2,10 +2,10 @@ Description: adds cmake files. Will hopefully be accepted by upstream.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-22
-Index: LIGGGHTS-PUBLIC-3.4.0/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.5.0/CMakeLists.txt
===================================================================
--- /dev/null
-+++ LIGGGHTS-PUBLIC-3.4.0/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.5.0/CMakeLists.txt
@@ -0,0 +1,87 @@
+# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
+# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
@@ -94,10 +94,10 @@ Index: LIGGGHTS-PUBLIC-3.4.0/CMakeLists.txt
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+
+ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
-Index: LIGGGHTS-PUBLIC-3.4.0/src/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/src/CMakeLists.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/src/CMakeLists.txt
+--- LIGGGHTS-PUBLIC-3.5.0.orig/src/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
@@ -1,115 +1,57 @@
-PROJECT(LIGGGHTS C CXX)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
diff --git a/debian/patches/05_vtk6_support.patch b/debian/patches/05_vtk6_support.patch
index 304a70f..7d01cff 100644
--- a/debian/patches/05_vtk6_support.patch
+++ b/debian/patches/05_vtk6_support.patch
@@ -2,10 +2,10 @@ Description: Fixes compilation against VTK6
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-22
-Index: LIGGGHTS-PUBLIC-3.4.0/src/dump_atom_vtk.cpp
+Index: LIGGGHTS-PUBLIC-3.5.0/src/dump_atom_vtk.cpp
===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/src/dump_atom_vtk.cpp
-+++ LIGGGHTS-PUBLIC-3.4.0/src/dump_atom_vtk.cpp
+--- LIGGGHTS-PUBLIC-3.5.0.orig/src/dump_atom_vtk.cpp
++++ LIGGGHTS-PUBLIC-3.5.0/src/dump_atom_vtk.cpp
@@ -320,11 +320,11 @@ void DumpATOMVTK::vtkExportData::writeSE
vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
diff --git a/debian/patches/3ccbfc7e7fb8a339ff2566034a8d6809e29c6f92.patch b/debian/patches/3ccbfc7e7fb8a339ff2566034a8d6809e29c6f92.patch
deleted file mode 100644
index 23cc064..0000000
--- a/debian/patches/3ccbfc7e7fb8a339ff2566034a8d6809e29c6f92.patch
+++ /dev/null
@@ -1,690 +0,0 @@
-From 3ccbfc7e7fb8a339ff2566034a8d6809e29c6f92 Mon Sep 17 00:00:00 2001
-From: kloss <christoph.kloss at dcs-computing.com>
-Date: Thu, 19 May 2016 12:09:57 +0200
-Subject: [PATCH] release version 3.4.1 on 2016-05-19_12-09-56
-
----
- doc/Manual.pdf | Bin 3387108 -> 3390199 bytes
- doc/Section_gran_models.html | 40 +++++++++++++++++++++++
- doc/Section_gran_models.txt | 40 +++++++++++++++++++++++
- doc/fix_insert_pack.html | 4 ++-
- doc/fix_insert_pack.txt | 4 ++-
- doc/fix_insert_rate_region.html | 4 ++-
- doc/fix_insert_rate_region.txt | 4 ++-
- doc/fix_insert_stream.html | 4 ++-
- doc/fix_insert_stream.txt | 4 ++-
- doc/gran_cohesion_easo_capillary_viscous.html | 2 +-
- doc/gran_cohesion_easo_capillary_viscous.txt | 2 +-
- doc/gran_cohesion_sjkr.html | 2 +-
- doc/gran_cohesion_sjkr.txt | 2 +-
- doc/gran_cohesion_sjkr2.html | 2 +-
- doc/gran_cohesion_sjkr2.txt | 2 +-
- doc/gran_cohesion_washino_capillary_viscous.html | 2 +-
- doc/gran_cohesion_washino_capillary_viscous.txt | 2 +-
- doc/gran_model_hertz.html | 2 +-
- doc/gran_model_hertz.txt | 2 +-
- doc/gran_model_hertz_stiffness.html | 2 +-
- doc/gran_model_hertz_stiffness.txt | 2 +-
- doc/gran_model_hooke.html | 2 +-
- doc/gran_model_hooke.txt | 2 +-
- doc/gran_model_hooke_stiffness.html | 2 +-
- doc/gran_model_hooke_stiffness.txt | 2 +-
- doc/gran_rolling_friction_cdt.html | 2 +-
- doc/gran_rolling_friction_cdt.txt | 2 +-
- doc/gran_rolling_friction_epsd.html | 2 +-
- doc/gran_rolling_friction_epsd.txt | 2 +-
- doc/gran_rolling_friction_epsd2.html | 2 +-
- doc/gran_rolling_friction_epsd2.txt | 2 +-
- doc/gran_rolling_friction_epsd3.html | 2 +-
- doc/gran_rolling_friction_epsd3.txt | 2 +-
- doc/gran_surface_sphere.html | 2 +-
- doc/gran_surface_sphere.txt | 2 +-
- doc/gran_tangential_history.html | 2 +-
- doc/gran_tangential_history.txt | 2 +-
- doc/gran_tangential_no_history.html | 2 +-
- doc/gran_tangential_no_history.txt | 2 +-
- src/dump_local_gran_vtk.cpp | 8 ++---
- src/version_liggghts.h | 2 +-
- src/version_liggghts.txt | 2 +-
- 42 files changed, 134 insertions(+), 42 deletions(-)
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/Section_gran_models.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/Section_gran_models.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/Section_gran_models.html
-@@ -14,4 +14,44 @@
- This section describes what granular models can be used along with
- <A HREF = "pair_gran.html">pair gran</A> and <A HREF = "fix_wall_gran.html">fix wall/gran</A>
-
-+<H4>cohesion commands
-+</H4>
-+<P>Click on the style itself for a full description:
-+</P>
-+<DIV ALIGN=center><TABLE BORDER=1 >
-+<TR ALIGN="center"><TD ><A HREF = "gran_cohesion_easo_capillary_viscous.html">easo/capillary/viscous</A></TD><TD ><A HREF = "gran_cohesion_sjkr.html">sjkr</A></TD><TD ><A HREF = "gran_cohesion_sjkr2.html">sjkr2</A></TD><TD ><A HREF = "gran_cohesion_washino_capillary_viscous.html">washino/capillary/viscous</A>
-+</TD></TR></TABLE></DIV>
-+
-+<H4>model commands
-+</H4>
-+<P>Click on the style itself for a full description:
-+</P>
-+<DIV ALIGN=center><TABLE BORDER=1 >
-+<TR ALIGN="center"><TD ><A HREF = "gran_model_hertz.html">hertz</A></TD><TD ><A HREF = "gran_model_hertz_stiffness.html">hertz/stiffness</A></TD><TD ><A HREF = "gran_model_hooke.html">hooke</A></TD><TD ><A HREF = "gran_model_hooke_stiffness.html">hooke/stiffness</A>
-+</TD></TR></TABLE></DIV>
-+
-+<H4>rolling_friction commands
-+</H4>
-+<P>Click on the style itself for a full description:
-+</P>
-+<DIV ALIGN=center><TABLE BORDER=1 >
-+<TR ALIGN="center"><TD ><A HREF = "gran_rolling_friction_cdt.html">cdt</A></TD><TD ><A HREF = "gran_rolling_friction_epsd.html">epsd</A></TD><TD ><A HREF = "gran_rolling_friction_epsd2.html">epsd2</A></TD><TD ><A HREF = "gran_rolling_friction_epsd3.html">epsd3</A>
-+</TD></TR></TABLE></DIV>
-+
-+<H4>surface commands
-+</H4>
-+<P>Click on the style itself for a full description:
-+</P>
-+<DIV ALIGN=center><TABLE BORDER=1 >
-+<TR ALIGN="center"><TD ><A HREF = "gran_surface_sphere.html">sphere</A>
-+</TD></TR></TABLE></DIV>
-+
-+<H4>tangential commands
-+</H4>
-+<P>Click on the style itself for a full description:
-+</P>
-+<DIV ALIGN=center><TABLE BORDER=1 >
-+<TR ALIGN="center"><TD ><A HREF = "gran_tangential_history.html">history</A></TD><TD ><A HREF = "gran_tangential_no_history.html">no_history</A>
-+</TD></TR></TABLE></DIV>
-+
- </HTML>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/Section_gran_models.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/Section_gran_models.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/Section_gran_models.txt
-@@ -13,3 +13,43 @@ This section describes what granular mod
-
-
-
-+cohesion commands :h4
-+
-+Click on the style itself for a full description:
-+
-+"easo/capillary/viscous"_gran_cohesion_easo_capillary_viscous.html,
-+"sjkr"_gran_cohesion_sjkr.html,
-+"sjkr2"_gran_cohesion_sjkr2.html,
-+"washino/capillary/viscous"_gran_cohesion_washino_capillary_viscous.html :tb(c=4,ea=c)
-+
-+model commands :h4
-+
-+Click on the style itself for a full description:
-+
-+"hertz"_gran_model_hertz.html,
-+"hertz/stiffness"_gran_model_hertz_stiffness.html,
-+"hooke"_gran_model_hooke.html,
-+"hooke/stiffness"_gran_model_hooke_stiffness.html :tb(c=4,ea=c)
-+
-+rolling_friction commands :h4
-+
-+Click on the style itself for a full description:
-+
-+"cdt"_gran_rolling_friction_cdt.html,
-+"epsd"_gran_rolling_friction_epsd.html,
-+"epsd2"_gran_rolling_friction_epsd2.html,
-+"epsd3"_gran_rolling_friction_epsd3.html :tb(c=4,ea=c)
-+
-+surface commands :h4
-+
-+Click on the style itself for a full description:
-+
-+"sphere"_gran_surface_sphere.html :tb(c=4,ea=c)
-+
-+tangential commands :h4
-+
-+Click on the style itself for a full description:
-+
-+"history"_gran_tangential_history.html,
-+"no_history"_gran_tangential_no_history.html :tb(c=4,ea=c)
-+
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_pack.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/fix_insert_pack.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_pack.html
-@@ -61,9 +61,11 @@
- vFluctx = standard deviation of Gaussian x-velocity fluctuation at insertion (velocity units)
- vFlucty = standard deviation of Gaussian y-velocity fluctuation at insertion (velocity units)
- vFluctz = standard deviation of Gaussian z-velocity fluctuation at insertion (velocity units)
-- <I>orientation</I> values = random or template
-+ <I>orientation</I> values = random or template or constant q1 q2 q3 q4
- random = randomize rotational orientation
- template = use orientation from particle template
-+ constant = use constant quaternion for orientation
-+ q1 q2 q3 q4 = quaternion values for constant orientation
- <I>omega</I> values = constant omegax omegay omegaz
- constant = obligatory word
- omegax = x-comonent of angular velocity (1/time units)
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_pack.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/fix_insert_pack.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_pack.txt
-@@ -50,9 +50,11 @@ general_keywords = {verbose} or {maxatte
- vFluctx = standard deviation of Gaussian x-velocity fluctuation at insertion (velocity units)
- vFlucty = standard deviation of Gaussian y-velocity fluctuation at insertion (velocity units)
- vFluctz = standard deviation of Gaussian z-velocity fluctuation at insertion (velocity units)
-- {orientation} values = random or template
-+ {orientation} values = random or template or constant q1 q2 q3 q4
- random = randomize rotational orientation
- template = use orientation from particle template
-+ constant = use constant quaternion for orientation
-+ q1 q2 q3 q4 = quaternion values for constant orientation
- {omega} values = constant omegax omegay omegaz
- constant = obligatory word
- omegax = x-comonent of angular velocity (1/time units)
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_rate_region.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/fix_insert_rate_region.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_rate_region.html
-@@ -71,9 +71,11 @@
- vFluctx = standard deviation of Gaussian x-velocity fluctuation at insertion (velocity units)
- vFlucty = standard deviation of Gaussian y-velocity fluctuation at insertion (velocity units)
- vFluctz = standard deviation of Gaussian z-velocity fluctuation at insertion (velocity units)
-- <I>orientation</I> values = random or template
-+ <I>orientation</I> values = random or template or constant q1 q2 q3 q4
- random = randomize rotational orientation
- template = use orientation from particle template
-+ constant = use constant quaternion for orientation
-+ q1 q2 q3 q4 = quaternion values for constant orientation
- <I>omega</I> values = constant omegax omegay omegaz
- constant = obligatory word
- omegax = x-comonent of angular velocity (1/time units)
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_rate_region.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/fix_insert_rate_region.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_rate_region.txt
-@@ -60,9 +60,11 @@ general_keywords = {verbose} or {maxatta
- vFluctx = standard deviation of Gaussian x-velocity fluctuation at insertion (velocity units)
- vFlucty = standard deviation of Gaussian y-velocity fluctuation at insertion (velocity units)
- vFluctz = standard deviation of Gaussian z-velocity fluctuation at insertion (velocity units)
-- {orientation} values = random or template
-+ {orientation} values = random or template or constant q1 q2 q3 q4
- random = randomize rotational orientation
- template = use orientation from particle template
-+ constant = use constant quaternion for orientation
-+ q1 q2 q3 q4 = quaternion values for constant orientation
- {omega} values = constant omegax omegay omegaz
- constant = obligatory word
- omegax = x-comonent of angular velocity (1/time units)
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_stream.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/fix_insert_stream.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_stream.html
-@@ -70,9 +70,11 @@
- vFluctx = standard deviation of Gaussian x-velocity fluctuation at insertion (velocity units)
- vFlucty = standard deviation of Gaussian y-velocity fluctuation at insertion (velocity units)
- vFluctz = standard deviation of Gaussian z-velocity fluctuation at insertion (velocity units)
-- <I>orientation</I> values = random or template
-+ <I>orientation</I> values = random or template or constant q1 q2 q3 q4
- random = randomize rotational orientation
- template = use orientation from particle template
-+ constant = use constant quaternion for orientation
-+ q1 q2 q3 q4 = quaternion values for constant orientation
- <I>omega</I> values = constant omegax omegay omegaz
- constant = obligatory word
- omegax = x-comonent of angular velocity (1/time units)
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_stream.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/fix_insert_stream.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/fix_insert_stream.txt
-@@ -58,9 +58,11 @@ general_keywords = {verbose} or {maxatta
- vFluctx = standard deviation of Gaussian x-velocity fluctuation at insertion (velocity units)
- vFlucty = standard deviation of Gaussian y-velocity fluctuation at insertion (velocity units)
- vFluctz = standard deviation of Gaussian z-velocity fluctuation at insertion (velocity units)
-- {orientation} values = random or template
-+ {orientation} values = random or template or constant q1 q2 q3 q4
- random = randomize rotational orientation
- template = use orientation from particle template
-+ constant = use constant quaternion for orientation
-+ q1 q2 q3 q4 = quaternion values for constant orientation
- {omega} values = constant omegax omegay omegaz
- constant = obligatory word
- omegax = x-comonent of angular velocity (1/time units)
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_easo_capillary_viscous.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_cohesion_easo_capillary_viscous.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_easo_capillary_viscous.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran cohesion easo/capillary/viscous command
-+<H3>gran cohesion easo/capillary/viscous model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_easo_capillary_viscous.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_cohesion_easo_capillary_viscous.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_easo_capillary_viscous.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran cohesion easo/capillary/viscous command :h3
-+gran cohesion easo/capillary/viscous model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_sjkr.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_cohesion_sjkr.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_sjkr.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran cohesion sjkr command
-+<H3>gran cohesion sjkr model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_sjkr.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_cohesion_sjkr.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_sjkr.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran cohesion sjkr command :h3
-+gran cohesion sjkr model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_sjkr2.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_cohesion_sjkr2.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_sjkr2.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran cohesion sjkr2 command
-+<H3>gran cohesion sjkr2 model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_sjkr2.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_cohesion_sjkr2.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_sjkr2.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran cohesion sjkr2 command :h3
-+gran cohesion sjkr2 model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_washino_capillary_viscous.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_cohesion_washino_capillary_viscous.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_washino_capillary_viscous.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran cohesion washino/capillary/viscous command
-+<H3>gran cohesion washino/capillary/viscous model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_washino_capillary_viscous.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_cohesion_washino_capillary_viscous.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_cohesion_washino_capillary_viscous.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran cohesion washino/capillary/viscous command :h3
-+gran cohesion washino/capillary/viscous model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hertz.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_model_hertz.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hertz.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran model hertz command
-+<H3>gran model hertz model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hertz.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_model_hertz.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hertz.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran model hertz command :h3
-+gran model hertz model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hertz_stiffness.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_model_hertz_stiffness.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hertz_stiffness.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran model hertz/stiffness command
-+<H3>gran model hertz/stiffness model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hertz_stiffness.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_model_hertz_stiffness.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hertz_stiffness.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran model hertz/stiffness command :h3
-+gran model hertz/stiffness model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hooke.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_model_hooke.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hooke.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran model hooke command
-+<H3>gran model hooke model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hooke.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_model_hooke.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hooke.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran model hooke command :h3
-+gran model hooke model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hooke_stiffness.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_model_hooke_stiffness.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hooke_stiffness.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran model hooke/stiffness command
-+<H3>gran model hooke/stiffness model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hooke_stiffness.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_model_hooke_stiffness.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_model_hooke_stiffness.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran model hooke/stiffness command :h3
-+gran model hooke/stiffness model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_cdt.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_rolling_friction_cdt.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_cdt.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran rolling_friction cdt command
-+<H3>gran rolling_friction cdt model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_cdt.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_rolling_friction_cdt.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_cdt.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran rolling_friction cdt command :h3
-+gran rolling_friction cdt model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_rolling_friction_epsd.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran rolling_friction epsd command
-+<H3>gran rolling_friction epsd model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_rolling_friction_epsd.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran rolling_friction epsd command :h3
-+gran rolling_friction epsd model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd2.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_rolling_friction_epsd2.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd2.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran rolling_friction epsd2 command
-+<H3>gran rolling_friction epsd2 model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd2.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_rolling_friction_epsd2.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd2.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran rolling_friction epsd2 command :h3
-+gran rolling_friction epsd2 model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd3.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_rolling_friction_epsd3.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd3.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran rolling_friction epsd3 command
-+<H3>gran rolling_friction epsd3 model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd3.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_rolling_friction_epsd3.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_rolling_friction_epsd3.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran rolling_friction epsd3 command :h3
-+gran rolling_friction epsd3 model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_surface_sphere.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_surface_sphere.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_surface_sphere.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran surface sphere command
-+<H3>gran surface sphere model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_surface_sphere.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_surface_sphere.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_surface_sphere.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran surface sphere command :h3
-+gran surface sphere model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_tangential_history.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_tangential_history.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_tangential_history.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran tangential history command
-+<H3>gran tangential history model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_tangential_history.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_tangential_history.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_tangential_history.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran tangential history command :h3
-+gran tangential history model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_tangential_no_history.html
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_tangential_no_history.html
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_tangential_no_history.html
-@@ -9,7 +9,7 @@
-
- <HR>
-
--<H3>gran tangential no_history command
-+<H3>gran tangential no_history model
- </H3>
- <P><B>Syntax:</B>
- </P>
-Index: LIGGGHTS-PUBLIC-3.4.0/doc/gran_tangential_no_history.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/doc/gran_tangential_no_history.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/doc/gran_tangential_no_history.txt
-@@ -6,7 +6,7 @@
-
- :line
-
--gran tangential no_history command :h3
-+gran tangential no_history model :h3
-
- [Syntax:]
-
-Index: LIGGGHTS-PUBLIC-3.4.0/src/dump_local_gran_vtk.cpp
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/src/dump_local_gran_vtk.cpp
-+++ LIGGGHTS-PUBLIC-3.4.0/src/dump_local_gran_vtk.cpp
-@@ -54,7 +54,7 @@
- #include "update.h"
- #include "modify.h"
- #include "compute.h"
--#include "compute_pair_gran_local_bond.h"
-+#include "compute_pair_gran_local.h"
- #include "fix.h"
- #include "memory.h"
- #include "error.h"
-@@ -112,7 +112,7 @@ DumpLocalGranVTK::DumpLocalGranVTK(LAMMP
- if(!comp || !dynamic_cast<ComputePairGranLocal*>(comp))
- error->all(FLERR,"dump local/gran/vtk requires a valid ID of a compute pair/gran/local to be provided");
-
-- cpgl_ = static_cast<ComputePairGranLocalBond*>(comp);
-+ cpgl_ = static_cast<ComputePairGranLocal*>(comp);
-
- // error if compute does not write pos
- if(cpgl_->offset_x1() < 0 || cpgl_->offset_x2() < 0)
-@@ -868,12 +868,12 @@ int DumpLocalGranVTK::modify_param(int n
- }
-
- if (strcmp(arg[0],"element") == 0) {
-- error->all(FLERR,"Dump local/bond/gran does not support dump_modify 'element' ");
-+ error->all(FLERR,"Dump local/gran/vtk does not support dump_modify 'element' ");
- return 0;
- }
-
- if (strcmp(arg[0],"thresh") == 0) {
-- error->all(FLERR,"Dump local/bond/gran does not support dump_modify 'thresh' ");
-+ error->all(FLERR,"Dump local/gran/vtk does not support dump_modify 'thresh' ");
- }
-
- return 0;
-Index: LIGGGHTS-PUBLIC-3.4.0/src/version_liggghts.h
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/src/version_liggghts.h
-+++ LIGGGHTS-PUBLIC-3.4.0/src/version_liggghts.h
-@@ -1 +1 @@
--#define LIGGGHTS_VERSION "LIGGGHTS-PUBLIC 3.4.0, compiled 2016-05-17-21:57:06 by kloss, git commit 99507f5217ad4fd4be5107d6262bd7274c9a5c03"
-+#define LIGGGHTS_VERSION "LIGGGHTS-PUBLIC 3.4.1, compiled 2016-05-19-12:05:18 by kloss, git commit d575099f34aadeebbc3b15e320c9f4f8fea06cf7"
-Index: LIGGGHTS-PUBLIC-3.4.0/src/version_liggghts.txt
-===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/src/version_liggghts.txt
-+++ LIGGGHTS-PUBLIC-3.4.0/src/version_liggghts.txt
-@@ -1 +1 @@
--3.4.0
-+3.4.1
diff --git a/debian/patches/b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch b/debian/patches/b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch
index bdafb05..ae3efe3 100644
--- a/debian/patches/b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch
+++ b/debian/patches/b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Update surface_mesh_feature_remove.h
src/surface_mesh_feature_remove.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: LIGGGHTS-PUBLIC-3.4.0/src/surface_mesh_feature_remove.h
+Index: LIGGGHTS-PUBLIC-3.5.0/src/surface_mesh_feature_remove.h
===================================================================
---- LIGGGHTS-PUBLIC-3.4.0.orig/src/surface_mesh_feature_remove.h
-+++ LIGGGHTS-PUBLIC-3.4.0/src/surface_mesh_feature_remove.h
+--- LIGGGHTS-PUBLIC-3.5.0.orig/src/surface_mesh_feature_remove.h
++++ LIGGGHTS-PUBLIC-3.5.0/src/surface_mesh_feature_remove.h
@@ -1 +1 @@
-void handleExclusion(int *) {this->error->one(FLERR,"surface mesh feature remove not available in this version");}
+void handleExclusion(int *) {if(MultiNodeMesh<NUM_NODES>::minFeatureLength() > 0. )this->error->one(FLERR,"surface mesh feature remove not available in this version");}
diff --git a/debian/patches/series b/debian/patches/series
index 21568c9..0b9e2b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01_add_cmake_files.patch
05_vtk6_support.patch
b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch
-3ccbfc7e7fb8a339ff2566034a8d6809e29c6f92.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liggghts.git
More information about the debian-science-commits
mailing list