Merge pull request #1160 from pyiron/vasp_refactor

Move standalone parser to separate submodule
pyiron · Nov 20, 2023 · 2e64d8c · 2e64d8c
2 parents d38d649 + 2c7400b
commit 2e64d8c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/pyiron_atomistics/vasp/base.py b/pyiron_atomistics/vasp/base.py
@@ -23,8 +23,8 @@
     dict_group_to_hdf,
 )
 from pyiron_base import state, GenericParameters, deprecate
-from pyiron_atomistics.vasp.outcar import Outcar
-from pyiron_atomistics.vasp.oszicar import Oszicar
+from pyiron_atomistics.vasp.parser.outcar import Outcar
+from pyiron_atomistics.vasp.parser.oszicar import Oszicar
 from pyiron_atomistics.vasp.procar import Procar
 from pyiron_atomistics.vasp.structure import read_atoms, write_poscar, vasp_sorter
 from pyiron_atomistics.vasp.vasprun import Vasprun as Vr

diff --git a/pyiron_atomistics/vasp/interactive.py b/pyiron_atomistics/vasp/interactive.py
@@ -6,7 +6,7 @@
 import os
 from subprocess import Popen, PIPE
 
-from pyiron_atomistics.vasp.outcar import Outcar
+from pyiron_atomistics.vasp.parser.outcar import Outcar
 from pyiron_atomistics.vasp.base import VaspBase
 from pyiron_atomistics.vasp.structure import vasp_sorter
 from pyiron_atomistics.vasp.potential import VaspPotentialSetter

diff --git a/pyiron_atomistics/vasp/metadyn.py b/pyiron_atomistics/vasp/metadyn.py
@@ -6,7 +6,7 @@
 from pyiron_base import GenericParameters
 from pyiron_atomistics.vasp.vasp import Vasp
 from pyiron_atomistics.vasp.base import Input, Output
-from pyiron_atomistics.vasp.report import Report
+from pyiron_atomistics.vasp.parser.report import Report
 import os
 import posixpath
 

diff --git a/pyiron_atomistics/vasp/parser/__init__.py b/pyiron_atomistics/vasp/parser/__init__.py
diff --git a/pyiron_atomistics/vasp/oszicar.py → pyiron_atomistics/vasp/parser/oszicar.py b/pyiron_atomistics/vasp/oszicar.py → pyiron_atomistics/vasp/parser/oszicar.py
diff --git a/pyiron_atomistics/vasp/outcar.py → pyiron_atomistics/vasp/parser/outcar.py b/pyiron_atomistics/vasp/outcar.py → pyiron_atomistics/vasp/parser/outcar.py
diff --git a/pyiron_atomistics/vasp/report.py → pyiron_atomistics/vasp/parser/report.py b/pyiron_atomistics/vasp/report.py → pyiron_atomistics/vasp/parser/report.py
diff --git a/tests/vasp/test_oszicar.py b/tests/vasp/test_oszicar.py
@@ -5,7 +5,7 @@
 import numpy as np
 import os
 import posixpath
-from pyiron_atomistics.vasp.oszicar import Oszicar
+from pyiron_atomistics.vasp.parser.oszicar import Oszicar
 import unittest
 
 

diff --git a/tests/vasp/test_outcar.py b/tests/vasp/test_outcar.py
@@ -6,7 +6,7 @@
 import os
 import posixpath
 import numpy as np
-from pyiron_atomistics.vasp.outcar import Outcar
+from pyiron_atomistics.vasp.parser.outcar import Outcar
 
 
 class TestOutcar(unittest.TestCase):