Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
4 changes: 2 additions & 2 deletions ci/build-and-test
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ HERE="$(cd "$(dirname "$0")" && pwd)"
THIS="$(basename "$0")"
NPROC=${NPROC:-$(nproc)}
WORKD="$(mktemp -d "${THIS}-XXXXXX" -t)"
GENERATOR=Unix\ Makefiles
if command -v ninja &>/dev/null; then GENERATOR=Ninja; fi
GENERATOR='Unix Makefiles'
# if command -v ninja &>/dev/null; then GENERATOR=Ninja; fi
BASE="${HERE%/*}"
TESTDIR="${BASE##*/}"
export OMPI_ALLOW_RUN_AS_ROOT=1
Expand Down
18 changes: 17 additions & 1 deletion src/opsinputs/GnssroStationIDMetOffice.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static ObsFunctionMaker<GnssroStationIDMetOffice>
GnssroStationIDMetOffice::GnssroStationIDMetOffice(const eckit::LocalConfiguration & conf)
: invars_() {
invars_ += Variable("MetaData/satelliteIdentifier");
invars_ += Variable("MetaData/qualityFlags");
}

// -----------------------------------------------------------------------------
Expand All @@ -55,6 +56,20 @@ void GnssroStationIDMetOffice::compute(const ObsFilterData & in,
std::vector<int> satid;
in.get(Variable("MetaData/satelliteIdentifier"), satid);

const int missing = util::missingValue<int>();
std::vector<int> qualityFlags;
in.get(Variable("MetaData/qualityFlags"), qualityFlags);
std::vector<int> isRising(nlocs, 2); // setting = 0, rising = 1, unknown = 2
for (size_t i = 0; i < nlocs; ++i) {
if (qualityFlags[i] == missing) {
isRising[i] = 2;
} else if ((qualityFlags[i] & (1 << 13)) != 0) {
isRising[i] = 1;
} else {
isRising[i] = 0;
}
}

// Get the record number of each profile
std::vector<size_t> recordNumbers = out.space().recidx_all_recnums();
oops::Log::debug() << "Unique record numbers" << std::endl;
Expand All @@ -69,7 +84,8 @@ void GnssroStationIDMetOffice::compute(const ObsFilterData & in,
for (size_t jobs : obsNumbers) {
out[0][jobs] = stringFormat(satid[jobs], 4) +
stringFormat(iProfile, 5) +
stringFormat(jobs, 7);
stringFormat(jobs, 6) +
stringFormat(isRising[jobs], 1);
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion test/generate_unittest_netcdfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,9 @@ def output_2d_simulated_var_to_netcdf(var_name, file_name, with_bias=False, with
var = f.createVariable('MetaData/satelliteIdentifier', 'i', ('Location',))
var[:] = [3, 3, 5, 720]

var = f.createVariable('MetaData/qualityFlags', 'i', ('Location',))
var[:] = [8192, 0, 0, 0]

# Create Variables
var = f.createVariable('ObsValue/' + var_name, 'f', ('Location', 'Channel'))
var[:, :] = [[1.1, 2.1, 3.1],
Expand Down Expand Up @@ -852,7 +855,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename):
'ObsValue/bendingAngle',
'ObsError/bendingAngle'],
[],
['MetaData/satelliteIdentifier'],
['MetaData/satelliteIdentifier',
'MetaData/qualityFlags'],
'testinput/varobs_globalnamelist_gnssro.nc4')

# Sonde
Expand Down
Binary file modified test/testinput/001_SurfaceCxField_Orog.nc4
Binary file not shown.
Binary file modified test/testinput/001_UpperAirCxField_theta.nc4
Binary file not shown.
Binary file modified test/testinput/001_VarField_pstar.nc4
Binary file not shown.
Binary file modified test/testinput/001_VarField_pstar_stationID_integer.nc4
Binary file not shown.
Binary file modified test/testinput/002_SurfaceCxField_pstar.nc4
Binary file not shown.
Binary file not shown.
Binary file modified test/testinput/002_UpperAirCxField_relative_humidity.nc4
Binary file not shown.
Binary file modified test/testinput/002_VarField_temperature_RadarZ.nc4
Binary file not shown.
Binary file modified test/testinput/002_VarField_temperature_Surface.nc4
Binary file not shown.
Binary file modified test/testinput/003_SurfaceCxField_t2.nc4
Binary file not shown.
Binary file modified test/testinput/003_UpperAirCxField_u.nc4
Binary file not shown.
Binary file modified test/testinput/003_VarField_rh_Sonde.nc4
Binary file not shown.
Binary file modified test/testinput/003_VarField_rh_Surface.nc4
Binary file not shown.
Binary file modified test/testinput/004_SurfaceCxField_rh2.nc4
Binary file not shown.
Binary file modified test/testinput/004_UpperAirCxField_v.nc4
Binary file not shown.
Binary file modified test/testinput/004_VarField_u_ScatwindChosen.nc4
Binary file not shown.
Binary file modified test/testinput/004_VarField_u_Sonde.nc4
Binary file not shown.
Binary file modified test/testinput/004_VarField_u_Surface.nc4
Binary file not shown.
Binary file modified test/testinput/005_SurfaceCxField_u10.nc4
Binary file not shown.
Binary file modified test/testinput/005_UpperAirCxField_q.nc4
Binary file not shown.
Binary file modified test/testinput/005_VarField_v_ScatwindChosen.nc4
Binary file not shown.
Binary file modified test/testinput/005_VarField_v_Sonde.nc4
Binary file not shown.
Binary file modified test/testinput/005_VarField_v_Surface.nc4
Binary file not shown.
Binary file modified test/testinput/006_SurfaceCxField_v10.nc4
Binary file not shown.
Binary file modified test/testinput/007_VarField_tcwv.nc4
Binary file not shown.
Binary file modified test/testinput/008_SurfaceCxField_visibility_1p5m.nc4
Binary file not shown.
Binary file modified test/testinput/008_VarField_WindSpeed.nc4
Binary file not shown.
Binary file modified test/testinput/009_VarField_horizontalVisibility.nc4
Binary file not shown.
Binary file modified test/testinput/010_VarField_britemp.nc4
Binary file not shown.
Binary file modified test/testinput/011_UpperAirCxField_P.nc4
Binary file not shown.
Binary file modified test/testinput/011_VarField_tskin.nc4
Binary file not shown.
Binary file modified test/testinput/012_VarField_gpstzdelay.nc4
Binary file not shown.
Binary file modified test/testinput/013_SurfaceCxField_TskinSea.nc4
Binary file not shown.
Binary file modified test/testinput/015_UpperAirCxField_cloud_layer.nc4
Binary file not shown.
Binary file modified test/testinput/015_VarField_cloud.nc4
Binary file not shown.
Binary file modified test/testinput/016_SurfaceCxField_pmsl.nc4
Binary file not shown.
Binary file modified test/testinput/017_SurfaceCxField_SeaIce.nc4
Binary file not shown.
Binary file modified test/testinput/017_VarField_mwemiss.nc4
Binary file not shown.
Binary file modified test/testinput/018_VarField_tcozone.nc4
Binary file not shown.
Binary file modified test/testinput/019_VarField_satzenith.nc4
Binary file not shown.
Binary file modified test/testinput/021_VarField_surface.nc4
Binary file not shown.
Binary file modified test/testinput/022_SurfaceCxField_surf_param_a.nc4
Binary file not shown.
Binary file modified test/testinput/023_SurfaceCxField_surf_param_b.nc4
Binary file not shown.
Binary file modified test/testinput/023_VarField_modelsurface_geoval.nc4
Binary file not shown.
Binary file modified test/testinput/024_SurfaceCxField_CloudAmount.nc4
Binary file not shown.
Binary file modified test/testinput/028_VarField_satid.nc4
Binary file not shown.
Binary file modified test/testinput/029_UpperAirCxField_qcf.nc4
Binary file not shown.
Binary file modified test/testinput/030_UpperAirCxField_qcl.nc4
Binary file not shown.
Binary file modified test/testinput/031_UpperAirCxField_cloud_bulk.nc4
Binary file not shown.
Binary file modified test/testinput/031_VarField_solzenith.nc4
Binary file not shown.
Binary file modified test/testinput/033_UpperAirCxField_p_bar.nc4
Binary file not shown.
Binary file modified test/testinput/034_UpperAirCxField_Cf.nc4
Binary file not shown.
Binary file modified test/testinput/034_VarField_iremiss.nc4
Binary file not shown.
Binary file modified test/testinput/035_UpperAirCxField_Cl.nc4
Binary file not shown.
Binary file modified test/testinput/035_VarField_cloudtopp.nc4
Binary file not shown.
Binary file modified test/testinput/036_VarField_cloudfrac.nc4
Binary file not shown.
Binary file modified test/testinput/039_UpperAirCxField_Exner.nc4
Binary file not shown.
Binary file modified test/testinput/040_UpperAirCxField_Qrain.nc4
Binary file not shown.
Binary file modified test/testinput/041-046_UpperAirCxField_dust1-dust6.nc4
Binary file not shown.
Binary file modified test/testinput/051_VarField_u10ambwind.nc4
Binary file not shown.
Binary file modified test/testinput/052_VarField_v10ambwind.nc4
Binary file not shown.
Binary file modified test/testinput/053_VarField_awpriorpcorrect.nc4
Binary file not shown.
Binary file modified test/testinput/056_SurfaceCxField_obukhov_length.nc4
Binary file not shown.
Binary file not shown.
Binary file modified test/testinput/057_VarField_emissivity.nc4
Binary file not shown.
Binary file modified test/testinput/063_VarField_radialVelocity.nc4
Binary file not shown.
Binary file modified test/testinput/067_VarField_GPS_Station_Height.nc4
Binary file not shown.
Binary file modified test/testinput/068_VarField_clw.nc4
Binary file not shown.
Binary file modified test/testinput/070_VarField_reflectivity.nc4
Binary file not shown.
Binary file modified test/testinput/071_VarField_bendingangle.nc4
Binary file not shown.
6 changes: 3 additions & 3 deletions test/testinput/071_VarField_bendingangle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ observations:
time: ["-3540.00000", "-3540.00000",
"-3480.00000", "-3480.00000",
"-3360.00000", "-3360.00000"]
Callsign: ["0003000000000000", "0003000000000000",
"0003000010000001", "0003000010000001",
"0720000030000003", "0720000030000003"]
Callsign: ["0003000000000001", "0003000000000001",
"0003000010000010", "0003000010000010",
"0720000030000030", "0720000030000030"]
HofX: ObsValue # just a placeholder -- not used, but needed to force calls to postFilter.
benchmarkFlag: 1000 # just to keep the ObsFilters test happy
flaggedBenchmark: 0
Binary file modified test/testinput/072_VarField_impactparam.nc4
Binary file not shown.
Binary file modified test/testinput/073_VarField_ro_rad_curv.nc4
Binary file not shown.
Binary file modified test/testinput/074_VarField_ro_geoid_und.nc4
Binary file not shown.
Binary file modified test/testinput/076_VarField_britempvarerror.nc4
Binary file not shown.
Binary file modified test/testinput/077_VarField_aod.nc4
Binary file not shown.
Binary file modified test/testinput/078_VarField_theta.nc4
Binary file not shown.
Binary file modified test/testinput/080_VarField_biaspredictors.nc4
Binary file not shown.
Binary file modified test/testinput/CxWriter_UnRotateWinds.nc4
Binary file not shown.
Binary file modified test/testinput/CxWriter_UnRotateWinds10M.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_abiclr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_ahiclr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_aircraft.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_amsr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_atms.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_atovs.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_epsmws.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_fciclr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_gmihigh.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_gmilow.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_gnssro.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_groundgps.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_iasi.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_mtgirs.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_mwsfy3.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_oceanwinds.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_sattcwv.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_scatwind.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_screen.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_seviriclr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_sonde.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_ssmis.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_sternamwr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_globalnamelist_surface.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_fciasr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_fciclr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_radar_reflectivity.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_seviriasr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_seviriclr.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_sonde.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_surface.nc4
Binary file not shown.
Binary file modified test/testinput/cx_ukvnamelist_surfacecloud.nc4
Binary file not shown.
Binary file modified test/testinput/dummy.nc4
Binary file not shown.
Binary file modified test/testinput/reject_obs_with_all_variables_failing_qc.nc4
Binary file not shown.
Binary file not shown.
Binary file modified test/testinput/relative_humidity_Sonde.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_abiclr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_ahiclr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_aircraft.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_atms.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_atovs.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_epsmws.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_fciclr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_gnssro.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_iasi.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_mtgirs.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_scatwind.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_seviriclr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_sonde.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_globalnamelist_sternamwr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_ukvnamelist_fciasr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_ukvnamelist_fciclr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_ukvnamelist_radar_doppler_wind.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_ukvnamelist_radar_reflectivity.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_ukvnamelist_seviriasr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_ukvnamelist_seviriclr.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_ukvnamelist_sonde.nc4
Binary file not shown.
Binary file modified test/testinput/varobs_ukvnamelist_surfacecloud.nc4
Binary file not shown.
Loading