forked from eWaterCycle/amuse-framework
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into socket_channel_boolean_fix
- Loading branch information
Showing
27 changed files
with
1,029 additions
and
278 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| { | ||
| "creators": [ | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "Portegies Zwart, Simon", | ||
| "orcid": "0000-0001-5839-0302" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "van Elteren, Arjen" | ||
| }, | ||
| { | ||
| "affiliation": "Netherlands eScience Center", | ||
| "name": "Pelupessy, Inti" | ||
| }, | ||
| { | ||
| "affiliation": "Drexel University", | ||
| "name": "McMillan, Steve" | ||
| }, | ||
| { | ||
| "affiliation": "University of Exeter", | ||
| "name": "Rieder, Steven", | ||
| "orcid": "0000-0003-3688-5798" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "de Vries, Nathan" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "Marosvolgyi, Marcell" | ||
| }, | ||
| { | ||
| "affiliation": "Drexel University", | ||
| "name": "Whitehead, Alfred" | ||
| }, | ||
| { | ||
| "affiliation": "Drexel University", | ||
| "name": "Wall, Joshua" | ||
| }, | ||
| { | ||
| "affiliation": "Netherlands eScience Center", | ||
| "name": "Drost, Niels", | ||
| "orcid": "0000-0001-9795-7981" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "Jilkova, Lucie" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "Martinez Barbosa, Carmen" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "van der Helm, Edwin" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "Beedorf, Jeroen" | ||
| }, | ||
| { | ||
| "affiliation": "Netherlands eScience Center", | ||
| "name": "Bos, Patrick" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "Boekholt, Tjarda" | ||
| }, | ||
| { | ||
| "affiliation": "Netherlands eScience Center", | ||
| "name": "van Werkhoven, Ben" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "Wijnen, Thomas" | ||
| }, | ||
| { | ||
| "affiliation": "Institute for Advanced Study", | ||
| "name": "Hamers, Adrian" | ||
| }, | ||
| { | ||
| "affiliation": "Booking.com", | ||
| "name": "Caputo, Daniel" | ||
| }, | ||
| { | ||
| "affiliation": "Leiden University", | ||
| "name": "Ferrari, Guilherme" | ||
| }, | ||
| { | ||
| "affiliation": "University of Amsterdam", | ||
| "name": "Toonen, Silvia" | ||
| }, | ||
| { | ||
| "affiliation": "Nvidia", | ||
| "name": "Gaburov, Evghenii" | ||
| }, | ||
| { | ||
| "affiliation": "TNO", | ||
| "name": "Paardekooper, Jan-Pieter" | ||
| }, | ||
| { | ||
| "affiliation": "University of Cambridge", | ||
| "name": "Janes, Jurgen" | ||
| }, | ||
| { | ||
| "affiliation": "University of Groningen", | ||
| "name": "Punzo, Davide" | ||
| }, | ||
| { | ||
| "affiliation": "Quintel Intellegence", | ||
| "name": "Kruip, Chael" | ||
| }, | ||
| { | ||
| "affiliation": "Georgia Institute of Technology", | ||
| "name": "Altay, Gabriel" | ||
| } | ||
| ], | ||
| "description": "A Python framework to combine existing astrophysical simulation codes in numerical experiments. With AMUSE you can simulate objects such as star clusters, proto-planetary disks and galaxies.", | ||
| "keywords": [ | ||
| "astronomy", | ||
| "multi-model simulation", | ||
| "model coupling", | ||
| "physics" | ||
| ], | ||
| "license": { | ||
| "id": "Apache-2.0" | ||
| }, | ||
| "title": "AMUSE: the Astrophysical Multipurpose Software Environment" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| # YAML 1.2 | ||
| # to generate .zenodo json: cffconvert -ig -f zenodo -of .zenodo.json | ||
| # note we have omitted date released & version | ||
| --- | ||
| abstract: "A Python framework to combine existing astrophysical simulation codes in numerical experiments. With AMUSE you can simulate objects such as star clusters, proto-planetary disks and galaxies." | ||
| authors: | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: "Portegies Zwart" | ||
| given-names: Simon | ||
| orcid: "https://orcid.org/0000-0001-5839-0302" | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: Elteren | ||
| given-names: Arjen | ||
| name-particle: van | ||
| - | ||
| affiliation: "Netherlands eScience Center" | ||
| family-names: Pelupessy | ||
| given-names: Inti | ||
| - | ||
| affiliation: "Drexel University" | ||
| family-names: McMillan | ||
| given-names: Steve | ||
| - | ||
| affiliation: "University of Exeter" | ||
| family-names: Rieder | ||
| given-names: Steven | ||
| orcid: "https://orcid.org/0000-0003-3688-5798" | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: de Vries | ||
| given-names: Nathan | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: Marosvolgyi | ||
| given-names: Marcell | ||
| - | ||
| affiliation: "Drexel University" | ||
| family-names: Whitehead | ||
| given-names: Alfred | ||
| - | ||
| affiliation: "Drexel University" | ||
| family-names: Wall | ||
| given-names: Joshua | ||
| - | ||
| affiliation: "Netherlands eScience Center" | ||
| family-names: Drost | ||
| given-names: Niels | ||
| orcid: "https://orcid.org/0000-0001-9795-7981" | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: Jilkova | ||
| given-names: Lucie | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: Martinez Barbosa | ||
| given-names: Carmen | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: van der Helm | ||
| given-names: Edwin | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: Beedorf | ||
| given-names: Jeroen | ||
| - | ||
| affiliation: "Netherlands eScience Center" | ||
| family-names: Bos | ||
| given-names: Patrick | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: Boekholt | ||
| given-names: Tjarda | ||
| - | ||
| affiliation: "Netherlands eScience Center" | ||
| family-names: Werkhoven | ||
| given-names: Ben | ||
| name-particle: van | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: Wijnen | ||
| given-names: Thomas | ||
| - | ||
| affiliation: "Institute for Advanced Study" | ||
| family-names: Hamers | ||
| given-names: Adrian | ||
| - | ||
| affiliation: "Booking.com" | ||
| family-names: Caputo | ||
| given-names: Daniel | ||
| - | ||
| affiliation: "Leiden University" | ||
| family-names: Ferrari | ||
| given-names: Guilherme | ||
| - | ||
| affiliation: "University of Amsterdam" | ||
| family-names: Toonen | ||
| given-names: Silvia | ||
| - | ||
| affiliation: "Nvidia" | ||
| family-names: Gaburov | ||
| given-names: Evghenii | ||
| - | ||
| affiliation: "TNO" | ||
| family-names: Paardekooper | ||
| given-names: Jan-Pieter | ||
| - | ||
| affiliation: "University of Cambridge" | ||
| family-names: Janes | ||
| given-names: Jurgen | ||
| - | ||
| affiliation: "University of Groningen" | ||
| family-names: Punzo | ||
| given-names: Davide | ||
| - | ||
| affiliation: "Quintel Intellegence" | ||
| family-names: Kruip | ||
| given-names: Chael | ||
| - | ||
| affiliation: "Georgia Institute of Technology" | ||
| family-names: Altay | ||
| given-names: Gabriel | ||
|
|
||
|
|
||
| cff-version: "1.0.3" | ||
| doi: "10.5281/zenodo.1435860" | ||
| keywords: | ||
| - astronomy | ||
| - "multi-model simulation" | ||
| - "model coupling" | ||
| - physics | ||
| license: "Apache-2.0" | ||
| message: "This is the software citation for the framework code. If you publish work with AMUSE please cite also the code papers of the components used." | ||
| repository-code: "https://github.com/amusecode/amuse" | ||
| title: "AMUSE: the Astrophysical Multipurpose Software Environment" | ||
| ... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.