inp: fixed SDEF option parsing

Author: BitterB0NG0

docs/source/pymcnp/inp/data/sdef.md

@@ -117,6 +117,14 @@
    :inherited-members:
 ```
 
+### ``Cel_2`` Class
+
+```{eval-rst}
+.. autoclass:: pymcnp.inp.data.sdef.Cel_2
+   :members:
+   :inherited-members:
+```
+
 [f subpackage](sdef/f)
 
 ### ``Dat_0`` Class
@@ -223,6 +231,14 @@
    :inherited-members:
 ```
 
+### ``Ext_2`` Class
+
+```{eval-rst}
+.. autoclass:: pymcnp.inp.data.sdef.Ext_2
+   :members:
+   :inherited-members:
+```
+
 [f subpackage](sdef/f)
 
 ### ``Loc_0`` Class
@@ -295,6 +311,14 @@
    :inherited-members:
 ```
 
+### ``Pos_2`` Class
+
+```{eval-rst}
+.. autoclass:: pymcnp.inp.data.sdef.Pos_2
+   :members:
+   :inherited-members:
+```
+
 [f subpackage](sdef/f)
 
 ### ``Rad_0`` Class
@@ -445,6 +469,14 @@
    :inherited-members:
 ```
 
+### ``X_2`` Class
+
+```{eval-rst}
+.. autoclass:: pymcnp.inp.data.sdef.X_2
+   :members:
+   :inherited-members:
+```
+
 [f subpackage](sdef/f)
 
 ### ``Y_0`` Class
@@ -463,6 +495,13 @@
    :inherited-members:
 ```
 
+### ``Y_2`` Class
+
+```{eval-rst}
+   :members:
+   :inherited-members:
+```
+
 [f subpackage](sdef/f)
 
 ### ``Z_0`` Class
@@ -481,4 +520,12 @@
    :inherited-members:
 ```
 
+### ``Z_2`` Class
+
+```{eval-rst}
+.. autoclass:: pymcnp.inp.data.sdef.Z_2
+   :members:
+   :inherited-members:
+```
+
 [f subpackage](sdef/f)

files/inp/valid_14.inp

@@ -43,7 +43,7 @@ m2 92238 0.98 92235 0.02
 m3 1001 1
 sdef erg fcel d1 x fcel d11 y fcel d13 z fcel d15 cel d6
      rad fcel d17 ext fcel d19 pos fcel d21 axs fcel d23
-ds1 s d2 d3 d4 d5
+c ds1 s d2 d3 d4 d5
 sp2 -2 1.2
 sp3 -2 1.3
 sp4 -2 1.4
@@ -59,25 +59,25 @@ c si9 l 3:5(1 2 0):13
 sp9 1
 c si10 l 3:5(1 2 0):15
 sp10 1
-ds11 s d12 0 0 d25
+c ds11 s d12 0 0 d25
 si12 -4 4
 sp12 0 1
-ds13 s d14 0 0 d26
+c ds13 s d14 0 0 d26
 si14 -3 3
 sp14 0 1
-ds15 s d16 0 0 d16
+c ds15 s d16 0 0 d16
 si16 -60 60
 sp16 0 1
-ds17 s 0 d18 d18 0
+c ds17 s 0 d18 d18 0
 si18 0 3
 sp18 -21 1
-ds19 s 0 d20 d20 0
+c ds19 s 0 d20 d20 0
 si20 -60 60
 sp20 0 1
-ds21 s 0 d22 d22 0
+c ds21 s 0 d22 d22 0
 si22 l 10 5 0
 sp22 1
-ds23 s 0 d24 d24 0
+c ds23 s 0 d24 d24 0
 si24 l 0 0 1
 sp24 1
 si25 16 20

files/inp/valid_29.inp

@@ -23,7 +23,7 @@ MX2:P model
 CUT:N 60e8
 CUT:P 60e8
 PHYS:P j 1 j -1 j -101
- SDEF PAR=P ERG=D1 X=FERG D2 Y=FERG D3 Z=FERG D4 TME=FERG D7
+SDEF PAR=P ERG=D1 X=FERG D2 Y=FERG D3 Z=FERG D4 TME=FERG D7
     VEC=1 0 0 DIR=FERG D8 CEL=1 WGT=1
 SI1 S 5 6
 SP1 0.9391 0.0609

src/pymcnp/inp/_card.py

@@ -1,5 +1,3 @@
-import re
-
 from . import _symbol
 from .. import errors
 
