From 9b04116ca745fef2bac5b155614caea8011b38e5 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Thu, 24 Apr 2025 14:05:21 +0000 Subject: [PATCH] Remove MOS from system Refs #3605 --- dev/jobs/mos_ext_grd_fcst.sh | 25 -- dev/jobs/mos_ext_grd_prdgen.sh | 25 -- dev/jobs/mos_ext_grd_prep.sh | 25 -- dev/jobs/mos_ext_stn_fcst.sh | 25 -- dev/jobs/mos_ext_stn_prdgen.sh | 25 -- dev/jobs/mos_ext_stn_prep.sh | 25 -- dev/jobs/mos_grd_fcst.sh | 25 -- dev/jobs/mos_grd_prdgen.sh | 25 -- dev/jobs/mos_grd_prep.sh | 25 -- dev/jobs/mos_stn_fcst.sh | 25 -- dev/jobs/mos_stn_prdgen.sh | 25 -- dev/jobs/mos_stn_prep.sh | 25 -- dev/jobs/mos_wx_ext_prdgen.sh | 25 -- dev/jobs/mos_wx_prdgen.sh | 25 -- dev/workflow/applications/applications.py | 1 - dev/workflow/applications/gfs_cycled.py | 12 - .../applications/gfs_forecast_only.py | 12 - dev/workflow/rocoto/gfs_tasks.py | 369 ------------------ dev/workflow/rocoto/tasks.py | 8 +- env/WCOSS2.env | 8 - modulefiles/module_base.wcoss2.lua | 3 - parm/archive/master_gfs.yaml.j2 | 21 - parm/config/gefs/config.base.j2 | 6 - parm/config/gfs/config.base.j2 | 7 - parm/config/gfs/config.mos | 9 - parm/config/gfs/config.mos_ext_grd_fcst | 12 - parm/config/gfs/config.mos_ext_grd_prdgen | 12 - parm/config/gfs/config.mos_ext_grd_prep | 12 - parm/config/gfs/config.mos_ext_stn_fcst | 12 - parm/config/gfs/config.mos_ext_stn_prdgen | 12 - parm/config/gfs/config.mos_ext_stn_prep | 12 - parm/config/gfs/config.mos_grd_fcst | 12 - parm/config/gfs/config.mos_grd_prdgen | 12 - parm/config/gfs/config.mos_grd_prep | 12 - parm/config/gfs/config.mos_stn_fcst | 12 - parm/config/gfs/config.mos_stn_prdgen | 12 - parm/config/gfs/config.mos_stn_prep | 12 - parm/config/gfs/config.mos_wx_ext_prdgen | 12 - parm/config/gfs/config.mos_wx_prdgen | 12 - parm/config/gfs/config.resources | 147 ------- parm/config/sfs/config.base.j2 | 6 - scripts/exglobal_archive_tars.py | 4 +- scripts/exglobal_cleanup.sh | 6 - versions/run.wcoss2.ver | 2 - 44 files changed, 4 insertions(+), 1135 deletions(-) delete mode 100755 dev/jobs/mos_ext_grd_fcst.sh delete mode 100755 dev/jobs/mos_ext_grd_prdgen.sh delete mode 100755 dev/jobs/mos_ext_grd_prep.sh delete mode 100755 dev/jobs/mos_ext_stn_fcst.sh delete mode 100755 dev/jobs/mos_ext_stn_prdgen.sh delete mode 100755 dev/jobs/mos_ext_stn_prep.sh delete mode 100755 dev/jobs/mos_grd_fcst.sh delete mode 100755 dev/jobs/mos_grd_prdgen.sh delete mode 100755 dev/jobs/mos_grd_prep.sh delete mode 100755 dev/jobs/mos_stn_fcst.sh delete mode 100755 dev/jobs/mos_stn_prdgen.sh delete mode 100755 dev/jobs/mos_stn_prep.sh delete mode 100755 dev/jobs/mos_wx_ext_prdgen.sh delete mode 100755 dev/jobs/mos_wx_prdgen.sh delete mode 100644 parm/config/gfs/config.mos delete mode 100644 parm/config/gfs/config.mos_ext_grd_fcst delete mode 100644 parm/config/gfs/config.mos_ext_grd_prdgen delete mode 100644 parm/config/gfs/config.mos_ext_grd_prep delete mode 100644 parm/config/gfs/config.mos_ext_stn_fcst delete mode 100644 parm/config/gfs/config.mos_ext_stn_prdgen delete mode 100644 parm/config/gfs/config.mos_ext_stn_prep delete mode 100644 parm/config/gfs/config.mos_grd_fcst delete mode 100644 parm/config/gfs/config.mos_grd_prdgen delete mode 100644 parm/config/gfs/config.mos_grd_prep delete mode 100644 parm/config/gfs/config.mos_stn_fcst delete mode 100644 parm/config/gfs/config.mos_stn_prdgen delete mode 100644 parm/config/gfs/config.mos_stn_prep delete mode 100644 parm/config/gfs/config.mos_wx_ext_prdgen delete mode 100644 parm/config/gfs/config.mos_wx_prdgen diff --git a/dev/jobs/mos_ext_grd_fcst.sh b/dev/jobs/mos_ext_grd_fcst.sh deleted file mode 100755 index 64369853e14..00000000000 --- a/dev/jobs/mos_ext_grd_fcst.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_ext_grd_fcst" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_ext_grd_fcst" -c "base mos_ext_grd_fcst" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_EXT_GRD_FORECAST" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_ext_grd_prdgen.sh b/dev/jobs/mos_ext_grd_prdgen.sh deleted file mode 100755 index 69dfc432544..00000000000 --- a/dev/jobs/mos_ext_grd_prdgen.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_ext_grd_prdgen" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_ext_grd_prdgen" -c "base mos_ext_grd_prdgen" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_EXT_GRD_PRDGEN" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_ext_grd_prep.sh b/dev/jobs/mos_ext_grd_prep.sh deleted file mode 100755 index d35b26ccf26..00000000000 --- a/dev/jobs/mos_ext_grd_prep.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_ext_grd_prep" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_ext_grd_prep" -c "base mos_ext_grd_prep" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_EXT_GRD_PREP" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_ext_stn_fcst.sh b/dev/jobs/mos_ext_stn_fcst.sh deleted file mode 100755 index 33c82941076..00000000000 --- a/dev/jobs/mos_ext_stn_fcst.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_ext_stn_fcst" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_ext_stn_fcst" -c "base mos_ext_stn_fcst" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_EXT_STN_FORECAST" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_ext_stn_prdgen.sh b/dev/jobs/mos_ext_stn_prdgen.sh deleted file mode 100755 index f96ba9f3cc0..00000000000 --- a/dev/jobs/mos_ext_stn_prdgen.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_ext_stn_prdgen" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_ext_stn_prdgen" -c "base mos_ext_stn_prdgen" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_EXT_STN_PRDGEN" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_ext_stn_prep.sh b/dev/jobs/mos_ext_stn_prep.sh deleted file mode 100755 index fcd043e330b..00000000000 --- a/dev/jobs/mos_ext_stn_prep.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_ext_stn_prep" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_ext_stn_prep" -c "base mos_ext_stn_prep" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_EXT_STN_PREP" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_grd_fcst.sh b/dev/jobs/mos_grd_fcst.sh deleted file mode 100755 index 9265b5e0918..00000000000 --- a/dev/jobs/mos_grd_fcst.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_grd_fcst" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_grd_fcst" -c "base mos_grd_fcst" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_GRD_FORECAST" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_grd_prdgen.sh b/dev/jobs/mos_grd_prdgen.sh deleted file mode 100755 index 97869debd7e..00000000000 --- a/dev/jobs/mos_grd_prdgen.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_grd_prdgen" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_grd_prdgen" -c "base mos_grd_prdgen" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_GRD_PRDGEN" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_grd_prep.sh b/dev/jobs/mos_grd_prep.sh deleted file mode 100755 index 855e905c2a2..00000000000 --- a/dev/jobs/mos_grd_prep.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_grd_prep" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_grd_prep" -c "base mos_grd_prep" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_GRD_PREP" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_stn_fcst.sh b/dev/jobs/mos_stn_fcst.sh deleted file mode 100755 index f8a1dd40709..00000000000 --- a/dev/jobs/mos_stn_fcst.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_stn_fcst" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_stn_fcst" -c "base mos_stn_fcst" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_STN_FORECAST" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_stn_prdgen.sh b/dev/jobs/mos_stn_prdgen.sh deleted file mode 100755 index 11e19e4f3d8..00000000000 --- a/dev/jobs/mos_stn_prdgen.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_stn_prdgen" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_stn_prdgen" -c "base mos_stn_prdgen" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_STN_PRDGEN" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_stn_prep.sh b/dev/jobs/mos_stn_prep.sh deleted file mode 100755 index 2401743e6bf..00000000000 --- a/dev/jobs/mos_stn_prep.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_stn_prep" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_stn_prep" -c "base mos_stn_prep" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_STN_PREP" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_wx_ext_prdgen.sh b/dev/jobs/mos_wx_ext_prdgen.sh deleted file mode 100755 index 478a72b846e..00000000000 --- a/dev/jobs/mos_wx_ext_prdgen.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_wx_ext_prdgen" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_wx_ext_prdgen" -c "base mos_wx_ext_prdgen" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_WX_EXT_PRDGEN" -status=$? - -exit "${status}" diff --git a/dev/jobs/mos_wx_prdgen.sh b/dev/jobs/mos_wx_prdgen.sh deleted file mode 100755 index bb9edc87bf9..00000000000 --- a/dev/jobs/mos_wx_prdgen.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env bash - -set -x - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="mos_wx_prdgen" -export jobid="${job}.$$" - -############################################################### -# Source jjob_header before invoking external JJOB - -source "${HOMEgfs}/ush/jjob_header.sh" -e "mos_wx_prdgen" -c "base mos_wx_prdgen" - -############################################################### -# Execute the JJOB - -"${HOMEgfs_mos}/jobs/JGFSMOS_WX_PRDGEN" -status=$? - -exit "${status}" diff --git a/dev/workflow/applications/applications.py b/dev/workflow/applications/applications.py index 656f97bfeb6..44ae2210aa4 100644 --- a/dev/workflow/applications/applications.py +++ b/dev/workflow/applications/applications.py @@ -95,7 +95,6 @@ def _get_run_options(self, conf: Configuration) -> Dict[str, Any]: run_options[run]['do_metp'] = run_base.get('DO_METP', False) run_options[run]['do_upp'] = not run_base.get('WRITE_DOPOST', True) run_options[run]['do_goes'] = run_base.get('DO_GOES', False) - run_options[run]['do_mos'] = run_base.get('DO_MOS', False) run_options[run]['do_extractvars'] = run_base.get('DO_EXTRACTVARS', False) run_options[run]['do_archcom'] = run_base.get('DO_ARCHCOM', False) diff --git a/dev/workflow/applications/gfs_cycled.py b/dev/workflow/applications/gfs_cycled.py index b7380b327c8..f174763cf2a 100644 --- a/dev/workflow/applications/gfs_cycled.py +++ b/dev/workflow/applications/gfs_cycled.py @@ -153,12 +153,6 @@ def _get_app_configs(self, run): if options['do_hybvar']: configs += ['esnowanl'] - if options['do_mos']: - configs += ['mos_stn_prep', 'mos_grd_prep', 'mos_ext_stn_prep', 'mos_ext_grd_prep', - 'mos_stn_fcst', 'mos_grd_fcst', 'mos_ext_stn_fcst', 'mos_ext_grd_fcst', - 'mos_stn_prdgen', 'mos_grd_prdgen', 'mos_ext_stn_prdgen', 'mos_ext_grd_prdgen', - 'mos_wx_prdgen', 'mos_wx_ext_prdgen'] - if options['do_globusarch']: configs += ['globus'] @@ -307,12 +301,6 @@ def get_task_names(self): if options['do_awips']: task_names[run] += ['awips_20km_1p0deg', 'fbwind'] - if options['do_mos']: - task_names[run] += ['mos_stn_prep', 'mos_grd_prep', 'mos_ext_stn_prep', 'mos_ext_grd_prep', - 'mos_stn_fcst', 'mos_grd_fcst', 'mos_ext_stn_fcst', 'mos_ext_grd_fcst', - 'mos_stn_prdgen', 'mos_grd_prdgen', 'mos_ext_stn_prdgen', - 'mos_ext_grd_prdgen', 'mos_wx_prdgen', 'mos_wx_ext_prdgen'] - # Last items task_names[run] += ['arch_vrfy'] if options['do_archcom']: diff --git a/dev/workflow/applications/gfs_forecast_only.py b/dev/workflow/applications/gfs_forecast_only.py index 172d3db0f5c..2fd6ffc746c 100644 --- a/dev/workflow/applications/gfs_forecast_only.py +++ b/dev/workflow/applications/gfs_forecast_only.py @@ -80,12 +80,6 @@ def _get_app_configs(self, run): if options['do_awips']: configs += ['waveawipsbulls', 'waveawipsgridded'] - if options['do_mos']: - configs += ['mos_stn_prep', 'mos_grd_prep', 'mos_ext_stn_prep', 'mos_ext_grd_prep', - 'mos_stn_fcst', 'mos_grd_fcst', 'mos_ext_stn_fcst', 'mos_ext_grd_fcst', - 'mos_stn_prdgen', 'mos_grd_prdgen', 'mos_ext_stn_prdgen', 'mos_ext_grd_prdgen', - 'mos_wx_prdgen', 'mos_wx_ext_prdgen'] - if options['do_archcom']: configs += ['arch_tars'] if options['do_globusarch']: @@ -173,12 +167,6 @@ def get_task_names(self): if options['do_awips']: tasks += ['waveawipsbulls', 'waveawipsgridded'] - if options['do_mos']: - tasks += ['mos_stn_prep', 'mos_grd_prep', 'mos_ext_stn_prep', 'mos_ext_grd_prep', - 'mos_stn_fcst', 'mos_grd_fcst', 'mos_ext_stn_fcst', 'mos_ext_grd_fcst', - 'mos_stn_prdgen', 'mos_grd_prdgen', 'mos_ext_stn_prdgen', 'mos_ext_grd_prdgen', - 'mos_wx_prdgen', 'mos_wx_ext_prdgen'] - if options['do_archcom']: tasks += ['arch_tars'] if options['do_globusarch']: diff --git a/dev/workflow/rocoto/gfs_tasks.py b/dev/workflow/rocoto/gfs_tasks.py index 4273d07e09f..89ac5e6e8de 100644 --- a/dev/workflow/rocoto/gfs_tasks.py +++ b/dev/workflow/rocoto/gfs_tasks.py @@ -1980,355 +1980,6 @@ def metp(self): return task - def mos_stn_prep(self): - deps = [] - dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - - resources = self.get_resource('mos_stn_prep') - task_name = f'{self.run}_mos_stn_prep' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_stn_prep.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_grd_prep(self): - deps = [] - dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - - resources = self.get_resource('mos_grd_prep') - task_name = f'{self.run}_mos_grd_prep' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_grd_prep.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_ext_stn_prep(self): - deps = [] - dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - - resources = self.get_resource('mos_ext_stn_prep') - task_name = f'{self.run}_mos_ext_stn_prep' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_ext_stn_prep.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_ext_grd_prep(self): - deps = [] - dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - - resources = self.get_resource('mos_ext_grd_prep') - task_name = f'{self.run}_mos_ext_grd_prep' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_ext_grd_prep.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_stn_fcst(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prep'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - - resources = self.get_resource('mos_stn_fcst') - task_name = f'{self.run}_mos_stn_fcst' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_stn_fcst.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_grd_fcst(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prep'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_prep'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - - resources = self.get_resource('mos_grd_fcst') - task_name = f'{self.run}_mos_grd_fcst' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_grd_fcst.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_ext_stn_fcst(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_stn_prep'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prdgen'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - - resources = self.get_resource('mos_ext_stn_fcst') - task_name = f'{self.run}_mos_ext_stn_fcst' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_ext_stn_fcst.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_ext_grd_fcst(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_stn_prep'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_grd_prep'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_fcst'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - - resources = self.get_resource('mos_ext_grd_fcst') - task_name = f'{self.run}_mos_ext_grd_fcst' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_ext_grd_fcst.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_stn_prdgen(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_fcst'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - - resources = self.get_resource('mos_stn_prdgen') - task_name = f'{self.run}_mos_stn_prdgen' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_stn_prdgen.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_grd_prdgen(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_fcst'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prdgen'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - - resources = self.get_resource('mos_grd_prdgen') - task_name = f'{self.run}_mos_grd_prdgen' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_grd_prdgen.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_ext_stn_prdgen(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_stn_fcst'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prdgen'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - - resources = self.get_resource('mos_ext_stn_prdgen') - task_name = f'{self.run}_mos_ext_stn_prdgen' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_ext_stn_prdgen.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_ext_grd_prdgen(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_grd_fcst'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_prdgen'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_stn_prdgen'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - - resources = self.get_resource('mos_ext_grd_prdgen') - task_name = f'{self.run}_mos_ext_grd_prdgen' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_ext_grd_prdgen.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_wx_prdgen(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_prdgen'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - - resources = self.get_resource('mos_wx_prdgen') - task_name = f'{self.run}_mos_wx_prdgen' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_wx_prdgen.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - - def mos_wx_ext_prdgen(self): - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_grd_prdgen'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_wx_prdgen'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - - resources = self.get_resource('mos_wx_ext_prdgen') - task_name = f'{self.run}_mos_wx_ext_prdgen' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/dev/jobs/mos_wx_ext_prdgen.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - def arch_vrfy(self): deps = [] if self.app_config.mode in ['cycled']: @@ -2447,16 +2098,6 @@ def arch_tars(self): if self.run in ['gfs']: dep_dict = {'type': 'metatask', 'name': f'{self.run}_ice_prod'} deps.append(rocoto.add_dependency(dep_dict)) - # MOS job dependencies - if self.run in ['gfs'] and self.options['do_mos']: - mos_jobs = ["stn_prep", "grd_prep", "ext_stn_prep", "ext_grd_prep", - "stn_fcst", "grd_fcst", "ext_stn_fcst", "ext_grd_fcst", - "stn_prdgen", "grd_prdgen", "ext_stn_prdgen", "ext_grd_prdgen", - "wx_prdgen", "wx_ext_prdgen"] - for job in mos_jobs: - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_{job}'} - deps.append(rocoto.add_dependency(dep_dict)) - if self.options['do_gempak']: if self.run in ['gdas']: dep_dict = {'type': 'task', 'name': f'{self.run}_gempakmetancdc'} @@ -2630,16 +2271,6 @@ def cleanup(self): if self.run in ['gfs']: dep_dict = {'type': 'metatask', 'name': f'{self.run}_ice_prod'} deps.append(rocoto.add_dependency(dep_dict)) - # MOS job dependencies - if self.run in ['gfs'] and self.options['do_mos']: - mos_jobs = ["stn_prep", "grd_prep", "ext_stn_prep", "ext_grd_prep", - "stn_fcst", "grd_fcst", "ext_stn_fcst", "ext_grd_fcst", - "stn_prdgen", "grd_prdgen", "ext_stn_prdgen", "ext_grd_prdgen", - "wx_prdgen", "wx_ext_prdgen"] - for job in mos_jobs: - dep_dict = {'type': 'task', 'name': f'{self.run}_mos_{job}'} - deps.append(rocoto.add_dependency(dep_dict)) - if self.options['do_gempak']: if self.run in ['gdas']: dep_dict = {'type': 'task', 'name': f'{self.run}_gempakmetancdc'} diff --git a/dev/workflow/rocoto/tasks.py b/dev/workflow/rocoto/tasks.py index ffe3b5f99ab..54eb0335191 100644 --- a/dev/workflow/rocoto/tasks.py +++ b/dev/workflow/rocoto/tasks.py @@ -30,14 +30,10 @@ class Tasks: 'verfozn', 'verfrad', 'vminmon', 'anlstat', 'metp', 'fit2obs', 'extractvars', 'tracker', 'genesis', 'genesis_fsu', - 'postsnd', 'awips', 'awips_20km_1p0deg', 'fbwind', + 'postsnd', 'awips', 'awips_20km_1p0deg', 'fbwind', 'npoess', 'gempak', 'gempakmeta', 'gempakmetancdc', 'gempakncdcupapgif', 'gempakpgrb2spec', 'npoess_pgrb2_0p5deg', 'waveawipsbulls', 'waveawipsgridded', 'wavegempak', 'waveinit', - 'wavepostbndpnt', 'wavepostbndpntbll', 'wavepostpnt', 'wavepostsbs', 'waveprep', - 'npoess', - 'mos_stn_prep', 'mos_grd_prep', 'mos_ext_stn_prep', 'mos_ext_grd_prep', - 'mos_stn_fcst', 'mos_grd_fcst', 'mos_ext_stn_fcst', 'mos_ext_grd_fcst', - 'mos_stn_prdgen', 'mos_grd_prdgen', 'mos_ext_stn_prdgen', 'mos_ext_grd_prdgen', 'mos_wx_prdgen', 'mos_wx_ext_prdgen'] + 'wavepostbndpnt', 'wavepostbndpntbll', 'wavepostpnt', 'wavepostsbs', 'waveprep'] def __init__(self, app_config: AppConfig, run: str) -> None: diff --git a/env/WCOSS2.env b/env/WCOSS2.env index fe823b7fefd..1ff000c7aa0 100755 --- a/env/WCOSS2.env +++ b/env/WCOSS2.env @@ -342,12 +342,4 @@ elif [[ "${step}" = "waveawipsbulls" ]]; then unset PERL5LIB -elif [[ "${step:0:3}" = "mos" ]]; then - - export FORT_BUFFERED=TRUE - - if [[ "${step}" = "mos_stn_prep" ]]; then - export OMP_PROC_BIND=true - fi - fi diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua index ad4f45f7d55..23e5d46661e 100644 --- a/modulefiles/module_base.wcoss2.lua +++ b/modulefiles/module_base.wcoss2.lua @@ -43,7 +43,4 @@ load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None"))) prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles")) load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) -append_path("MODULEPATH", pathJoin("/apps/ops/prod/nco/models/modulefiles")) -load(pathJoin("mos_shared", (os.getenv("mos_shared_ver") or "None"))) - whatis("Description: GFS run environment") diff --git a/parm/archive/master_gfs.yaml.j2 b/parm/archive/master_gfs.yaml.j2 index dc8c0640e57..c54a45933a7 100644 --- a/parm/archive/master_gfs.yaml.j2 +++ b/parm/archive/master_gfs.yaml.j2 @@ -64,27 +64,6 @@ datasets: {% endfilter %} {% endif %} -# Determine whether to save the MOS tarball -{% if DO_MOS and cycle_HH == "18" %} - - {% if not REALTIME %} - {% filter indent(width=4) %} -{% include "gfsmos.yaml.j2" %} - {% endfilter %} - - {% else %} - - {% set td_from_sdate = current_cycle - SDATE %} - {% set td_one_day = "+1D" | to_timedelta %} - {% if td_from_sdate > td_one_day %} - {% filter indent(width=4) %} -{% include "gfsmos.yaml.j2" %} - {% endfilter %} - {% endif %} - - {% endif %} -{% endif %} - # Determine if we will save restart ICs or not {% if ARCH_CYC == cycle_HH | int %} # Save the forecast-only cycle ICs every ARCH_WARMICFREQ or ARCH_FCSTICFREQ days diff --git a/parm/config/gefs/config.base.j2 b/parm/config/gefs/config.base.j2 index fd432b87fc1..202f3dfe559 100644 --- a/parm/config/gefs/config.base.j2 +++ b/parm/config/gefs/config.base.j2 @@ -61,12 +61,6 @@ export DO_BUFRSND="{{ DO_BUFRSND }}" # BUFR sounding products export DO_GEMPAK="{{ DO_GEMPAK }}" # GEMPAK products export DO_AWIPS="{{ DO_AWIPS }}" # AWIPS products -# NO for retrospective parallel; YES for real-time parallel -# arch.sh uses REALTIME for MOS. Need to set REALTIME=YES -# if want MOS written to HPSS. Should update arch.sh to -# use RUNMOS flag -export REALTIME="YES" - # Experiment mode (cycled or forecast-only) export MODE="{{ MODE }}" # cycled/forecast-only export DO_TEST_MODE="{{ DO_TEST_MODE }}" # option to change configuration for automated testing diff --git a/parm/config/gfs/config.base.j2 b/parm/config/gfs/config.base.j2 index 8fd6c61caef..45bd7fd9704 100644 --- a/parm/config/gfs/config.base.j2 +++ b/parm/config/gfs/config.base.j2 @@ -83,13 +83,6 @@ export DO_VERFOZN="YES" # Ozone data assimilation monitoring export DO_VERFRAD="YES" # Radiance data assimilation monitoring export DO_VMINMON="YES" # GSI minimization monitoring export DO_ANLSTAT="NO" # JEDI-based analysis statistics -export DO_MOS="NO" # GFS Model Output Statistics - Only supported on WCOSS2 - -# NO for retrospective parallel; YES for real-time parallel -# arch.sh uses REALTIME for MOS. Need to set REALTIME=YES -# if want MOS written to HPSS. Should update arch_vrfy.sh and arch_tars to -# use RUNMOS flag -export REALTIME="YES" # Experiment mode (cycled or forecast-only) export MODE="{{ MODE }}" # cycled/forecast-only diff --git a/parm/config/gfs/config.mos b/parm/config/gfs/config.mos deleted file mode 100644 index a74c7e7d21c..00000000000 --- a/parm/config/gfs/config.mos +++ /dev/null @@ -1,9 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos ########## -echo "BEGIN: config.mos" - -# MOS package location -export HOMEgfs_mos=/lfs/h1/ops/prod/packages/gfs_mos.v${mos_ver} - -echo "END: config.mos" diff --git a/parm/config/gfs/config.mos_ext_grd_fcst b/parm/config/gfs/config.mos_ext_grd_fcst deleted file mode 100644 index db94af945f4..00000000000 --- a/parm/config/gfs/config.mos_ext_grd_fcst +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_ext_grd_fcst ########## -echo "BEGIN: config.mos_ext_grd_fcst" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_ext_grd_fcst - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_ext_grd_fcst" diff --git a/parm/config/gfs/config.mos_ext_grd_prdgen b/parm/config/gfs/config.mos_ext_grd_prdgen deleted file mode 100644 index ade31b0c1ac..00000000000 --- a/parm/config/gfs/config.mos_ext_grd_prdgen +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_ext_grd_prdgen ########## -echo "BEGIN: config.mos_ext_grd_prdgen" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_ext_grd_prdgen - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_ext_grd_prdgen" diff --git a/parm/config/gfs/config.mos_ext_grd_prep b/parm/config/gfs/config.mos_ext_grd_prep deleted file mode 100644 index 0ba14e25732..00000000000 --- a/parm/config/gfs/config.mos_ext_grd_prep +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_ext_grd_prep ########## -echo "BEGIN: config.mos_ext_grd_prep" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_ext_grd_prep - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_ext_grd_prep" diff --git a/parm/config/gfs/config.mos_ext_stn_fcst b/parm/config/gfs/config.mos_ext_stn_fcst deleted file mode 100644 index 5b26d196f9b..00000000000 --- a/parm/config/gfs/config.mos_ext_stn_fcst +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_ext_stn_fcst ########## -echo "BEGIN: config.mos_ext_stn_fcst" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_ext_stn_fcst - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_ext_stn_fcst" diff --git a/parm/config/gfs/config.mos_ext_stn_prdgen b/parm/config/gfs/config.mos_ext_stn_prdgen deleted file mode 100644 index 9f63eb56fd7..00000000000 --- a/parm/config/gfs/config.mos_ext_stn_prdgen +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_ext_stn_prdgen ########## -echo "BEGIN: config.mos_ext_stn_prdgen" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_ext_stn_prdgen - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_ext_stn_prdgen" diff --git a/parm/config/gfs/config.mos_ext_stn_prep b/parm/config/gfs/config.mos_ext_stn_prep deleted file mode 100644 index c443503f116..00000000000 --- a/parm/config/gfs/config.mos_ext_stn_prep +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_ext_stn_prep ########## -echo "BEGIN: config.mos_ext_stn_prep" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_ext_stn_prep - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_ext_stn_prep" diff --git a/parm/config/gfs/config.mos_grd_fcst b/parm/config/gfs/config.mos_grd_fcst deleted file mode 100644 index bd0d50a04df..00000000000 --- a/parm/config/gfs/config.mos_grd_fcst +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_grd_fcst ########## -echo "BEGIN: config.mos_grd_fcst" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_grd_fcst - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_grd_fcst" diff --git a/parm/config/gfs/config.mos_grd_prdgen b/parm/config/gfs/config.mos_grd_prdgen deleted file mode 100644 index dd9ce8bcd86..00000000000 --- a/parm/config/gfs/config.mos_grd_prdgen +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_grd_prdgen ########## -echo "BEGIN: config.mos_grd_prdgen" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_grd_prdgen - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_grd_prdgen" diff --git a/parm/config/gfs/config.mos_grd_prep b/parm/config/gfs/config.mos_grd_prep deleted file mode 100644 index 8a3d334d0d5..00000000000 --- a/parm/config/gfs/config.mos_grd_prep +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_grd_prep ########## -echo "BEGIN: config.mos_grd_prep" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_grd_prep - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_grd_prep" diff --git a/parm/config/gfs/config.mos_stn_fcst b/parm/config/gfs/config.mos_stn_fcst deleted file mode 100644 index 7cb266ea3a8..00000000000 --- a/parm/config/gfs/config.mos_stn_fcst +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_stn_fcst ########## -echo "BEGIN: config.mos_stn_fcst" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_stn_fcst - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_stn_fcst" diff --git a/parm/config/gfs/config.mos_stn_prdgen b/parm/config/gfs/config.mos_stn_prdgen deleted file mode 100644 index f92edbd0fd0..00000000000 --- a/parm/config/gfs/config.mos_stn_prdgen +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_stn_prdgen ########## -echo "BEGIN: config.mos_stn_prdgen" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_stn_prdgen - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_stn_prdgen" diff --git a/parm/config/gfs/config.mos_stn_prep b/parm/config/gfs/config.mos_stn_prep deleted file mode 100644 index b236f428795..00000000000 --- a/parm/config/gfs/config.mos_stn_prep +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_stn_prep ########## -echo "BEGIN: config.mos_stn_prep" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_stn_prep - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_stn_prep" diff --git a/parm/config/gfs/config.mos_wx_ext_prdgen b/parm/config/gfs/config.mos_wx_ext_prdgen deleted file mode 100644 index 054cb950ada..00000000000 --- a/parm/config/gfs/config.mos_wx_ext_prdgen +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_wx_ext_prdgen ########## -echo "BEGIN: config.mos_wx_ext_prdgen" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_wx_ext_prdgen - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_wx_ext_prdgen" diff --git a/parm/config/gfs/config.mos_wx_prdgen b/parm/config/gfs/config.mos_wx_prdgen deleted file mode 100644 index d4481b65fca..00000000000 --- a/parm/config/gfs/config.mos_wx_prdgen +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -########## config.mos_wx_prdgen ########## -echo "BEGIN: config.mos_wx_prdgen" - -# Get task specific resources -. "${EXPDIR}/config.resources" mos_wx_prdgen - -# Get MOS settings -. "${EXPDIR}/config.mos" - -echo "END: config.mos_wx_prdgen" diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index 3302bfc8cd9..2d08d75b450 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -1365,153 +1365,6 @@ case ${step} in tasks_per_node=1 ;; - "mos_stn_prep") - walltime="00:10:00" - ntasks=3 - tasks_per_node=3 - threads_per_task=1 - memory="5GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - ;; - - "mos_grd_prep") - walltime="00:10:00" - ntasks=4 - tasks_per_node=4 - threads_per_task=1 - memory="16GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - ;; - - "mos_ext_stn_prep") - walltime="00:15:00" - ntasks=2 - tasks_per_node=2 - threads_per_task=1 - memory="5GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - ;; - - "mos_ext_grd_prep") - walltime="00:10:00" - ntasks=7 - tasks_per_node=7 - threads_per_task=1 - memory="3GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - ;; - - "mos_stn_fcst") - walltime="00:10:00" - ntasks=5 - tasks_per_node=5 - threads_per_task=1 - memory="40GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - ;; - - "mos_grd_fcst") - walltime="00:10:00" - ntasks=7 - tasks_per_node=7 - threads_per_task=1 - memory="50GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - ;; - - "mos_ext_stn_fcst") - walltime="00:20:00" - ntasks=3 - tasks_per_node=3 - threads_per_task=1 - memory="50GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - export prepost=True - ;; - - "mos_ext_grd_fcst") - walltime="00:10:00" - ntasks=7 - tasks_per_node=7 - threads_per_task=1 - memory="50GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - ;; - - "mos_stn_prdgen") - walltime="00:10:00" - ntasks=1 - tasks_per_node=1 - threads_per_task=1 - memory="15GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - export prepost=True - ;; - - "mos_grd_prdgen") - walltime="00:40:00" - ntasks=72 - tasks_per_node=18 - threads_per_task=4 - memory="20GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - export OMP_NUM_THREADS="${threads_per_task}" - ;; - - "mos_ext_stn_prdgen") - walltime="00:10:00" - ntasks=1 - tasks_per_node=1 - threads_per_task=1 - memory="15GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - export prepost=True - ;; - - "mos_ext_grd_prdgen") - walltime="00:30:00" - ntasks=96 - tasks_per_node=6 - threads_per_task=16 - memory="30GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - export OMP_NUM_THREADS="${threads_per_task}" - ;; - - "mos_wx_prdgen") - walltime="00:10:00" - ntasks=4 - tasks_per_node=2 - threads_per_task=2 - memory="10GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - export OMP_NUM_THREADS="${threads_per_task}" - ;; - - "mos_wx_ext_prdgen") - walltime="00:10:00" - ntasks=4 - tasks_per_node=2 - threads_per_task=2 - memory="10GB" - NTASK="${ntasks}" - export PTILE="${tasks_per_node}" - export OMP_NUM_THREADS="${threads_per_task}" - ;; - *) echo "FATAL ERROR: Invalid job ${step} passed to ${BASH_SOURCE[0]}" exit 1 diff --git a/parm/config/sfs/config.base.j2 b/parm/config/sfs/config.base.j2 index f3e3311439a..fb658410244 100644 --- a/parm/config/sfs/config.base.j2 +++ b/parm/config/sfs/config.base.j2 @@ -61,12 +61,6 @@ export DO_BUFRSND="{{ DO_BUFRSND }}" # BUFR sounding products export DO_GEMPAK="{{ DO_GEMPAK }}" # GEMPAK products export DO_AWIPS="{{ DO_AWIPS }}" # AWIPS products -# NO for retrospective parallel; YES for real-time parallel -# arch.sh uses REALTIME for MOS. Need to set REALTIME=YES -# if want MOS written to HPSS. Should update arch.sh to -# use RUNMOS flag -export REALTIME="YES" - # Experiment mode (cycled or forecast-only) export MODE="{{ MODE }}" # cycled/forecast-only export DO_TEST_MODE="{{ DO_TEST_MODE }}" # option to change configuration for automated testing diff --git a/scripts/exglobal_archive_tars.py b/scripts/exglobal_archive_tars.py index 208d6f674a4..86a26fb8cbd 100755 --- a/scripts/exglobal_archive_tars.py +++ b/scripts/exglobal_archive_tars.py @@ -27,8 +27,8 @@ def main(): # Pull out all the configuration keys needed to run the rest of archive steps keys = ['ATARDIR', 'current_cycle', 'FHMIN', 'FHMAX', 'FHOUT', 'RUN', 'PDY', 'DO_VERFRAD', 'DO_VMINMON', 'DO_VERFOZN', 'DO_ICE', 'DO_PREP_OBS_AERO', - 'PARMgfs', 'DO_OCN', 'DO_WAVE', 'WRITE_DOPOST', 'PSLOT', 'DO_MOS', - 'DO_JEDISNOWDA', 'DO_ARCHCOM', 'ARCHCOM_TO', 'REALTIME', 'ROTDIR', 'ARCH_WARMICFREQ', + 'PARMgfs', 'DO_OCN', 'DO_WAVE', 'WRITE_DOPOST', 'PSLOT', + 'DO_JEDISNOWDA', 'DO_ARCHCOM', 'ARCHCOM_TO', 'ROTDIR', 'ARCH_WARMICFREQ', 'ARCH_FCSTICFREQ', 'ARCH_CYC', 'assim_freq', 'ARCDIR', 'SDATE', 'FHMIN_GFS', 'FHMAX_GFS', 'FHOUT_GFS', 'ARCH_GAUSSIAN', 'MODE', 'FHOUT_OCN', 'FHOUT_ICE', 'FHOUT_OCN_GFS', 'FHOUT_ICE_GFS', 'DO_BUFRSND', 'DOHYBVAR', diff --git a/scripts/exglobal_cleanup.sh b/scripts/exglobal_cleanup.sh index 69cd513bf84..c65ea56ac6d 100755 --- a/scripts/exglobal_cleanup.sh +++ b/scripts/exglobal_cleanup.sh @@ -66,12 +66,6 @@ for (( current_date=first_date; current_date <= last_date; \ if [[ -d "${rtofs_dir}" ]] && (( current_date < last_rtofs )); then rm -rf "${rtofs_dir}" ; fi fi fi - - # Remove mdl gfsmos directory - if [[ "${RUN}" == "gfs" ]]; then - mos_dir="${ROTDIR}/gfsmos.${current_PDY}" - if [[ -d "${mos_dir}" ]] && (( current_date < CDATE_MOS )); then rm -rf "${mos_dir}" ; fi - fi done # Remove archived gaussian files used for Fit2Obs in $VFYARC that are diff --git a/versions/run.wcoss2.ver b/versions/run.wcoss2.ver index 5efa181505f..18425840ceb 100644 --- a/versions/run.wcoss2.ver +++ b/versions/run.wcoss2.ver @@ -50,5 +50,3 @@ export prepobs_run_ver=1.1.0 export ens_tracker_ver=v1.2.0 export fit2obs_ver=1.1.5 -export mos_ver=5.4.3 -export mos_shared_ver=2.7.2