Add support for AUTOUGH2 EOS EWCX and EWAX in t2data json()

Author: acroucher

doc/source/t2data.rst

@@ -1380,12 +1380,13 @@ unique.
    corresponding to the AUTOUGH2 EOS names (EOS1 being 'EW', EOS2
    being 'EWC' etc.). Note that for integer values, only EOS modules
    1, 2, 3 and 4 are supported. For AUTOUGH2 EOS names, these
-   correspond to 'W', 'EW', 'EWC', 'EWA' and 'EWAV'. The AUTOUGH2
-   passive tracer EOS modules 'EWT' and 'ETD' are also supported (the
-   latter supporting only constant diffusivity, i.e. all elements of
-   the ``diffusion`` property must be negative and equal). For EOS4
-   ('EWAV'), alternative initialization using EOS3-style primary
-   variables via MOP(19) = 2 is supported.
+   correspond to 'W', 'EW', 'EWC' (or 'EWCX'), 'EWA' and 'EWAV' (or
+   'EWAX'). The AUTOUGH2 passive tracer EOS modules 'EWT' and 'ETD'
+   are also supported (the latter supporting only constant
+   diffusivity, i.e. all elements of the ``diffusion`` property must
+   be negative and equal). For EOS4 ('EWAV'), alternative
+   initialization using EOS3-style primary variables via MOP(19) = 2
+   is supported.
 
 -  | **bdy_incons**: :ref:`t2incon <incons>`, or ``None``
    | TOUGH2 initial conditions from which boundary conditions are to be

t2data.py

@@ -2159,14 +2159,17 @@ def eos_json(self, eos):
         """
         jsondata = {}
         supported_eos = {'W': 'w', 'EW': 'we', 'EWC': 'wce', 'EWA': 'wae',
-                         'EWAV': 'wae', 'EWT': 'we', 'EWTD': 'we'}
+                         'EWAV': 'wae', 'EWT': 'we', 'EWTD': 'we',
+                         'EWAX': 'wae', 'EWCX': 'wce'}
         primary_converters = {'W': convert_primary_eos_1,
                               'EW': convert_primary_eos_1,
                               'EWC': convert_primary_eos_2_or_4,
                               'EWA': convert_primary_eos_3,
                               'EWAV': convert_primary_eos_2_or_4,
                               'EWT': convert_primary_eos_1,
-                              'EWTD': convert_primary_eos_1
+                              'EWTD': convert_primary_eos_1,
+                              'EWAX': convert_primary_eos_2_or_4,
+                              'EWCX': convert_primary_eos_2_or_4
                               }
         aut2eosname = ''
         primary_converter = None
@@ -2191,14 +2194,16 @@ def eos_json(self, eos):
                 primary_converter = primary_converters[aut2eosname]
                 if aut2eosname == 'EWA':
                     if self.parameter['option'][19] > 0:
-                        raise Exception ('EOS3 with MOP(19) > 0 not supported.')
-                elif aut2eosname == 'EWAV':
+                        raise Exception ('EOS %s with MOP(19) > 0 not supported.' % \
+                                         aut2eosname)
+                elif aut2eosname in ['EWAV', 'EWAX']:
                     if self.parameter['option'][19] == 1:
-                        raise Exception ('EOS4 with MOP(19) = 1 not supported.')
+                        raise Exception ('EOS %s with MOP(19) = 1 not supported.' % \
+                                         aut2eosname)
                     elif self.parameter['option'][19] == 2:
                         primary_converter = convert_primary_eos_3
             else:
-                raise Exception ('EOS not supported:' + aut2eosname)
+                raise Exception ('EOS %s not supported.' % aut2eosname)
         else:
             raise Exception ('EOS not detected.')
         if aut2eosname in ['EWT', 'EWTD']:

tests/test_t2data.py

@@ -674,6 +674,20 @@ def eos_test():
             with self.assertRaises(Exception):
                 dat.eos_json(eos)
 
+            eos = 'EWSG'
+            with self.assertRaises(Exception):
+                dat.eos_json(eos)
+
+            eos = 'EWAX'
+            eos_data, tracer_data, pc = dat.eos_json(eos)
+            self.assertEqual(eos_data['eos'], {'name': 'wae'})
+            self.assertIsNone(tracer_data)
+
+            eos = 'EWCX'
+            eos_data, tracer_data, pc = dat.eos_json(eos)
+            self.assertEqual(eos_data['eos'], {'name': 'wce'})
+            self.assertIsNone(tracer_data)
+
         def output_test():
 
             dat = t2data()