From 5c46890468aad025feae8788bd8e4b276d4bf4da Mon Sep 17 00:00:00 2001 From: Oliver Hahn Date: Sun, 23 Aug 2020 16:01:02 +0200 Subject: [PATCH] updated licensing info for panphasia --- external/panphasia/LICENSE | 35 +++++++++++++++++++++++++++++++++ src/plugins/random_panphasia.cc | 8 ++++++++ 2 files changed, 43 insertions(+) create mode 100644 external/panphasia/LICENSE diff --git a/external/panphasia/LICENSE b/external/panphasia/LICENSE new file mode 100644 index 0000000..27a5ff9 --- /dev/null +++ b/external/panphasia/LICENSE @@ -0,0 +1,35 @@ +The code in this subdirectory is part of Adrian Jenkins' PANPHASIA packet, +obtained from here http://icc.dur.ac.uk/Panphasia.php + +PANPHASIA is not published under the GPL but has its own proprietary license, +make sure to visit the website before using the PANPHASIA functionality of +MUSIC2 and register your name. + +We reproduce the licensing requirements for PANPHASIA from the above website +as retrieved on 2020/08/23: + +We make our software available for free but with a licence that includes the +condition that users make sure the phases of any new simulation volumes set up +using Panphasia are published. + +We are happy to collaborate with others on improving the software and providing +support for languages other than fortran. Contact: A.R.Jenkins@durham.ac.uk + +LICENCE: + +You are licensed to use this software free of charge on condition that: + +- you will publish the phase descriptors and reference Jenkins (13) for any new + simulations that use Panphasia phases. You will pass on this condition to others + for any software or data you make available publically or privately that makes + use of Panphasia. +- that you will ensure any publications using results derived from Panphasia will + be submitted as a final version to arXiv prior to or coincident with publication + in a journal. +- that you report any bugs in this software as soon as confirmed to + A.R.Jenkins@durham.ac.uk +- that you understand that the software comes with no warranty and that is your + responsibility to ensure that it is suitable for the purpose that you intend. +- that you agree to having your name and email address stored for an indefinite + period in the future electronically in a database as a record that you agreed + the licence conditions. diff --git a/src/plugins/random_panphasia.cc b/src/plugins/random_panphasia.cc index 02267e6..4aa0e49 100644 --- a/src/plugins/random_panphasia.cc +++ b/src/plugins/random_panphasia.cc @@ -1,6 +1,7 @@ // This file is part of monofonIC (MUSIC2) // A software package to generate ICs for cosmological simulations // Copyright (C) 2020 by Oliver Hahn and Adrian Jenkins (this file) +// but see distinct licensing for PANPHASIA below // // monofonIC is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -14,6 +15,13 @@ // // You should have received a copy of the GNU General Public License // along with this program. If not, see . +// +// IMPORTANT NOTICE: +// Note that PANPHASIA itself is not released under the GPL. Make sure +// to read and agree to its distinct licensing before you use or modify +// the code below or in the /external/panphasia directory which can be +// found here: http://icc.dur.ac.uk/Panphasia.php +// NOTE THAT PANPHASIA REQUIRES REGISTRATION ON THIS WEBSITE PRIOR TO USE #if defined(USE_PANPHASIA)