Skip to content

Update da-utils commit hash and address the co-pilot comments #2027

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

Merged
CoryMartin-NOAA merged 2 commits into from
Jan 5, 2026
Merged

Update da-utils commit hash and address the co-pilot comments #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eaf6a9
Update da-utils commit hash to include necessary utils
jiaruidong2017 Jan 2, 2026
6c344a2
Merge branch 'develop' into snow_ghcn3
jiaruidong2017 Jan 5, 2026
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
2 changes: 1 addition & 1 deletion sorc/da-utils
Open in desktop
Submodule da-utils updated 11 files
+0 −9 README
+0 −1 bundle/CMakeLists.txt
+0 −3 src/CMakeLists.txt
+0 −14 src/regridStates/CMakeLists.txt
+0 −20 src/regridStates/README
+0 −45 src/regridStates/gauIncr2native.nml
+0 −634 src/regridStates/grids_IO.F90
+0 −356 src/regridStates/regridStates.F90
+0 −54 src/regridStates/utils.F90
+374 −0 ush/gsincdiag_to_ioda/combine_obsspace.py
+117 −0 ush/pyiodaconv/def_jedi_utils.py
30 changes: 13 additions & 17 deletions ush/snow/ghcn_snod2ioda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@
("dateTime", "long"),
]

AttrData = {
}

DimDict = {
}

VarDims = {
'totalSnowDepth': ['Location'],
}
Expand All @@ -49,7 +43,7 @@ def get_epoch_time(adatetime):
return time_offset


class ghcn(object):
class GHCNConverter(object):

def __init__(self, filename, fixfile, date, warn):
self.filename = filename
Expand All @@ -60,6 +54,8 @@ def __init__(self, filename, fixfile, date, warn):
self.metaDict = defaultdict(lambda: defaultdict(dict))
self.outdata = defaultdict(lambda: DefaultOrderedDict(OrderedDict))
self.varAttrs = defaultdict(lambda: DefaultOrderedDict(OrderedDict))
self.AttrData = {}
self.DimDict = {}
self._read()

def _read(self):
Expand Down Expand Up @@ -112,7 +108,7 @@ def _read(self):
df300 = pd.merge(df30, df10[['ID', 'LATITUDE', 'LONGITUDE', 'ELEVATION']], on='ID', how='left')

# if merge (left) cannot find ID in df10, will insert NaN
if (any(df300['LATITUDE'].isna())):
if any(df300['LATITUDE'].isna()):
if (self.warn):
print(f"\n WARNING: ignoring ghcn stations missing from station_list")
else:
Expand Down Expand Up @@ -154,7 +150,7 @@ def _read(self):
self.outdata[self.varDict[iodavar]['errKey']] = errs
self.outdata[self.varDict[iodavar]['qcKey']] = qflg

DimDict['Location'] = len(self.outdata[('dateTime', 'MetaData')])
self.DimDict['Location'] = len(self.outdata[('dateTime', 'MetaData')])


def main():
Expand Down Expand Up @@ -185,16 +181,16 @@ def main():
tic = record_time()

# Read in the GHCN snow depth data
snod = ghcn(args.input, args.fixfile, args.date, args.warn_on_missing_stn)
snod = GHCNConverter(args.input, args.fixfile, args.date, args.warn_on_missing_stn)

# report time
toc = record_time(tic=tic)
writer = iconv.IodaWriter(args.output, locationKeyList, snod.DimDict)

# setup the IODA writer
writer = iconv.IodaWriter(args.output, locationKeyList, DimDict)

# write all data out
writer.BuildIoda(snod.outdata, VarDims, snod.varAttrs, AttrData)
writer.BuildIoda(
snod.outdata,
VarDims,
snod.varAttrs,
snod.AttrData
)

# report time
toc = record_time(tic=tic)
Expand Down