diff --git a/scripts/exgdas_global_marine_analysis_letkf.py b/scripts/exgdas_global_marine_analysis_letkf.py deleted file mode 100755 index 97e6b1279..000000000 --- a/scripts/exgdas_global_marine_analysis_letkf.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python3 -# exgdas_global_marine_analysis_ecen.py -# This script creates an MarineLETKF class -# and runs the initialize, run, and finalize methods -# which currently are stubs -import os - -from wxflow import Logger, cast_strdict_as_dtypedict -# TODO (AFE): change to from pygfs.task.marine_recenter import MarineLETKF -from soca.marine_recenter import MarineLETKF - -# Initialize root logger -logger = Logger(level='DEBUG', colored_log=True) - - -if __name__ == '__main__': - - # Take configuration from environment and cast it as python dictionary - config = cast_strdict_as_dtypedict(os.environ) - - # Instantiate the aerosol analysis task - MarineLetkf = MarineLETKF(config) - MarineLetkf.initialize() - MarineLetkf.run() - MarineLetkf.finalize() diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt index 524428de0..38cea0d23 100644 --- a/test/soca/gw/CMakeLists.txt +++ b/test/soca/gw/CMakeLists.txt @@ -77,7 +77,7 @@ foreach(jjob ${jjob_list}) WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/soca/gw/testrun) set_tests_properties(${test_name} PROPERTIES - ENVIRONMENT "PYTHONPATH=${PROJECT_SOURCE_DIR}/ush/ioda/bufr2ioda::${PROJECT_SOURCE_DIR}/ush:${PROJECT_BINARY_DIR}/../lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}:$ENV{PYTHONPATH}") + ENVIRONMENT "PYTHONPATH=${PROJECT_SOURCE_DIR}/ush/ioda/bufr2ioda::${PROJECT_SOURCE_DIR}/ush:${PROJECT_BINARY_DIR}/../lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}:$ENV{PYTHONPATH}:${PROJECT_SOURCE_DIR}/../../../../ush/python") set(setup "--skip") # Only run the setup of the first test, if not, it will hang diff --git a/ush/soca/marine_letkf.py b/ush/soca/marine_letkf.py deleted file mode 100644 index 20ef0c0b6..000000000 --- a/ush/soca/marine_letkf.py +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env python3 - -from datetime import datetime, timedelta -import f90nml -from logging import getLogger -import os -from soca import bkg_utils -from typing import Dict -import ufsda -from ufsda.stage import soca_fix -from wxflow import (AttrDict, - chdir, - Executable, - FileHandler, - logit, - parse_j2yaml, - Task, - Template, - TemplateConstants, - WorkflowException, - YAMLFile) - -logger = getLogger(__name__.split('.')[-1]) - - -class MarineLETKF(Task): - """ - Class for global ocean analysis recentering task - """ - - @logit(logger, name="MarineLETKF") - def __init__(self, config: Dict) -> None: - """Constructor for ocean recentering task - Parameters: - ------------ - config: Dict - configuration, namely evironment variables - Returns: - -------- - None - """ - - logger.info("init") - super().__init__(config) - - @logit(logger) - def initialize(self): - """Method initialize for ocean recentering task - Parameters: - ------------ - None - Returns: - -------- - None - """ - - logger.info("initialize") - RUN = self.runtime_config.RUN - gcyc = self.runtime_config.gcyc - - @logit(logger) - def run(self): - """Method run for ocean recentering task - Parameters: - ------------ - None - Returns: - -------- - None - """ - - logger.info("run") - - chdir(self.runtime_config.DATA) - - @logit(logger) - def finalize(self): - """Method finalize for ocean recentering task - Parameters: - ------------ - None - Returns: - -------- - None - """ - - logger.info("finalize") - - RUN = self.runtime_config.RUN - cyc = self.runtime_config.cyc