Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary variables which reference to nemsio #1259

Merged
merged 12 commits into from
Jan 25, 2023
Merged

Remove unnecessary variables which reference to nemsio #1259

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a636f5e
Remove unnecessary variables which reference to nemsio
lgannoaa Jan 20, 2023
80859cd
Merge branch 'develop' into feature/issue-601-p2
lgannoaa Jan 23, 2023
8f9157f
Remove reference to GSUFFIX and ASUFFI. Remove nemsio only scripts
lgannoaa Jan 23, 2023
c8f8311
merge develop
lgannoaa Jan 23, 2023
4c6da74
Merge conflict
lgannoaa Jan 23, 2023
f6fc5b6
Clean up testing script
lgannoaa Jan 23, 2023
2b01ab8
Clean up space
lgannoaa Jan 23, 2023
7927df4
Clean up exgdas_enkf_sfc.sh
lgannoaa Jan 23, 2023
9e634dd
Using GSUFFIX in JGDAS_ENKF_SELECT_OBS and exglobal_atmos_analysis.sh…
lgannoaa Jan 24, 2023
a8cecef
Remve indentation in hpssarch_gen.sh
lgannoaa Jan 25, 2023
057251d
Merge remote-tracking branch 'upstream/develop' into feature/issue-60…
lgannoaa Jan 25, 2023
310d0c4
Merge branch 'feature/issue-601-p2' of https://github.com/lgannoaa/gl…
lgannoaa Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Using GSUFFIX in JGDAS_ENKF_SELECT_OBS and exglobal_atmos_analysis.sh… 
… as needed. Update workflow_tasks.py for this issue
  • Loading branch information
@lgannoaa
lgannoaa committed Jan 24, 2023
commit 9e634dd3e886f8c47029688d5014b560688a1be6
3 changes: 2 additions & 1 deletion jobs/JGDAS_ENKF_SELECT_OBS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export CDUMP_OBS=${CDUMP_OBS:-${CDUMP}}
export OPREFIX="${CDUMP_OBS}.t${cyc}z."
export APREFIX="${CDUMP}.t${cyc}z."
export GPREFIX="${GDUMP}.t${gcyc}z."
export GSUFFIX=".ensmean.nc"

if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${RUN}.${PDY}/${cyc}/${COMPONENT}}
Expand All @@ -46,7 +47,7 @@ export COMIN_GES=${COMIN_GES_ENS}
export COMOUT="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"


export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006.ensmean.nc"
export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006${GSUFFIX}"
if [ ! -f ${ATMGES_ENSMEAN} ]; then
echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
exit 1
Expand Down
29 changes: 15 additions & 14 deletions scripts/exglobal_atmos_analysis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,20 +156,21 @@ HDOB=${HDOB:-${COMIN_OBS}/${OPREFIX}hdob.tm00.bufr_d${OSUFFIX}}

# Guess files
GPREFIX=${GPREFIX:-""}
SFCG03=${SFCG03:-${COMIN_GES}/${GPREFIX}sfcf003.nc}
SFCG04=${SFCG04:-${COMIN_GES}/${GPREFIX}sfcf004.nc}
SFCG05=${SFCG05:-${COMIN_GES}/${GPREFIX}sfcf005.nc}
SFCGES=${SFCGES:-${COMIN_GES}/${GPREFIX}sfcf006.nc}
SFCG07=${SFCG07:-${COMIN_GES}/${GPREFIX}sfcf007.nc}
SFCG08=${SFCG08:-${COMIN_GES}/${GPREFIX}sfcf008.nc}
SFCG09=${SFCG09:-${COMIN_GES}/${GPREFIX}sfcf009.nc}
ATMG03=${ATMG03:-${COMIN_GES}/${GPREFIX}atmf003.nc}
ATMG04=${ATMG04:-${COMIN_GES}/${GPREFIX}atmf004.nc}
ATMG05=${ATMG05:-${COMIN_GES}/${GPREFIX}atmf005.nc}
ATMGES=${ATMGES:-${COMIN_GES}/${GPREFIX}atmf006.nc}
ATMG07=${ATMG07:-${COMIN_GES}/${GPREFIX}atmf007.nc}
ATMG08=${ATMG08:-${COMIN_GES}/${GPREFIX}atmf008.nc}
ATMG09=${ATMG09:-${COMIN_GES}/${GPREFIX}atmf009.nc}
GSUFFIX=${GSUFFIX:-".nc"}
SFCG03=${SFCG03:-${COMIN_GES}/${GPREFIX}sfcf003${GSUFFIX}}
SFCG04=${SFCG04:-${COMIN_GES}/${GPREFIX}sfcf004${GSUFFIX}}
SFCG05=${SFCG05:-${COMIN_GES}/${GPREFIX}sfcf005${GSUFFIX}}
SFCGES=${SFCGES:-${COMIN_GES}/${GPREFIX}sfcf006${GSUFFIX}}
SFCG07=${SFCG07:-${COMIN_GES}/${GPREFIX}sfcf007${GSUFFIX}}
SFCG08=${SFCG08:-${COMIN_GES}/${GPREFIX}sfcf008${GSUFFIX}}
SFCG09=${SFCG09:-${COMIN_GES}/${GPREFIX}sfcf009${GSUFFIX}}
ATMG03=${ATMG03:-${COMIN_GES}/${GPREFIX}atmf003${GSUFFIX}}
ATMG04=${ATMG04:-${COMIN_GES}/${GPREFIX}atmf004${GSUFFIX}}
ATMG05=${ATMG05:-${COMIN_GES}/${GPREFIX}atmf005${GSUFFIX}}
ATMGES=${ATMGES:-${COMIN_GES}/${GPREFIX}atmf006${GSUFFIX}}
ATMG07=${ATMG07:-${COMIN_GES}/${GPREFIX}atmf007${GSUFFIX}}
ATMG08=${ATMG08:-${COMIN_GES}/${GPREFIX}atmf008${GSUFFIX}}
ATMG09=${ATMG09:-${COMIN_GES}/${GPREFIX}atmf009${GSUFFIX}}
GBIAS=${GBIAS:-${COMIN_GES}/${GPREFIX}abias}
GBIASPC=${GBIASPC:-${COMIN_GES}/${GPREFIX}abias_pc}
GBIASAIR=${GBIASAIR:-${COMIN_GES}/${GPREFIX}abias_air}
Expand Down
15 changes: 5 additions & 10 deletions workflow/rocoto/workflow_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ def init(self):

