Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions src/compo/mopitt_co_nc2ioda.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ def _read(self):
self.outdata[('datetime', 'MetaData')] = times[flg]
self.outdata[('latitude', 'MetaData')] = lats[flg]
self.outdata[('longitude', 'MetaData')] = lons[flg]
self.outdata[('apriori_term', 'MetaData')] = ap_tc[flg]
self.outdata[('apriori_term', 'RtrvlAncData')] = ap_tc[flg]
for k in range(nlevs):
varname_ak = ('averaging_kernel_level_'+str(k+1), 'MetaData')
varname_ak = ('averaging_kernel_level_'+str(k+1), 'RtrvlAncData')
self.outdata[varname_ak] = ak_tc_dimless[:, k][flg]
varname_pr = ('pressure_level_'+str(k+1), 'MetaData')
varname_pr = ('pressure_level_'+str(k+1), 'RtrvlAncData')
self.outdata[varname_pr] = hPa2Pa * pr_gd[:, k][flg]

self.outdata[self.varDict[iodavar]['valKey']] = xr_tc[flg]
Expand All @@ -176,13 +176,13 @@ def _read(self):
self.outdata[('latitude', 'MetaData')], lats[flg]))
self.outdata[('longitude', 'MetaData')] = np.concatenate((
self.outdata[('longitude', 'MetaData')], lons[flg]))
self.outdata[('apriori_term', 'MetaData')] = np.concatenate((
self.outdata[('apriori_term', 'MetaData')], ap_tc[flg]))
self.outdata[('apriori_term', 'RtrvlAncData')] = np.concatenate((
self.outdata[('apriori_term', 'RtrvlAncData')], ap_tc[flg]))
for k in range(nlevs):
varname_ak = ('averaging_kernel_level_'+str(k+1), 'MetaData')
varname_ak = ('averaging_kernel_level_'+str(k+1), 'RtrvlAncData')
self.outdata[varname_ak] = np.concatenate(
(self.outdata[varname_ak], ak_tc_dimless[:, k][flg]))
varname_pr = ('pressure_level_'+str(k+1), 'MetaData')
varname_pr = ('pressure_level_'+str(k+1), 'RtrvlAncData')
self.outdata[varname_pr] = np.concatenate(
(self.outdata[varname_pr], hPa2Pa * pr_gd[:, k][flg]))

Expand All @@ -199,7 +199,7 @@ def _read(self):

for k in range(nlevs):
varname = 'averaging_kernel_level_'+str(k+1)
vkey = (varname, 'MetaData')
vkey = (varname, 'RtrvlAncData')
self.varAttrs[vkey]['coordinates'] = 'longitude latitude'
self.varAttrs[vkey]['units'] = ''

Expand Down
34 changes: 14 additions & 20 deletions src/compo/tropomi_no2_nc2ioda.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,13 @@ def _read(self):
self.outdata[('latitude', 'MetaData')] = lats
self.outdata[('longitude', 'MetaData')] = lons
self.outdata[('quality_assurance_value', 'MetaData')] = qa_value
self.outdata[('troposphere_layer_index', 'MetaData')] = trop_layer
self.outdata[('air_mass_factor_total', 'MetaData')] = total_airmass
self.outdata[('air_mass_factor_troposphere', 'MetaData')] = trop_airmass
self.outdata[('tropospheric_averaging_kernel_precision', 'MetaData')] = kernel_err
self.outdata[('averaging_kernel_precision', 'MetaData')] = kernel_err_total
self.outdata[('troposphere_layer_index', 'RtrvlAncData')] = trop_layer
self.outdata[('air_mass_factor_total', 'RtrvlAncData')] = total_airmass
self.outdata[('air_mass_factor_troposphere', 'RtrvlAncData')] = trop_airmass
for k in range(nlevs):
varname_ak = ('averaging_kernel_level_'+str(k+1), 'MetaData')
varname_ak = ('averaging_kernel_level_'+str(k+1), 'RtrvlAncData')
self.outdata[varname_ak] = avg_kernel[..., k].ravel()
varname_pr = ('pressure_level_'+str(k+1), 'MetaData')
varname_pr = ('pressure_level_'+str(k+1), 'RtrvlAncData')
self.outdata[varname_pr] = ak[k] + bk[k]*ps[...].ravel()
else:
self.outdata[('datetime', 'MetaData')] = np.concatenate((
Expand All @@ -135,21 +133,17 @@ def _read(self):
self.outdata[('longitude', 'MetaData')], lons))
self.outdata[('quality_assurance_value', 'MetaData')] = np.concatenate((
self.outdata[('quality_assurance_value', 'MetaData')], qa_value))
self.outdata[('troposphere_layer_index', 'MetaData')] = np.concatenate((
self.outdata[('troposphere_layer_index', 'MetaData')], trop_layer))
self.outdata[('air_mass_factor_total', 'MetaData')] = np.concatenate((
self.outdata[('air_mass_factor_total', 'MetaData')], total_airmass))
self.outdata[('air_mass_factor_troposphere', 'MetaData')] = np.concatenate((
self.outdata[('air_mass_factor_troposphere', 'MetaData')], trop_airmass))
self.outdata[('tropospheric_averaging_kernel_precision', 'MetaData')] = np.concatenate((
self.outdata[('tropospheric_averaging_kernel_precision', 'MetaData')], kernel_err))
self.outdata[('averaging_kernel_precision', 'MetaData')] = np.concatenate((
self.outdata[('averaging_kernel_precision', 'MetaData')], kernel_err_total))
self.outdata[('troposphere_layer_index', 'RtrvlAncData')] = np.concatenate((
self.outdata[('troposphere_layer_index', 'RtrvlAncData')], trop_layer))
self.outdata[('air_mass_factor_total', 'RtrvlAncData')] = np.concatenate((
self.outdata[('air_mass_factor_total', 'RtrvlAncData')], total_airmass))
self.outdata[('air_mass_factor_troposphere', 'RtrvlAncData')] = np.concatenate((
self.outdata[('air_mass_factor_troposphere', 'RtrvlAncData')], trop_airmass))
for k in range(nlevs):
varname_ak = ('averaging_kernel_level_'+str(k+1), 'MetaData')
varname_ak = ('averaging_kernel_level_'+str(k+1), 'RtrvlAncData')
self.outdata[varname_ak] = np.concatenate(
(self.outdata[varname_ak], avg_kernel[..., k].ravel()))
varname_pr = ('pressure_level_'+str(k+1), 'MetaData')
varname_pr = ('pressure_level_'+str(k+1), 'RtrvlAncData')
self.outdata[varname_pr] = np.concatenate(
(self.outdata[varname_pr], ak[k] + bk[k]*ps[...].ravel()))
for ncvar, iodavar in obsvars.items():
Expand All @@ -176,7 +170,7 @@ def _read(self):

for k in range(nlevs):
varname = 'averaging_kernel_level_'+str(k+1)
vkey = (varname, 'MetaData')
vkey = (varname, 'RtrvlAncData')
self.varAttrs[vkey]['coordinates'] = 'longitude latitude'
self.varAttrs[vkey]['units'] = ''

Expand Down
4 changes: 2 additions & 2 deletions test/testoutput/mopitt_co.nc
Git LFS file not shown
4 changes: 2 additions & 2 deletions test/testoutput/tropomi_no2.nc
Git LFS file not shown