From 781f7d74a22ed4dbdaf887f07fbd35557af6ac8c Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sat, 21 Jan 2023 18:46:38 -0500 Subject: [PATCH] [Input] Fix validation handling with minimal Python module --- interfaces/cython/cantera/ck2yaml.py | 6 +++--- interfaces/cython/cantera/cti2yaml.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/cython/cantera/ck2yaml.py b/interfaces/cython/cantera/ck2yaml.py index 83519bc37..61405eb7b 100644 --- a/interfaces/cython/cantera/ck2yaml.py +++ b/interfaces/cython/cantera/ck2yaml.py @@ -2238,7 +2238,7 @@ def main(argv): return try: - import cantera as ct + from cantera import Solution, Interface except ImportError: logger.warning('WARNING: Unable to import Cantera Python module. ' 'Output mechanism has not been validated') @@ -2246,9 +2246,9 @@ def main(argv): try: logger.info('Validating mechanism...') - gas = ct.Solution(out_name) + gas = Solution(out_name) for surf_name in surfaces: - phase = ct.Interface(out_name, surf_name, [gas]) + phase = Interface(out_name, surf_name, [gas]) logger.info('PASSED') except RuntimeError as e: logger.info('FAILED') diff --git a/interfaces/cython/cantera/cti2yaml.py b/interfaces/cython/cantera/cti2yaml.py index 6dab0e805..b51cb19f8 100644 --- a/interfaces/cython/cantera/cti2yaml.py +++ b/interfaces/cython/cantera/cti2yaml.py @@ -1771,7 +1771,7 @@ def main(): # Do full validation by importing the resulting mechanism try: - import cantera as ct + from cantera import Solution, Interface except ImportError: print("WARNING: Unable to import Cantera Python module. " "Output mechanism has not been validated") @@ -1779,9 +1779,9 @@ def main(): try: print("Validating mechanism...") - gas = ct.Solution(output_name) + gas = Solution(output_name) for surf_name in surfaces: - phase = ct.Interface(output_name, surf_name) + phase = Interface(output_name, surf_name) print("PASSED") except RuntimeError as e: print("FAILED")