def prep(self):

suffix = self._base["SUFFIX"]
dump_suffix = self._base["DUMP_SUFFIX"]
gfs_cyc = self._base["gfs_cyc"]
dmpdir = self._base["DMPDIR"]
Expand All @@ -251,7 +250,7 @@ def prep(self):
deps = []
dep_dict = {'type': 'metatask', 'name': f'{"gdas"}post', 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009{suffix}'
data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009.nc'
dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
data = f'{dmpdir}/{self.cdump}{dump_suffix}.@Y@m@d/@H/atmos/{self.cdump}.t@Hz.updated.status.tm00.bufr_d'
Expand Down Expand Up @@ -399,7 +398,6 @@ def analdiag(self):

def atmanalprep(self):

suffix = self._base["SUFFIX"]
dump_suffix = self._base["DUMP_SUFFIX"]
gfs_cyc = self._base["gfs_cyc"]
dmpdir = self._base["DMPDIR"]
Expand All @@ -408,7 +406,7 @@ def atmanalprep(self):
deps = []
dep_dict = {'type': 'metatask', 'name': 'gdaspost', 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009{suffix}'
data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009.nc'
dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
data = f'{dmpdir}/{self.cdump}{dump_suffix}.@Y@m@d/@H/atmos/{self.cdump}.t@Hz.updated.status.tm00.bufr_d'
Expand Down Expand Up @@ -456,14 +454,13 @@ def atmanalpost(self):

def aeroanlinit(self):

suffix = self._base["SUFFIX"]
dump_suffix = self._base["DUMP_SUFFIX"]
dmpdir = self._base["DMPDIR"]

deps = []
dep_dict = {'type': 'metatask', 'name': 'gdaspost', 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009{suffix}'
data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009.nc'
dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
data = f'{dmpdir}/{self.cdump}{dump_suffix}.@Y@m@d/@H/atmos/{self.cdump}.t@Hz.updated.status.tm00.bufr_d'
Expand Down Expand Up @@ -501,12 +498,11 @@ def aeroanlfinal(self):

def ocnanalprep(self):

suffix = self._base["SUFFIX"]
dump_suffix = self._base["DUMP_SUFFIX"]
dmpdir = self._base["DMPDIR"]

deps = []
data = f'&ROTDIR;/gdas.@Y@m@d/@H/ocean/gdas.t@Hz.ocnf009{suffix}'
data = f'&ROTDIR;/gdas.@Y@m@d/@H/ocean/gdas.t@Hz.ocnf009.nc'
dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)
Expand Down Expand Up @@ -1087,7 +1083,6 @@ def eupd(self):

def atmensanalprep(self):

suffix = self._base["SUFFIX"]
dump_suffix = self._base["DUMP_SUFFIX"]
gfs_cyc = self._base["gfs_cyc"]
dmpdir = self._base["DMPDIR"]
Expand All @@ -1096,7 +1091,7 @@ def atmensanalprep(self):
deps = []
dep_dict = {'type': 'metatask', 'name': 'gdaspost', 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009{suffix}'
data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009.nc'
dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'}
deps.append(rocoto.add_dependency(dep_dict))
data = f'{dmpdir}/{self.cdump}{dump_suffix}.@Y@m@d/@H/atmos/{self.cdump}.t@Hz.updated.status.tm00.bufr_d'
Expand Down