Skip to content

Commit

Permalink
Merge branch 'master' of https://www.github.com/amrex-codes/amrex
Browse files Browse the repository at this point in the history
  • Loading branch information
asalmgren committed Jan 24, 2019
2 parents 3224324 + 33f4042 commit 23d46f8
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,33 @@
},
{
"affiliation": "Center for Computational Sciences and Engineering, Lawrence Berkeley National Laboratory",
"name": "Blaschke, Johannes"
"name": "Blaschke, Johannes",
"orcid": ""
},
{
"affiliation": "Computer Science Department, Lawrence Berkeley National Laboratory",
"name": "Chan, Cy"
"name": "Chan, Cy",
"orcid": ""
},
{
"affiliation": "Center for Computational Sciences and Engineering, Lawrence Berkeley National Laboratory",
"name": "Day, Marcus"
"name": "Day, Marcus",
"orcid": "0000-0002-1711-3963"
},
{
"affiliation": "Center for Computational Sciences and Engineering and NERSC, Lawrence Berkeley National Laboratory",
"name": "Friesen, Brian"
"name": "Friesen, Brian",
"orcid": "0000-0002-1572-1631"
},
{
"affiliation": "Center for Computational Sciences and Engineering and NERSC, Lawrence Berkeley National Laboratory",
"name": "Gott, Kevin"
"name": "Gott, Kevin",
"orcid": "0000-0003-3244-5525"
},
{
"affiliation": "Applied Numerical Algorithms Group, Lawrence Berkeley National Laboratory",
"name": "Graves, Daniel"
"orcid":0000-0001-9730-7217"
"name": "Graves, Daniel",
"orcid": "0000-0001-9730-7217"
},
{
"affiliation": "NVIDIA Corporation",
Expand All @@ -46,22 +48,22 @@
},
{
"affiliation": "Center for Computational Sciences and Engineering, Lawrence Berkeley National Laboratory",
"name": "Myers, Andrew"
"name": "Myers, Andrew",
"orcid": "0000-0001-8427-8330"
},
{
"affiliation": "Computer Science Department, Lawrence Berkeley National Laboratory",
"name": "Nguyen, Tan"
"name": "Nguyen, Tan",
"orcid": "0000-0003-3748-403X"
},
{
"affiliation": "Center for Computational Sciences and Engineering, Lawrence Berkeley National Laboratory",
"name": "Nonaka, Andrew"
"name": "Nonaka, Andrew",
"orcid": "0000-0003-1791-0265"
},
{
"affiliation": "Center for Computational Sciences and Engineering, Lawrence Berkeley National Laboratory",
"name": "Rosso, Michele"
"name": "Rosso, Michele",
"orcid": "0000-0001-8126-7425"
},
{
Expand Down

0 comments on commit 23d46f8

Please sign in to comment.