Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pyiron gb #164

Merged
merged 2 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.9.13
current_version = 0.9.14
commit = True
tag = False

Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ url: 'https://atomrdf.pyscal.org'
license: "MIT"
repository-code: https://github.com/pyscal/atomRDF
type: software
version: 0.9.13
version: 0.9.14
28 changes: 24 additions & 4 deletions atomrdf/workflow/pyiron/pyiron.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from functools import partial, update_wrapper
from pyscal3.core import structure_dict, element_dict

from atomrdf.structure import _make_crystal
from atomrdf.structure import _make_crystal, _make_grain_boundary
import atomrdf.workflow.pyiron.lammps as lammps
import atomrdf.workflow.pyiron.vasp as vasp
import atomrdf.workflow.pyiron.murnaghan as murnaghan
Expand Down Expand Up @@ -100,29 +100,49 @@ def bulk(

def grain_boundary(
self,
element,
axis,
sigma,
gb_plane,
repetitions=(1, 1, 1),
crystalstructure=None,
element=None,
a=1,
covera=1.633,
repetitions=(1, 1, 1),
overlap=0.0,
gap=0.0,
vacuum=0.0,
delete_layer="0b0t0b0t",
tolerance= 0.25,
primitive=False,
uc_a=1,
uc_b=1,
graph=None,
names=False,
label=None,
backend='aimsgb'
):

struct = self._graph._annotated_make_grain_boundary(
struct = _make_grain_boundary(
axis,
sigma,
gb_plane,
structure=crystalstructure,
element=element,
lattice_constant=a,
ca_ratio=covera,
repetitions=repetitions,
overlap=overlap,
gap=gap,
vacuum=vacuum,
delete_layer=delete_layer,
tolerance=tolerance,
primitive=primitive,
uc_a=uc_a,
uc_b=uc_b,
graph=self._graph,
names=names,
label=label,
backend=backend
)

ase_structure = struct.write.ase()
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='atomrdf',
version='0.9.13',
version='0.9.14',
author='Abril Azocar Guzman, Sarath Menon',
author_email='sarath.menon@pyscal.org',
description='Ontology based structural manipulation and quering',
Expand Down
Loading