From b133700a4a65fe5334e5b5522a8c6f83bf0bbd0c Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Thu, 26 Mar 2020 13:01:38 +0000 Subject: [PATCH] Issue #21 - correct syntax for machine if-blocks in setup_expt scripts --- ush/rocoto/setup_expt.py | 6 +++--- ush/rocoto/setup_expt_fcstonly.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py index 82c737803e..d4841b3278 100755 --- a/ush/rocoto/setup_expt.py +++ b/ush/rocoto/setup_expt.py @@ -164,7 +164,7 @@ def edit_baseconfig(): partition = args.partition # Set machine defaults - if machine is 'WCOSS_DELL_P3': + if machine == 'WCOSS_DELL_P3': base_git = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git' base_svn = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git' dmpdir = '/gpfs/dell3/emc/global/dump' @@ -179,7 +179,7 @@ def edit_baseconfig(): if partition in ['3p5']: queue = 'dev2' queue_arch = 'dev2_transfer' - elif machine is 'WCOSS_C': + elif machine == 'WCOSS_C': base_git = '/gpfs/hps3/emc/global/noscrub/emc.glopara/git' base_svn = '/gpfs/hps3/emc/global/noscrub/emc.glopara/svn' dmpdir = '/gpfs/dell3/emc/global/dump' @@ -191,7 +191,7 @@ def edit_baseconfig(): account = 'GFS-DEV' queue = 'dev' queue_arch = 'dev_transfer' - elif machine is 'HERA': + elif machine == 'HERA': base_git = '/scratch1/NCEPDEV/global/glopara/git' base_svn = '/scratch1/NCEPDEV/global/glopara/svn' dmpdir = '/scratch1/NCEPDEV/global/glopara/dump' diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py index a55ab3a1e7..79d6fa9ed8 100755 --- a/ush/rocoto/setup_expt_fcstonly.py +++ b/ush/rocoto/setup_expt_fcstonly.py @@ -130,7 +130,7 @@ def edit_baseconfig(): partition = args.partition # Set machine defaults - if machine is 'WCOSS_DELL_P3': + if machine == 'WCOSS_DELL_P3': base_git = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git' base_svn = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git' dmpdir = '/gpfs/dell3/emc/global/dump' @@ -145,7 +145,7 @@ def edit_baseconfig(): if partition in ['3p5']: queue = 'dev2' queue_arch = 'dev2_transfer' - elif machine is 'WCOSS_C': + elif machine == 'WCOSS_C': base_git = '/gpfs/hps3/emc/global/noscrub/emc.glopara/git' base_svn = '/gpfs/hps3/emc/global/noscrub/emc.glopara/svn' dmpdir = '/gpfs/dell3/emc/global/dump' @@ -157,7 +157,7 @@ def edit_baseconfig(): account = 'GFS-DEV' queue = 'dev' queue_arch = 'dev_transfer' - elif machine is 'HERA': + elif machine == 'HERA': base_git = '/scratch1/NCEPDEV/global/glopara/git' base_svn = '/scratch1/NCEPDEV/global/glopara/svn' dmpdir = '/scratch1/NCEPDEV/global/glopara/dump'