From 77ca68a2b4da74ff3ed0abf279d8d6d929de0f99 Mon Sep 17 00:00:00 2001
From: Oliver Henrich <o.henrich@epcc.ed.ac.uk>
Date: Thu, 15 Jun 2017 12:52:19 +0100
Subject: [PATCH] Changed affiliation
---
doc/src/Section_packages.txt | 2 +-
examples/USER/cgdna/util/generate.py | 4 ++--
src/USER-CGDNA/README | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/src/Section_packages.txt b/doc/src/Section_packages.txt
index cc44c05906..710b960e94 100644
--- a/doc/src/Section_packages.txt
+++ b/doc/src/Section_packages.txt
@@ -1502,7 +1502,7 @@ oxDNA model of Doye, Louis and Ouldridge at the University of Oxford.
This includes Langevin-type rigid-body integrators with improved
stability.
-[Author:] Oliver Henrich (University of Edinburgh).
+[Author:] Oliver Henrich (University of Strathclyde, Glasgow).
[Install or un-install:]
diff --git a/examples/USER/cgdna/util/generate.py b/examples/USER/cgdna/util/generate.py
index d5a74e9bf7..5bf5b9cab6 100644
--- a/examples/USER/cgdna/util/generate.py
+++ b/examples/USER/cgdna/util/generate.py
@@ -14,7 +14,7 @@
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
- Contributing author: Oliver Henrich (EPCC, University of Edinburgh)
+ Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
------------------------------------------------------------------------- */
"""
@@ -45,7 +45,7 @@ try:
box_length = float(sys.argv[2])
infile = sys.argv[3]
except:
- print >> sys.stderr, "Usage: %s <%s> <%s> <%s>" % (sys.argv[0], \
+ rint >> sys.stderr, "Usage: %s <%s> <%s> <%s>" % (sys.argv[0], \
"box offset", "box length", "file with sequences")
sys.exit(1)
box = np.array ([box_length, box_length, box_length])
diff --git a/src/USER-CGDNA/README b/src/USER-CGDNA/README
index 516f18c36c..735f005f54 100644
--- a/src/USER-CGDNA/README
+++ b/src/USER-CGDNA/README
@@ -39,10 +39,10 @@ of the LAMMPS manual).
The creator of this package is:
Dr Oliver Henrich
-University of Strathclyde, UK
+University of Strathclyde, Glasgow, UK
+oliver.henrich at strath.ac.uk
University of Edinburgh, UK
-ohenrich@ph.ed.ac.uk
-o.henrich@epcc.ed.ac.uk
+ohenrich at staffmail.ed.ac.uk
--------------------------------------------------------------------------
--
GitLab