@@ -65,21 +63,7 @@ def _preprocess(source: str) -> tuple[str, tuple[str]]:
                 lines.append(line)
 
         source = '\n'.join(lines)
-        source = re.sub(r'\n +|& *\n *', ' ', source)
-        source = re.sub(r' +', ' ', source)
-        source = re.sub(r'[(] ', '(', source)
-        source = re.sub(r' [)]', ')', source)
-        source = re.sub(r'\n \n', '\n\n', source)
-        source = re.sub(r' = | =|= |=', ' ', source)
-        source = re.sub(r'\t', '    ', source)
-        source = source.strip()
-
-        source = re.sub(r'((?: [jJ]){2,})(\s|\Z|\n)', lambda match: f' {len(match[1].strip().split())}j' + match[2], source)
-        source = re.sub(r'((?: [rR]){2,})(\s|\Z|\n)', lambda match: f' {len(match[1].strip().split())}r' + match[2], source)
-        source = re.sub(r'((?: [iI]){2,})(\s|\Z|\n)', lambda match: f' {len(match[1].strip().split())}i' + match[2], source)
-        source = re.sub(r' (\d+)[jJ](\s|\Z|\n)', lambda match: int(match[1]) * ' j' + match[2], source)
-        source = re.sub(r' (\d+)[rR](\s|\Z|\n)', lambda match: int(match[1]) * ' r' + match[2], source)
-        source = re.sub(r' (\d+)[iI](\s|\Z|\n)', lambda match: int(match[1]) * ' I' + match[2], source)
+        source = _symbol.InpNonterminal._preprocess(source)
 
         return source, comments
 

src/pymcnp/inp/_symbol.py

@@ -32,8 +32,13 @@ def _preprocess(source: str) -> str:
         source = re.sub(r'((?: [jJ]){2,})(\s|\Z|\n)', lambda match: f' {len(match[1].strip().split())}j' + match[2], source)
         source = re.sub(r'((?: [rR]){2,})(\s|\Z|\n)', lambda match: f' {len(match[1].strip().split())}r' + match[2], source)
         source = re.sub(r'((?: [iI]){2,})(\s|\Z|\n)', lambda match: f' {len(match[1].strip().split())}i' + match[2], source)
+        source = re.sub(r'((?: [lL][oO][gG]){2,})(\s|\Z|\n)', lambda match: f' {len(match[1].strip().split())}log' + match[2], source)
+        source = re.sub(r'((?: [iI][lL][oO][gG]){2,})(\s|\Z|\n)', lambda match: f' {len(match[1].strip().split())}ilog' + match[2], source)
         source = re.sub(r' (\d+)[jJ](\s|\Z|\n)', lambda match: int(match[1]) * ' j' + match[2], source)
         source = re.sub(r' (\d+)[rR](\s|\Z|\n)', lambda match: int(match[1]) * ' r' + match[2], source)
-        source = re.sub(r' (\d+)[iI](\s|\Z|\n)', lambda match: int(match[1]) * ' I' + match[2], source)
+        source = re.sub(r' (\d+)[iI](\s|\Z|\n)', lambda match: int(match[1]) * ' i' + match[2], source)
+        source = re.sub(r' (\d+)[jJ](\s|\Z|\n)', lambda match: int(match[1]) * ' j' + match[2], source)
+        source = re.sub(r' (\d+)[lL][oO][gG](\s|\Z|\n)', lambda match: int(match[1]) * ' log' + match[2], source)
+        source = re.sub(r' (\d+)[iI][lL][oO][gG](\s|\Z|\n)', lambda match: int(match[1]) * ' ilog' + match[2], source)
 
         return source

src/pymcnp/inp/data/sdef/Cel_1.py

@@ -1,7 +1,7 @@
 import re
 
-from . import f
 from . import _option
+from .... import types
 from .... import errors
 
 
@@ -13,56 +13,58 @@ class Cel_1(_option.SdefOption):
     _KEYWORD = 'cel'
 
     _ATTRS = {
-        'option': f.FOption,
+        'number': types.Distribution,
     }
 
-    _REGEX = re.compile(rf'\Acel( (?:{f.FOption._REGEX.pattern[2:-2]}))\Z', re.IGNORECASE)
+    _REGEX = re.compile(rf'\Acel( {types.Distribution._REGEX.pattern[2:-2]})\Z', re.IGNORECASE)
 
