diff --git a/run_configs/lfric/atm.py b/run_configs/lfric/atm.py index 3f93c588..92997bbf 100755 --- a/run_configs/lfric/atm.py +++ b/run_configs/lfric/atm.py @@ -20,8 +20,7 @@ from fab.tools import ToolBox from grab_lfric import lfric_source_config, gpl_utils_source_config -from lfric_common import (API, configurator, fparser_workaround_stop_concatenation, - get_transformation_script) +from lfric_common import (API, configurator, get_transformation_script) logger = logging.getLogger('fab') @@ -250,9 +249,6 @@ def file_filtering(config): api=API, ) - # todo: do we need this one in here? - fparser_workaround_stop_concatenation(state) - analyse( state, root_symbol='lfric_atm', diff --git a/run_configs/lfric/gungho.py b/run_configs/lfric/gungho.py index 7f075c10..011afa89 100755 --- a/run_configs/lfric/gungho.py +++ b/run_configs/lfric/gungho.py @@ -22,8 +22,7 @@ from fab.tools import ToolBox from grab_lfric import lfric_source_config, gpl_utils_source_config -from lfric_common import (API, configurator, fparser_workaround_stop_concatenation, - get_transformation_script) +from lfric_common import (API, configurator, get_transformation_script) logger = logging.getLogger('fab') @@ -75,8 +74,6 @@ api=API, ) - fparser_workaround_stop_concatenation(state) - analyse( state, root_symbol='gungho_model', diff --git a/run_configs/lfric/lfric_common.py b/run_configs/lfric/lfric_common.py index fe8eae03..1ae73544 100644 --- a/run_configs/lfric/lfric_common.py +++ b/run_configs/lfric/lfric_common.py @@ -84,36 +84,6 @@ def configurator(config, lfric_source: Path, gpl_utils_source: Path, rose_meta_c find_source_files(config, source_root=config_dir) -# ============================================================================ -@step -def fparser_workaround_stop_concatenation(config): - """ - fparser can't handle string concat in a stop statement. This step is - a workaround. - - https://github.com/stfc/fparser/issues/330 - - """ - feign_path = None - for file_path in config.artefact_store[ArtefactSet.FORTRAN_BUILD_FILES]: - if file_path.name == 'feign_config_mod.f90': - feign_path = file_path - break - else: - raise RuntimeError("Could not find 'feign_config_mod.f90'.") - - # rename "broken" version - broken_version = feign_path.with_suffix('.broken') - shutil.move(feign_path, broken_version) - - # make fixed version - bad = "_config: '// &\n 'Unable to close temporary file'" - good = "_config: Unable to close temporary file'" - - open(feign_path, 'wt').write( - open(broken_version, 'rt').read().replace(bad, good)) - - # ============================================================================ def get_transformation_script(fpath: Path, config: BuildConfig) -> Optional[Path]: diff --git a/run_configs/lfric/mesh_tools.py b/run_configs/lfric/mesh_tools.py index fde5b793..5d87c961 100755 --- a/run_configs/lfric/mesh_tools.py +++ b/run_configs/lfric/mesh_tools.py @@ -13,7 +13,7 @@ from fab.steps.psyclone import psyclone, preprocess_x90 from fab.tools import ToolBox -from lfric_common import API, configurator, fparser_workaround_stop_concatenation +from lfric_common import API, configurator from grab_lfric import lfric_source_config, gpl_utils_source_config @@ -60,8 +60,6 @@ api=API, ) - fparser_workaround_stop_concatenation(state) - analyse( state, root_symbol=['cubedsphere_mesh_generator', 'planar_mesh_generator', 'summarise_ugrid'],