From e390982be7b1330d08194fadfd169ea5479840d2 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Thu, 19 Mar 2020 15:19:11 +0100
Subject: [PATCH] clean first level structure

---
 python/damask/__init__.py                      | 18 +++++++++---------
 .../damask/{asciitable.py => _asciitable.py}   |  0
 python/damask/{colormaps.py => _colormaps.py}  |  0
 python/damask/{config => _config}/__init__.py  |  0
 python/damask/{config => _config}/material.py  |  0
 python/damask/{lattice.py => _lattice.py}      |  4 +---
 .../damask/{orientation.py => _orientation.py} |  4 ++--
 python/damask/{rotation.py => _rotation.py}    |  0
 python/damask/{solver => _solver}/__init__.py  |  0
 python/damask/{solver => _solver}/marc.py      |  0
 python/damask/{solver => _solver}/solver.py    |  0
 python/damask/{table.py => _table.py}          |  0
 python/damask/{test.py => _test.py}            |  0
 13 files changed, 12 insertions(+), 14 deletions(-)
 rename python/damask/{asciitable.py => _asciitable.py} (100%)
 rename python/damask/{colormaps.py => _colormaps.py} (100%)
 rename python/damask/{config => _config}/__init__.py (100%)
 rename python/damask/{config => _config}/material.py (100%)
 rename python/damask/{lattice.py => _lattice.py} (99%)
 rename python/damask/{orientation.py => _orientation.py} (99%)
 rename python/damask/{rotation.py => _rotation.py} (100%)
 rename python/damask/{solver => _solver}/__init__.py (100%)
 rename python/damask/{solver => _solver}/marc.py (100%)
 rename python/damask/{solver => _solver}/solver.py (100%)
 rename python/damask/{table.py => _table.py} (100%)
 rename python/damask/{test.py => _test.py} (100%)

diff --git a/python/damask/__init__.py b/python/damask/__init__.py
index 7951c63e1..7933651da 100644
--- a/python/damask/__init__.py
+++ b/python/damask/__init__.py
@@ -8,18 +8,18 @@ with open(_os.path.join(_os.path.dirname(__file__),'VERSION')) as _f:
 
 # classes
 from ._environment import Environment      # noqa
-from .table        import Table            # noqa
+from ._table       import Table            # noqa
 from ._vtk         import VTK              # noqa
-from .colormaps    import Colormap, Color  # noqa
-from .rotation     import Rotation         # noqa
-from .lattice      import Symmetry, Lattice# noqa
-from .orientation  import Orientation      # noqa
+from ._colormaps   import Colormap, Color  # noqa
+from ._rotation    import Rotation         # noqa
+from ._lattice     import Symmetry, Lattice# noqa
+from ._orientation import Orientation      # noqa
 from ._result      import Result           # noqa
 from ._geom        import Geom             # noqa
-from .solver       import Solver           # noqa
+from ._solver      import Solver           # noqa
 
 # deprecated
-from .asciitable  import ASCIItable       # noqa
+from ._asciitable import ASCIItable       # noqa
+from ._config     import Material         # noqa
+from ._test       import Test             # noqa
 from .util        import extendableOption # noqa
-from .config      import Material         # noqa
-from .test        import Test             # noqa
diff --git a/python/damask/asciitable.py b/python/damask/_asciitable.py
similarity index 100%
rename from python/damask/asciitable.py
rename to python/damask/_asciitable.py
diff --git a/python/damask/colormaps.py b/python/damask/_colormaps.py
similarity index 100%
rename from python/damask/colormaps.py
rename to python/damask/_colormaps.py
diff --git a/python/damask/config/__init__.py b/python/damask/_config/__init__.py
similarity index 100%
rename from python/damask/config/__init__.py
rename to python/damask/_config/__init__.py
diff --git a/python/damask/config/material.py b/python/damask/_config/material.py
similarity index 100%
rename from python/damask/config/material.py
rename to python/damask/_config/material.py
diff --git a/python/damask/lattice.py b/python/damask/_lattice.py
similarity index 99%
rename from python/damask/lattice.py
rename to python/damask/_lattice.py
index 3c949b02c..42aa0e9bd 100644
--- a/python/damask/lattice.py
+++ b/python/damask/_lattice.py
@@ -1,10 +1,8 @@
 import numpy as np
 
-from .rotation import Rotation
+from . import Rotation
 
-P = -1
 
-# ******************************************************************************************
 class Symmetry:
     """
     Symmetry operations for lattice systems.
diff --git a/python/damask/orientation.py b/python/damask/_orientation.py
similarity index 99%
rename from python/damask/orientation.py
rename to python/damask/_orientation.py
index d3f42c8d1..6cbe4f7d4 100644
--- a/python/damask/orientation.py
+++ b/python/damask/_orientation.py
@@ -1,7 +1,7 @@
 import numpy as np
 
-from .lattice  import Lattice
-from .rotation import Rotation
+from . import Lattice
+from . import Rotation
 
 class Orientation:
   """
diff --git a/python/damask/rotation.py b/python/damask/_rotation.py
similarity index 100%
rename from python/damask/rotation.py
rename to python/damask/_rotation.py
diff --git a/python/damask/solver/__init__.py b/python/damask/_solver/__init__.py
similarity index 100%
rename from python/damask/solver/__init__.py
rename to python/damask/_solver/__init__.py
diff --git a/python/damask/solver/marc.py b/python/damask/_solver/marc.py
similarity index 100%
rename from python/damask/solver/marc.py
rename to python/damask/_solver/marc.py
diff --git a/python/damask/solver/solver.py b/python/damask/_solver/solver.py
similarity index 100%
rename from python/damask/solver/solver.py
rename to python/damask/_solver/solver.py
diff --git a/python/damask/table.py b/python/damask/_table.py
similarity index 100%
rename from python/damask/table.py
rename to python/damask/_table.py
diff --git a/python/damask/test.py b/python/damask/_test.py
similarity index 100%
rename from python/damask/test.py
rename to python/damask/_test.py