-    def __init__(self, option: str | f.FOption):
+    def __init__(self, number: str | int | types.Distribution):
         """
         Initializes ``Cel_1``.
 
         Parameters:
-            option: Dependent distribution option.
+            number: Cell number.
 
         Raises:
             InpError: SEMANTICS_OPTION.
         """
 
-        self.option: f.FOption = option
+        self.number: types.Distribution = number
 
     @property
-    def option(self) -> f.FOption:
+    def number(self) -> types.Distribution:
         """
-        Dependent distribution option
+        Cell number
 
         Raises:
             InpError: SEMANTICS_OPTION.
             TypeError:
         """
 
-        return self._option
+        return self._number
 
-    @option.setter
-    def option(self, option: str | f.FOption) -> None:
+    @number.setter
+    def number(self, number: str | int | types.Distribution) -> None:
         """
-        Sets ``option``.
+        Sets ``number``.
 
         Parameters:
-            option: Dependent distribution option.
+            number: Cell number.
 
         Raises:
             InpError: SEMANTICS_OPTION.
             TypeError:
         """
 
-        if option is not None:
-            if isinstance(option, f.FOption):
-                option = option
-            elif isinstance(option, str):
-                option = f.FOption.from_mcnp(option)
+        if number is not None:
+            if isinstance(number, types.Distribution):
+                number = number
+            elif isinstance(number, int):
+                number = types.Distribution(number)
+            elif isinstance(number, str):
+                number = types.Distribution.from_mcnp(number)
 
-        if option is None:
-            raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, option)
+        if number is None:
+            raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, number)
 
-        self._option: f.FOption = option
+        self._number: types.Distribution = number

src/pymcnp/inp/data/sdef/Cel_2.py

@@ -0,0 +1,68 @@
+import re
+
+from . import f
+from . import _option
+from .... import errors
+
+
+class Cel_2(_option.SdefOption):
+    """
+    Represents INP cel variation #2 elements.
+    """
+
+    _KEYWORD = 'cel'
+
+    _ATTRS = {
+        'option': f.FOption,
+    }
+
+    _REGEX = re.compile(rf'\Acel( (?:{f.FOption._REGEX.pattern[2:-2]}))\Z', re.IGNORECASE)
+
+    def __init__(self, option: str | f.FOption):
+        """
+        Initializes ``Cel_2``.
+
+        Parameters:
+            option: Dependent distribution option.
+
+        Raises:
+            InpError: SEMANTICS_OPTION.
+        """
+
+        self.option: f.FOption = option
+
+    @property
+    def option(self) -> f.FOption:
+        """
+        Dependent distribution option
+
+        Raises:
+            InpError: SEMANTICS_OPTION.
+            TypeError:
+        """
+
+        return self._option
+
+    @option.setter
+    def option(self, option: str | f.FOption) -> None:
+        """
+        Sets ``option``.
+
+        Parameters:
+            option: Dependent distribution option.
+
+        Raises:
+            InpError: SEMANTICS_OPTION.
+            TypeError:
+        """
+
+        if option is not None:
+            if isinstance(option, f.FOption):
+                option = option
+            elif isinstance(option, str):
+                option = f.FOption.from_mcnp(option)
+
+        if option is None:
+            raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, option)
+
+        self._option: f.FOption = option

src/pymcnp/inp/data/sdef/Dir_1.py

@@ -2,6 +2,7 @@
 
 from . import _option
 from .... import types
+from .... import errors
 
 
 class Dir_1(_option.SdefOption):
@@ -15,9 +16,9 @@ class Dir_1(_option.SdefOption):
         'cosine': types.Distribution,
     }
 
-    _REGEX = re.compile(rf'\Adir( {types.Distribution._REGEX.pattern[2:-2]})?\Z', re.IGNORECASE)
+    _REGEX = re.compile(rf'\Adir( {types.Distribution._REGEX.pattern[2:-2]})\Z', re.IGNORECASE)
 
-    def __init__(self, cosine: str | types.Distribution = None):
+    def __init__(self, cosine: str | types.Distribution):
         """
         Initializes ``Dir_1``.
 
@@ -61,4 +62,7 @@ def cosine(self, cosine: str | types.Distribution) -> None:
             elif isinstance(cosine, str):
                 cosine = types.Distribution.from_mcnp(cosine)
 
+        if cosine is None:
+            raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, cosine)
+
         self._cosine: types.Distribution = cosine