inp: added lattice specification parsing

Author: BitterB0NG0

docs/source/pymcnp/inp/data.md

@@ -421,6 +421,14 @@
    :inherited-members:
 ```
 
+### ``F_4`` Class
+
+```{eval-rst}
+.. autoclass:: pymcnp.inp.data.F_4
+   :members:
+   :inherited-members:
+```
+
 ### ``Fc`` Class
 
 ```{eval-rst}

files/inp/valid_06.inp

@@ -21,8 +21,8 @@ sdef par=p pos=-5 3 3 erg=2
 fir5 -5 0 0 0 0 0 0 1 1 1
 FS5 -10 9i 10
 C5 -10 9i 10
-c f16:e (1<1[0:0 -2:2 -2:2]<3)
-c f26:e (2<2[0:0 -2:2 -2:2]<4)
+f16:e (1<1[0:0 -2:2 -2:2]<3)
+f26:e (2<2[0:0 -2:2 -2:2]<4)
 f8:e 1
 ft8 PHL 1 16 0 $ Region 1
     1 26 0 $ Region 2

files/inp/valid_07.inp

@@ -15,6 +15,6 @@ print
 prdmp 2j -3
 sdef
 nps 10000
-c f4:p (11<16[-10:10 -10:10 -10:10]<17)
+f4:p (11<16[-10:10 -10:10 -10:10]<17)
 
 (MCNP Manual 6.2 Section 3.3.5.1.3)

files/inp/valid_33.inp

@@ -21,9 +21,9 @@ phys:e 2j 1 $ Turn off Brems.
 sdef par=p pos=-5 3 3 erg=2
 fir5 -5 0 0 0 1 0 0 1 1 1
 FS5 -10 9i 10
-c CS5 -10 9i 10
-c f16:e (1<1[0:0 -2:2 -2:2]<3)
-c f26:e (2<2[0:0 -2:2 -2:2]<4)
+C S5 -10 9i 10
+f16:e (1<1[0:0 -2:2 -2:2]<3)
+f26:e (2<2[0:0 -2:2 -2:2]<4)
 f8:e 1
 ft8 PHL 1 16 0 $ Region 1
         1 26 0 $ Region 2

scripts/inp_tests.py

@@ -470,10 +470,10 @@ def TEST(element, mod):
             valid_build[2][attribute.name] = 'consts.ast.types.DESIGNATOR'
             valid_init[0][attribute.name] = 'consts.ast.types.DESIGNATOR'
         elif attribute.type == 'cell.Geometry':
-            valid_build[0][attribute.name] = 'consts.string.inp.cell.GEOMETRY'
-            valid_build[1][attribute.name] = 'consts.string.inp.cell.GEOMETRY'
-            valid_build[2][attribute.name] = 'consts.ast.inp.cell.GEOMETRY'
-            valid_init[0][attribute.name] = 'consts.ast.inp.cell.GEOMETRY'
+            valid_build[0][attribute.name] = 'consts.string.types.GEOMETRY'
+            valid_build[1][attribute.name] = 'consts.string.types.GEOMETRY'
+            valid_build[2][attribute.name] = 'consts.ast.types.GEOMETRY'
+            valid_init[0][attribute.name] = 'consts.ast.types.GEOMETRY'
         elif attribute.type == 'types.Substance':
             valid_build[0][attribute.name] = 'consts.string.types.SUBSTANCE'
             valid_build[1][attribute.name] = 'consts.string.types.SUBSTANCE'
@@ -635,10 +635,10 @@ def TEST(element, mod):
             valid_build[2][attribute.name] = '[consts.ast.types.DESIGNATOR]'
             valid_init[0][attribute.name] = '[consts.ast.types.DESIGNATOR]'
         elif attribute.type == 'types.Tuple(cell.Geometry)':
-            valid_build[0][attribute.name] = '[consts.string.inp.cell.GEOMETRY]'
-            valid_build[1][attribute.name] = '[consts.string.inp.cell.GEOMETRY]'
-            valid_build[2][attribute.name] = '[consts.ast.inp.cell.GEOMETRY]'
-            valid_init[0][attribute.name] = '[consts.ast.inp.cell.GEOMETRY]'
+            valid_build[0][attribute.name] = '[consts.string.types.GEOMETRY]'
+            valid_build[1][attribute.name] = '[consts.string.types.GEOMETRY]'
+            valid_build[2][attribute.name] = '[consts.ast.types.GEOMETRY]'
+            valid_init[0][attribute.name] = '[consts.ast.types.GEOMETRY]'
         elif attribute.type == 'types.Tuple(types.Substance)':
             valid_build[0][attribute.name] = '[consts.string.types.SUBSTANCE]'
             valid_build[1][attribute.name] = '[consts.string.types.SUBSTANCE]'

