diff --git a/scripts/exgdas_global_marine_analysis_post.py b/scripts/exgdas_global_marine_analysis_post.py index 1376bdd52..d207840f0 100755 --- a/scripts/exgdas_global_marine_analysis_post.py +++ b/scripts/exgdas_global_marine_analysis_post.py @@ -176,7 +176,7 @@ def create_obs_space(data): # TODO(GorA): this should be setup properly in the g-w once gdassoca_obsstats is in develop gdassoca_obsstats_exec = os.path.join(os.getenv('HOMEgfs'), 'sorc', 'gdas.cd', 'build', 'bin', 'gdassoca_obsstats.x') -command = f"{os.getenv('launcher')} {gdassoca_obsstats_exec} {stats_yaml}" +command = f"{os.getenv('launcher')} -n 1 {gdassoca_obsstats_exec} {stats_yaml}" logger.info(f"{command}") result = subprocess.run(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/scripts/exgdas_global_marine_analysis_prep.py b/scripts/exgdas_global_marine_analysis_prep.py index 686b4c8e8..265526eb0 100755 --- a/scripts/exgdas_global_marine_analysis_prep.py +++ b/scripts/exgdas_global_marine_analysis_prep.py @@ -336,7 +336,7 @@ def find_clim_ens(input_date): ################################################################################ # Copy initial condition -bkg_utils.stage_ic(bkg_dir, anl_dir, RUN, gcyc) +bkg_utils.stage_ic(bkg_dir, anl_dir, gcyc) ################################################################################ # prepare input.nml diff --git a/ush/soca/bkg_utils.py b/ush/soca/bkg_utils.py index 08be3dd89..488fcf697 100755 --- a/ush/soca/bkg_utils.py +++ b/ush/soca/bkg_utils.py @@ -101,13 +101,12 @@ def gen_bkg_list(bkg_path, out_path, window_begin=' ', yaml_name='bkg.yaml', ice bkg_date = window_begin # Construct list of background file names - RUN = os.getenv('RUN') cyc = str(os.getenv('cyc')).zfill(2) gcyc = str((int(cyc) - 6) % 24).zfill(2) # previous cycle fcst_hrs = list(range(3, 10, dt_pseudo)) files = [] for fcst_hr in fcst_hrs: - files.append(os.path.join(bkg_path, f'{RUN}.ocean.t'+gcyc+'z.inst.f'+str(fcst_hr).zfill(3)+'.nc')) + files.append(os.path.join(bkg_path, f'gdas.ocean.t'+gcyc+'z.inst.f'+str(fcst_hr).zfill(3)+'.nc')) # Identify the ocean background that will be used for the vertical coordinate remapping ocn_filename_ic = os.path.splitext(os.path.basename(files[0]))[0]+'.nc' @@ -159,17 +158,17 @@ def gen_bkg_list(bkg_path, out_path, window_begin=' ', yaml_name='bkg.yaml', ice FileHandler({'copy': bkg_list_src_dst}).sync() -def stage_ic(bkg_dir, anl_dir, RUN, gcyc): +def stage_ic(bkg_dir, anl_dir, gcyc): # Copy and rename initial condition ics_list = [] # ocean IC's - mom_ic_src = os.path.join(bkg_dir, f'{RUN}.ocean.t{gcyc}z.inst.f003.nc') + mom_ic_src = os.path.join(bkg_dir, f'gdas.ocean.t{gcyc}z.inst.f003.nc') mom_ic_dst = os.path.join(anl_dir, 'INPUT', 'MOM.res.nc') ics_list.append([mom_ic_src, mom_ic_dst]) # seaice IC's - cice_ic_src = os.path.join(bkg_dir, f'{RUN}.agg_ice.t{gcyc}z.inst.f003.nc') + cice_ic_src = os.path.join(bkg_dir, f'gdas.agg_ice.t{gcyc}z.inst.f003.nc') cice_ic_dst = os.path.join(anl_dir, 'INPUT', 'cice.res.nc') ics_list.append([cice_ic_src, cice_ic_dst]) FileHandler({'copy': ics_list}).sync() diff --git a/ush/soca/marine_recenter.py b/ush/soca/marine_recenter.py index 4c49bb530..5bb689e71 100644 --- a/ush/soca/marine_recenter.py +++ b/ush/soca/marine_recenter.py @@ -128,7 +128,7 @@ def initialize(self): ################################################################################ # Copy initial condition - bkg_utils.stage_ic(self.config.bkg_dir, self.runtime_config.DATA, RUN, gcyc) + bkg_utils.stage_ic(self.config.bkg_dir, self.runtime_config.DATA, gcyc) ################################################################################ # stage ensemble members