From a3aff96ccb16594e6cbb2ffa077a341a435020e6 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Fri, 1 Apr 2016 00:06:03 +0100
Subject: [PATCH] Give credit where credit is due
---
examples/ExternalGravity/makeIC.py | 4 ++--
examples/TestingGravity/makeIC.py | 4 ++--
examples/main.c | 3 +++
src/cell.c | 4 ++++
src/cell.h | 4 ++++
src/const.h | 8 +------
src/engine.c | 4 ++++
src/engine.h | 5 ++++
src/gravity/Default/gravity.h | 1 +
src/runner.c | 4 ++++
src/runner.h | 4 ++++
src/space.c | 38 +++++++++++++++++-------------
src/space.h | 4 ++++
src/task.c | 4 ++++
src/task.h | 3 +++
src/timers.c | 3 +++
src/timers.h | 3 +++
17 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/examples/ExternalGravity/makeIC.py b/examples/ExternalGravity/makeIC.py
index cbe565af29..29a96b5b82 100644
--- a/examples/ExternalGravity/makeIC.py
+++ b/examples/ExternalGravity/makeIC.py
@@ -1,7 +1,7 @@
###############################################################################
# This file is part of SWIFT.
- # Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
- # Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ # Copyright (c) 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ # Tom Theuns (tom.theuns@durham.ac.uk)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published
diff --git a/examples/TestingGravity/makeIC.py b/examples/TestingGravity/makeIC.py
index cbe565af29..29a96b5b82 100644
--- a/examples/TestingGravity/makeIC.py
+++ b/examples/TestingGravity/makeIC.py
@@ -1,7 +1,7 @@
###############################################################################
# This file is part of SWIFT.
- # Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
- # Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ # Copyright (c) 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ # Tom Theuns (tom.theuns@durham.ac.uk)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published
diff --git a/examples/main.c b/examples/main.c
index 052d425ea5..05f1c24412 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -3,6 +3,9 @@
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
* Matthieu Schaller (matthieu.schaller@durham.ac.uk)
* 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * Angus Lepper (angus.lepper@ed.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/cell.c b/src/cell.c
index 61acfaaea7..c22ab310d7 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1,6 +1,10 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/cell.h b/src/cell.h
index 6070736609..fbdaa928bd 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -1,6 +1,10 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/const.h b/src/const.h
index 3103945727..8b69eb12e4 100644
--- a/src/const.h
+++ b/src/const.h
@@ -58,6 +58,7 @@
0.57735f /* Opening criteria, which is the ratio of the \
cell distance over the cell width. */
+#define const_G 6.672e-8f /* Gravitational constant. */
#define const_epsilon 0.0014f /* Gravity blending distance. */
#define const_iepsilon 714.285714286f /* Inverse gravity blending distance. */
#define const_iepsilon2 (const_iepsilon* const_iepsilon)
@@ -80,11 +81,4 @@
#define const_unit_mass_in_cgs (SOLAR_MASS_IN_CGS) /* solar mass */
#define const_unit_velocity_in_cgs (1e5) /* km/s */
-/* Derived constants */
-#define const_unit_time_in_cgs \
- (const_unit_length_in_cgs / const_unit_velocity_in_cgs)
-#define const_G \
- ((NEWTON_GRAVITY_CGS* const_unit_mass_in_cgs / \
- (const_unit_velocity_in_cgs* const_unit_velocity_in_cgs* \
- const_unit_length_in_cgs)))
#endif /* SWIFT_CONST_H */
diff --git a/src/engine.c b/src/engine.c
index 354a2d623b..388ffd3546 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1,7 +1,11 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
* 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * Angus Lepper (angus.lepper@ed.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/engine.h b/src/engine.h
index f63fed8e8f..79b2f61f31 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -1,6 +1,11 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * Angus Lepper (angus.lepper@ed.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/gravity/Default/gravity.h b/src/gravity/Default/gravity.h
index 5bc516735d..0462846716 100644
--- a/src/gravity/Default/gravity.h
+++ b/src/gravity/Default/gravity.h
@@ -1,6 +1,7 @@
/*******************************************************************************
* This file is part of SWIFT.
* Coypright (c) 2015 Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2016 Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/runner.c b/src/runner.c
index d5a3edfac2..205287efe7 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1,6 +1,10 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/runner.h b/src/runner.h
index ff2f93db6e..f052bb57cd 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -1,6 +1,10 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/space.c b/src/space.c
index a937b49a82..1de35a16b0 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,21 +1,25 @@
/*******************************************************************************
-* This file is part of SWIFT.
-* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published
-* by the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-******************************************************************************/
+ * This file is part of SWIFT.
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ ******************************************************************************/
/* Config parameters. */
#include "../config.h"
diff --git a/src/space.h b/src/space.h
index e761595838..f322f8d0cb 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,6 +1,10 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/task.c b/src/task.c
index 1ad4b95be8..d9bc7ee824 100644
--- a/src/task.c
+++ b/src/task.c
@@ -1,6 +1,10 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/task.h b/src/task.h
index 3e641ad2b0..26565f37f6 100644
--- a/src/task.h
+++ b/src/task.h
@@ -2,6 +2,9 @@
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
* Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/timers.c b/src/timers.c
index 2501d347c8..b621d27c90 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -1,6 +1,9 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
diff --git a/src/timers.h b/src/timers.h
index 7a5fe868ba..bf288d7392 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -1,6 +1,9 @@
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ * 2016 John A. Regan (john.a.regan@durham.ac.uk)
+ * Tom Theuns (tom.theuns@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
--
GitLab