src/pymcnp/inp/Cell.py

@@ -15,7 +15,7 @@ class Cell(_card.Card):
         'number': types.Integer,
         'material': types.Integer,
         'density': types.Real,
-        'geometry': cell.Geometry,
+        'geometry': types.Geometry,
         'options': types.Tuple(cell.CellOption),
     }
 
@@ -25,7 +25,7 @@ def __init__(
         self,
         number: types.Integer,
         material: types.Integer,
-        geometry: cell.Geometry,
+        geometry: types.Geometry,
         density: types.Real = None,
         options: types.Tuple(cell.CellOption) = None,
     ):
@@ -46,7 +46,7 @@ def __init__(
         self.number: types.Integer = number
         self.material: types.Integer = material
         self.density: types.Real = density
-        self.geometry: cell.Geometry = geometry
+        self.geometry: types.Geometry = geometry
         self.options: types.Tuple(cell.CellOption) = options
 
     def to_mcnp(self):
@@ -197,7 +197,7 @@ def density(self, density: str | int | float | types.Real) -> None:
         self._density: types.Real = density
 
     @property
-    def geometry(self) -> cell.Geometry:
+    def geometry(self) -> types.Geometry:
         """
         Cell geometry.
 
@@ -209,7 +209,7 @@ def geometry(self) -> cell.Geometry:
         return self._geometry
 
     @geometry.setter
-    def geometry(self, geometry: str | cell.Geometry) -> None:
+    def geometry(self, geometry: str | types.Geometry) -> None:
         """
         Sets ``geometry``.
 
@@ -222,15 +222,15 @@ def geometry(self, geometry: str | cell.Geometry) -> None:
         """
 
         if geometry is not None:
-            if isinstance(geometry, cell.Geometry):
+            if isinstance(geometry, types.Geometry):
                 geometry = geometry
             elif isinstance(geometry, str):
-                geometry = cell.Geometry.from_mcnp(geometry)
+                geometry = types.Geometry.from_mcnp(geometry)
 
         if geometry is None:
             raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, geometry)
 
-        self._geometry: cell.Geometry = geometry
+        self._geometry: types.Geometry = geometry
 
     @property
     def options(self) -> types.Tuple(cell.CellOption):

src/pymcnp/inp/Surface.py

@@ -1,6 +1,5 @@
 import re
 
-from . import cell
 from . import surface
 from . import _card
 from .. import _show
@@ -85,7 +84,7 @@ def __and__(a, b):
             ``Surface`` union.
         """
 
-        return cell.Geometry(infix=types.String(f'{a.number}:{b.number}'))
+        return types.Geometry.from_mcnp(f'{a.number}:{b.number}')
 
     def __or__(a, b):
         """
@@ -99,7 +98,7 @@ def __or__(a, b):
             ``Surface`` intersection.
         """
 
-        return cell.Geometry(infix=types.String(f'{a.number} {b.number}'))
+        return types.Geometry.from_mcnp(f'{a.number} {b.number}')
 
     def __neg__(self):
         """
@@ -109,7 +108,7 @@ def __neg__(self):
             ``Surface`` negative.
         """
 
-        return cell.Geometry(infix=types.String(f'-{self.number}'))
+        return types.Geometry.from_mcnp(f'-{self.number}')
 
     def __pos__(self):
         """
@@ -119,7 +118,7 @@ def __pos__(self):
             ``Surface`` positive.
         """
 
-        return cell.Geometry(infix=types.String(f'+{self.number}'))
+        return types.Geometry.from_mcnp(f'+{self.number}')
 
     def __invert__(self):
         """
@@ -129,7 +128,7 @@ def __invert__(self):
             ``Surface`` complement.
         """
 
-        return cell.Geometry(infix=types.String(f'#{self.number}'))
+        return types.Geometry.from_mcnp(f'#{self.number}')
 
     @property
     def number(self) -> types.Integer:

src/pymcnp/inp/cell/Geometry.py

@@ -25,7 +25,6 @@
 from .Fill_5 import Fill_5
 from .Fill_6 import Fill_6
 from .Elpt import Elpt
-from .Geometry import Geometry
 from .Tmp import Tmp
 from .Cosy import Cosy
 from .Bflcl import Bflcl
@@ -58,7 +57,6 @@
     'Fill_5',
     'Fill_6',
     'Elpt',
-    'Geometry',
     'Tmp',
     'Cosy',
     'Bflcl',