From 07e5c2afe7f46dc887223de7c8f03f1aec8984d5 Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Sat, 17 Nov 2018 15:57:39 -0500 Subject: [PATCH] Add license from Cantera and add Code of Conduct note to README --- License.txt | 30 ++++++++++++++++++++++++++++++ README.md | 8 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 License.txt diff --git a/License.txt b/License.txt new file mode 100644 index 0000000..310814f --- /dev/null +++ b/License.txt @@ -0,0 +1,30 @@ +Copyright (c) 2016-2018, Cantera Developers. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +- Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +- Neither the name of the California Institute of Technology, Sandia + Corporation nor the names of other contributors may be used to + endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 8d270fe..c6e5f56 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,13 @@ there is no installation required. * Reactor Models * [Batch Reactors: Illustration of ignition delay calculation](https://github.com/Cantera/cantera-jupyter/blob/master/reactors/batch_reactor_ignition_delay_NTC.ipynb) * [Continuous Reactors: Simulations at a given residence time](https://github.com/Cantera/cantera-jupyter/blob/master/reactors/stirred_reactor.ipynb) - + +## Code of Conduct + +This repository follows the same code of conduct as the main Cantera repository. +Cantera adheres to a [code of conduct](https://github.com/Cantera/cantera/blob/master/CODE_OF_CONDUCT.md) +adapted from the [Contributor Covenant code of conduct](https://contributor-covenant.org/). + ## Frequently Asked Questions **How do I use Cantera with Python?**