Code

Try to merge#1

Code

Open

KunhuanLiu wants to merge 26 commits intoKunhuanLiu:masterKunhuanLiu/tobacco_3.0:masterfrom Andrew-S-Rosen:masterCopy head branch name to clipboard

+392,546-488,363

Commits

Commits on Jan 13, 2020

• Merge pull request tobacco-mofs#4 from arosen93/master

  Show description for 3d9eae4
  rytheranderson

  authored
  3d9eae4

  Copy full SHA for 3d9eae4

Commits on Jan 28, 2020

• Added new ValueErrors, removed some unneeded imports

  

  rytheranderson

  committed
  e9ac28b

  Copy full SHA for e9ac28b

Commits on Feb 3, 2020

• Cleanup

  Show description for 929e6c3
  

  Andrew Rosen

  committed
  929e6c3

  Copy full SHA for 929e6c3

• Add folder for old template files

  Show description for 5736e3c
  

  Andrew Rosen

  committed
  5736e3c

  Copy full SHA for 5736e3c

• Add script to scrape RCSR

  Show description for 4b815a4
  

  Andrew Rosen

  committed
  4b815a4

  Copy full SHA for 4b815a4

• Overhaul make_topologies.py

  Show description for 4e85049
  

  Andrew Rosen

  committed
  4e85049

  Copy full SHA for 4e85049

• Add new template files

  Show description for 557a83b
  

  Andrew Rosen

  committed
  557a83b

  Copy full SHA for 557a83b

• Add output CIFs

  Show description for 33c827e
  

  Andrew Rosen

  committed
  33c827e

  Copy full SHA for 33c827e

• updated README

  

  rytheranderson

  committed
  417d6da

  Copy full SHA for 417d6da

• updated README

  

  rytheranderson

  committed
  ad17290

  Copy full SHA for ad17290

• updated README

  

  rytheranderson

  committed
  40fab2b

  Copy full SHA for 40fab2b

• updated README

  

  rytheranderson

  committed
  79b27fe

  Copy full SHA for 79b27fe

• Don't calculate distance matrix in make_topologies.py

  

  Andrew Rosen

  committed
  7232fc6

  Copy full SHA for 7232fc6

Commits on Feb 4, 2020

• Prevent cifnames > 255 characters

  

  Andrew Rosen

  committed
  fd76389

  Copy full SHA for fd76389

• Merge remote-tracking branch 'upstream/master'

  

  Andrew Rosen

  committed
  739c894

  Copy full SHA for 739c894

• Add an additional coordination number check to make_topologies.py

  

  Andrew Rosen

  committed
  665f875

  Copy full SHA for 665f875

Commits on Feb 5, 2020

• Add another make_topologies check

  

  Andrew Rosen

  committed
  68e41c8

  Copy full SHA for 68e41c8

• Push latest topology files

  

  Andrew Rosen

  committed
  41e9dca

  Copy full SHA for 41e9dca

• Merge pull request tobacco-mofs#6 from arosen93/master

  Show description for bad1871
  rytheranderson

  authored
  bad1871

  Copy full SHA for bad1871

Commits on Feb 6, 2020

• Fix typo in make_topologies.py error

  

  Andrew Rosen

  committed
  a7fbe93

  Copy full SHA for a7fbe93

Commits on Feb 7, 2020

• now compatible with py3, can use catenated nets, can run parallel over templates

  

  rytheranderson

  committed
  a46c6ed

  Copy full SHA for a46c6ed

• updated README and manual

  

  rytheranderson

  committed
  cc78e36

  Copy full SHA for cc78e36

Commits on Feb 16, 2020

• Add partial support for 2D topologies in make_topologies.py

  

  Andrew Rosen

  committed
  63811ba

  Copy full SHA for 63811ba

• Merge upstream

  

  Andrew Rosen

  committed
  45ac4d1

  Copy full SHA for 45ac4d1

• Finalize handling of 2D topologies in make_topologies.py

  

  Andrew Rosen

  committed
  19112e0

  Copy full SHA for 19112e0

• Upload missing krwd

  

  Andrew Rosen

  committed
  b1636fc

  Copy full SHA for b1636fc