inp: updated mesh.Geom restrictions

Author: BitterB0NG0

scripts/inp_data.py

@@ -9167,7 +9167,7 @@ def from_formula(number: int, formulas: dict[str, float], is_weight: bool = True
                                     name='geometry',
                                     type='types.String',
                                     description='Controls mesh geometry type',
-                                    restriction='geometry in {"xyz", "rzt", "rpt"}',
+                                    restriction='geometry in {"xyz", "rzt", "rpt", "cyl", "rec", "sph"}',
                                 ),
                             ],
                         ),

src/pymcnp/inp/data/mesh/Geom.py

@@ -36,7 +36,7 @@ def __init__(self, geometry: types.String):
             InpError: SEMANTICS_OPTION.
         """
 
-        if geometry is None or geometry not in {'xyz', 'rzt', 'rpt'}:
+        if geometry is None or geometry not in {'xyz', 'rzt', 'rpt', 'cyl', 'rec', 'sph'}:
             raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, geometry)
 
         self.value: typing.Final[types.Tuple] = types.Tuple(

tests/inp/test_card.py

@@ -451,17 +451,17 @@ class Test_FromMcnp(_utils._Test_FromMcnp):
             'KOPTS BLOCKSIZE = 5 KSENTAL = TSUNAMI-B',
             'FMESH4:n GEOM=xyz ORIGIN= -5 -5 -5\n    IMESH= 5 IINTS=100\n    JMESH= 5 JINTS= 1\n    KMESH= 5 KINTS=100',
             'FM4 -1 0 -5',
-            #'FMESH4:n GEOM=CYL ORIGIN= -100 0 0\n    IMESH= 5 10 IINTS= 5 2\n    JMESH= 100 200 JINTS 10 5\n    KMESH 0.5 1 KINTS= 1 2\n    AXS= 1 0 0 VEC=0 1 0 OUT=IJ',
+            'FMESH4:n GEOM=CYL ORIGIN= -100 0 0\n    IMESH= 5 10 IINTS= 5 2\n    JMESH= 100 200 JINTS 10 5\n    KMESH 0.5 1 KINTS= 1 2\n    AXS= 1 0 0 VEC=0 1 0 OUT=IJ',
             'IMP:N 1 2 2M 0 1 20R',
             'WWG 111 45 0.25',
             'WWGE:p 1 100',
             'WWGT:p 1 100 1.e20',
             'WWP:p 5 3 5',
             'WWE:p 1 100',
             'WWT:p 1 100 1.e20',
-            #'MESH GEOM=CYL REF=1e-6 1e-7 0 ORIGIN=1 2 3\n    IMESH 2.55 66.34\n    IINTS 2 15 $ 2 fine bins from 0 to 2.55, 15 from 2.55 to 66.34\n    JMESH 33.1 42.1 53.4 139.7\n    JINTS 6 3 4 13\n    KMESH 0.5 1\n    KINTS 5 5',
-            #'MESH GEOM=REC REF=1e-6 1e-7 0 ORIGIN=-66.34 -38.11 -60\n    IMESH -16.5 3.8 53.66\n    IINTS 10 3 8 $ 10 fine bins from -66.34 to -16.5, etc.',
-            #'MESH GEOM sph ORIGIN 7 -9 -12 REF -23 39 -10 AXS 0.4 -0.5 0.2\n    VEC 0.1 -0.2 -0.7\n    IMESH 60. IINTS 3\n    JMESH 0.1 0.35 0.5 JINTS 1 1 1\n    KMESH 0.2 0.85 1 KINTS 1 1 1',
+            'MESH GEOM=CYL REF=1e-6 1e-7 0 ORIGIN=1 2 3\n    IMESH 2.55 66.34\n    IINTS 2 15 $ 2 fine bins from 0 to 2.55, 15 from 2.55 to 66.34\n    JMESH 33.1 42.1 53.4 139.7\n    JINTS 6 3 4 13\n    KMESH 0.5 1\n    KINTS 5 5',
+            'MESH GEOM=REC REF=1e-6 1e-7 0 ORIGIN=-66.34 -38.11 -60\n    IMESH -16.5 3.8 53.66\n    IINTS 10 3 8 $ 10 fine bins from -66.34 to -16.5, etc.',
+            'MESH GEOM sph ORIGIN 7 -9 -12 REF -23 39 -10 AXS 0.4 -0.5 0.2\n    VEC 0.1 -0.2 -0.7\n    IMESH 60. IINTS 3\n    JMESH 0.1 0.35 0.5 JINTS 1 1 1\n    KMESH 0.2 0.85 1 KINTS 1 1 1',
             'ESPLT:N 2 0.1 2 0.01 0.25 0.001',
             'ESPLT:N 2 0.1 2 0.01 0.25 0.001',
             'WWP:N 5 3 5 0 0 0 J J',