From a116f581a588e46844d68da6143bb19557207d0a Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Wed, 17 Jun 2026 10:50:09 +0100 Subject: [PATCH 1/5] Update the code now that model data is in rh fraction units --- src/opsinputs/opsinputs_cxwriter_mod.F90 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/opsinputs/opsinputs_cxwriter_mod.F90 b/src/opsinputs/opsinputs_cxwriter_mod.F90 index ea20f16c..0883b677 100644 --- a/src/opsinputs/opsinputs_cxwriter_mod.F90 +++ b/src/opsinputs/opsinputs_cxwriter_mod.F90 @@ -930,6 +930,12 @@ subroutine opsinputs_cxwriter_populatecx(self, ReportFlags, Cx) call opsinputs_fill_fillrealfromgeoval( & Cx % Header % rh2, "rh2", Cx % Header % NumLocal, Cx % rh2, & self % GeoVals, opsinputs_cxfields_rh2, self % JediToOpsLayoutMapping) + if (associated(Cx % rh2)) then + where (Cx % rh2 /= RMDI) + Cx % rh2 = Cx % rh2 * 100.0_real64 + end where + end if + end if case (StashCode_u10, StashCode_U10_B_grid) ! IndexCxu10 call opsinputs_fill_fillrealfromgeoval( & Cx % Header % u10, "u10", Cx % Header % NumLocal, Cx % u10, & @@ -1110,6 +1116,11 @@ subroutine opsinputs_cxwriter_populatecx(self, ReportFlags, Cx) self % GeoVaLs, self % GeoVaLsAreTopToBottom, opsinputs_cxfields_rh, & self % JediToOpsLayoutMapping, self % hofx, self % varnames, & "relativeHumidity", self % WriteHofXIntoCX) + if (associated(Cx % rh)) then + where (Cx % rh /= RMDI) + Cx % rh = Cx % rh * 100.0_real64 + end where + end if case (StashItem_u, StashCode_u_p_B_grid) ! IndexCxu call opsinputs_fill_fillreal2dfromgeovalorhofx( & Cx % Header % u, "u", Cx % u, & From ce2dba2c61591234dfc2e4a01c64d6fcb4b54d60 Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Wed, 17 Jun 2026 13:53:15 +0100 Subject: [PATCH 2/5] Update so that fraction to percentage of rh is converted on cx write --- src/opsinputs/opsinputs_cxwriter_mod.F90 | 3 ++- test/testinput/002_UpperAirCxField_rh_AMSUB.yaml | 6 +++--- test/testinput/002_UpperAirCxField_rh_Sonde.yaml | 8 ++++---- test/testinput/004_SurfaceCxField_rh2.yaml | 4 ++-- test/testinput/cxwriter_globalnamelist_abiclr.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_ahiclr.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_amsr.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_atms.yaml | 4 ++-- test/testinput/cxwriter_globalnamelist_atovs.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_epsmws.yaml | 4 ++-- test/testinput/cxwriter_globalnamelist_fciclr.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_gmihigh.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_gmilow.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_gnssro.yaml | 4 ++-- test/testinput/cxwriter_globalnamelist_groundgps.yaml | 4 ++-- test/testinput/cxwriter_globalnamelist_hiras2.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_iasi.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_mtgirs.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_mwsfy3.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_mwsfy3e.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_screen.yaml | 4 ++-- test/testinput/cxwriter_globalnamelist_seviriclr.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_ssmis.yaml | 6 +++--- test/testinput/cxwriter_globalnamelist_sternamwr.yaml | 4 ++-- test/testinput/cxwriter_globalnamelist_surface.yaml | 4 ++-- 25 files changed, 67 insertions(+), 66 deletions(-) diff --git a/src/opsinputs/opsinputs_cxwriter_mod.F90 b/src/opsinputs/opsinputs_cxwriter_mod.F90 index 0883b677..bad84fe2 100644 --- a/src/opsinputs/opsinputs_cxwriter_mod.F90 +++ b/src/opsinputs/opsinputs_cxwriter_mod.F90 @@ -930,12 +930,12 @@ subroutine opsinputs_cxwriter_populatecx(self, ReportFlags, Cx) call opsinputs_fill_fillrealfromgeoval( & Cx % Header % rh2, "rh2", Cx % Header % NumLocal, Cx % rh2, & self % GeoVals, opsinputs_cxfields_rh2, self % JediToOpsLayoutMapping) + ! RH now comes from the model interface as a fraction, but OPS expects it as a percentage, so convert here. if (associated(Cx % rh2)) then where (Cx % rh2 /= RMDI) Cx % rh2 = Cx % rh2 * 100.0_real64 end where end if - end if case (StashCode_u10, StashCode_U10_B_grid) ! IndexCxu10 call opsinputs_fill_fillrealfromgeoval( & Cx % Header % u10, "u10", Cx % Header % NumLocal, Cx % u10, & @@ -1116,6 +1116,7 @@ subroutine opsinputs_cxwriter_populatecx(self, ReportFlags, Cx) self % GeoVaLs, self % GeoVaLsAreTopToBottom, opsinputs_cxfields_rh, & self % JediToOpsLayoutMapping, self % hofx, self % varnames, & "relativeHumidity", self % WriteHofXIntoCX) + ! RH now comes from the model interface as a fraction, but OPS expects it as a percentage, so convert here. if (associated(Cx % rh)) then where (Cx % rh /= RMDI) Cx % rh = Cx % rh * 100.0_real64 diff --git a/test/testinput/002_UpperAirCxField_rh_AMSUB.yaml b/test/testinput/002_UpperAirCxField_rh_AMSUB.yaml index d94c3d13..1e6f9920 100644 --- a/test/testinput/002_UpperAirCxField_rh_AMSUB.yaml +++ b/test/testinput/002_UpperAirCxField_rh_AMSUB.yaml @@ -33,9 +33,9 @@ observations: expected_upper_air_variables: ["2"] # IndexCxrh expected_main_table_columns: - # batch 1 - - ["1.10", "1.20", "1.30"] # column 1 - - ["2.10", "**********", "2.30"] # column 2 (the asterisks represent a missing float) - - ["4.10", "4.20", "4.30"] # column 3 + - ["110.00", "120.00", "130.00"] # column 1 + - ["210.00", "**********", "230.00"] # column 2 (the asterisks represent a missing float) + - ["410.00", "420.00", "430.00"] # column 3 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 diff --git a/test/testinput/002_UpperAirCxField_rh_Sonde.yaml b/test/testinput/002_UpperAirCxField_rh_Sonde.yaml index 607f84e6..8813bdda 100644 --- a/test/testinput/002_UpperAirCxField_rh_Sonde.yaml +++ b/test/testinput/002_UpperAirCxField_rh_Sonde.yaml @@ -43,8 +43,8 @@ observations: expected_upper_air_variables: ["2"] # IndexCxrh expected_main_table_columns: - # batch 1 - - ["1.30", "1.20", "1.10"] # column 1 - - ["5.30", "5.20", "5.10"] # column 2 + - ["130.00", "120.00", "110.00"] # column 1 + - ["530.00", "520.00", "510.00"] # column 2 HofX: HofX benchmarkFlag: 1000 # just to keep the ObsFilters test happy flaggedBenchmark: 0 @@ -92,8 +92,8 @@ observations: expected_upper_air_variables: ["2"] # IndexCxrh expected_main_table_columns: - # batch 1 - - ["1.25", "1.35", "1.45"] # column 1 - - ["1.55", "1.65", "1.75"] # column 2 + - ["125.00", "135.00", "145.00"] # column 1 + - ["155.00", "165.00", "175.00"] # column 2 HofX: HofX benchmarkFlag: 1000 # just to keep the ObsFilters test happy flaggedBenchmark: 0 diff --git a/test/testinput/004_SurfaceCxField_rh2.yaml b/test/testinput/004_SurfaceCxField_rh2.yaml index fdce454e..b7fd03ed 100644 --- a/test/testinput/004_SurfaceCxField_rh2.yaml +++ b/test/testinput/004_SurfaceCxField_rh2.yaml @@ -33,9 +33,9 @@ observations: expected_upper_air_variables: [] expected_main_table_columns: - # batch 1 - - ["7.10"] # column 1 + - ["710.00"] # column 1 - ["**********"] # column 2 (the asterisks represent a missing float) - - ["7.40"] # column 3 + - ["740.00"] # column 3 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 diff --git a/test/testinput/cxwriter_globalnamelist_abiclr.yaml b/test/testinput/cxwriter_globalnamelist_abiclr.yaml index 8c84080d..a7c43d45 100644 --- a/test/testinput/cxwriter_globalnamelist_abiclr.yaml +++ b/test/testinput/cxwriter_globalnamelist_abiclr.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10", "51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10", "51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_ahiclr.yaml b/test/testinput/cxwriter_globalnamelist_ahiclr.yaml index 975266f1..568ea421 100644 --- a/test/testinput/cxwriter_globalnamelist_ahiclr.yaml +++ b/test/testinput/cxwriter_globalnamelist_ahiclr.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10", "51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10", "51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_amsr.yaml b/test/testinput/cxwriter_globalnamelist_amsr.yaml index 23becbc9..a8177792 100644 --- a/test/testinput/cxwriter_globalnamelist_amsr.yaml +++ b/test/testinput/cxwriter_globalnamelist_amsr.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_atms.yaml b/test/testinput/cxwriter_globalnamelist_atms.yaml index 1f6e28ba..cd36b3d1 100644 --- a/test/testinput/cxwriter_globalnamelist_atms.yaml +++ b/test/testinput/cxwriter_globalnamelist_atms.yaml @@ -34,9 +34,9 @@ observations: expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_atovs.yaml b/test/testinput/cxwriter_globalnamelist_atovs.yaml index b84d6d84..a43f9ed6 100644 --- a/test/testinput/cxwriter_globalnamelist_atovs.yaml +++ b/test/testinput/cxwriter_globalnamelist_atovs.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_epsmws.yaml b/test/testinput/cxwriter_globalnamelist_epsmws.yaml index a321e837..8a14e8e9 100644 --- a/test/testinput/cxwriter_globalnamelist_epsmws.yaml +++ b/test/testinput/cxwriter_globalnamelist_epsmws.yaml @@ -34,9 +34,9 @@ observations: expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_fciclr.yaml b/test/testinput/cxwriter_globalnamelist_fciclr.yaml index 91f774f2..9287e740 100644 --- a/test/testinput/cxwriter_globalnamelist_fciclr.yaml +++ b/test/testinput/cxwriter_globalnamelist_fciclr.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_gmihigh.yaml b/test/testinput/cxwriter_globalnamelist_gmihigh.yaml index 1b2ed972..6344d7a9 100644 --- a/test/testinput/cxwriter_globalnamelist_gmihigh.yaml +++ b/test/testinput/cxwriter_globalnamelist_gmihigh.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_gmilow.yaml b/test/testinput/cxwriter_globalnamelist_gmilow.yaml index 47fb18bd..b20f680e 100644 --- a/test/testinput/cxwriter_globalnamelist_gmilow.yaml +++ b/test/testinput/cxwriter_globalnamelist_gmilow.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_gnssro.yaml b/test/testinput/cxwriter_globalnamelist_gnssro.yaml index 3aa7aa5c..81447b92 100644 --- a/test/testinput/cxwriter_globalnamelist_gnssro.yaml +++ b/test/testinput/cxwriter_globalnamelist_gnssro.yaml @@ -34,9 +34,9 @@ observations: expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_groundgps.yaml b/test/testinput/cxwriter_globalnamelist_groundgps.yaml index 9c080170..1959ce74 100644 --- a/test/testinput/cxwriter_globalnamelist_groundgps.yaml +++ b/test/testinput/cxwriter_globalnamelist_groundgps.yaml @@ -34,9 +34,9 @@ observations: expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_hiras2.yaml b/test/testinput/cxwriter_globalnamelist_hiras2.yaml index e3e487b4..b85832cd 100644 --- a/test/testinput/cxwriter_globalnamelist_hiras2.yaml +++ b/test/testinput/cxwriter_globalnamelist_hiras2.yaml @@ -50,9 +50,9 @@ observations: expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column 3 - 3rd observation - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 4 - 4th observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column 3 - 3rd observation + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 4 - 4th observation 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 diff --git a/test/testinput/cxwriter_globalnamelist_iasi.yaml b/test/testinput/cxwriter_globalnamelist_iasi.yaml index 8836923f..811773ca 100644 --- a/test/testinput/cxwriter_globalnamelist_iasi.yaml +++ b/test/testinput/cxwriter_globalnamelist_iasi.yaml @@ -50,9 +50,9 @@ observations: expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column 3 - 3rd observation - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 4 - 4th observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column 3 - 3rd observation + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 4 - 4th observation 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 diff --git a/test/testinput/cxwriter_globalnamelist_mtgirs.yaml b/test/testinput/cxwriter_globalnamelist_mtgirs.yaml index b45be73c..5d572c93 100644 --- a/test/testinput/cxwriter_globalnamelist_mtgirs.yaml +++ b/test/testinput/cxwriter_globalnamelist_mtgirs.yaml @@ -50,9 +50,9 @@ observations: expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column 3 - 3rd observation - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 4 - 4th observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column 3 - 3rd observation + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 4 - 4th observation 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 diff --git a/test/testinput/cxwriter_globalnamelist_mwsfy3.yaml b/test/testinput/cxwriter_globalnamelist_mwsfy3.yaml index 19274157..924dfa18 100644 --- a/test/testinput/cxwriter_globalnamelist_mwsfy3.yaml +++ b/test/testinput/cxwriter_globalnamelist_mwsfy3.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_mwsfy3e.yaml b/test/testinput/cxwriter_globalnamelist_mwsfy3e.yaml index b5eb0090..8e0ad632 100644 --- a/test/testinput/cxwriter_globalnamelist_mwsfy3e.yaml +++ b/test/testinput/cxwriter_globalnamelist_mwsfy3e.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_screen.yaml b/test/testinput/cxwriter_globalnamelist_screen.yaml index 2eefa400..32a627d4 100644 --- a/test/testinput/cxwriter_globalnamelist_screen.yaml +++ b/test/testinput/cxwriter_globalnamelist_screen.yaml @@ -33,7 +33,7 @@ observations: expected_upper_air_variables: ["1", "3", "4", "5", "11", "30"] expected_main_table_columns: - # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["7.10","37.10","67.10","77.10","47.10","57.10", + - ["7.10","37.10","67.10","7710.00","47.10","57.10", "87.10","17.10","107.10","27.10","117.10","127.10", "97.10","1.10","1.20","1.30","11.10","11.20","11.30", "21.10","21.20","21.30","31.10","31.20","31.30", @@ -42,7 +42,7 @@ observations: "**********","**********","**********","**********","**********","**********","2.10","**********", "2.30","12.10","**********","12.30","22.10","**********","22.30","32.10","**********","32.30", "42.10","**********","42.30","52.10","**********","52.30"] # column 2 - 2nd observation - - ["7.40","37.40","67.40","77.40","47.40","57.40","87.40", + - ["7.40","37.40","67.40","7740.00","47.40","57.40","87.40", "17.40","107.40","27.40","117.40","127.40","97.40","4.10", "4.20","4.30","14.10","14.20","14.30","24.10","24.20", "24.30","34.10","34.20","34.30","44.10","44.20","44.30", diff --git a/test/testinput/cxwriter_globalnamelist_seviriclr.yaml b/test/testinput/cxwriter_globalnamelist_seviriclr.yaml index 62d1ec78..569f16cc 100644 --- a/test/testinput/cxwriter_globalnamelist_seviriclr.yaml +++ b/test/testinput/cxwriter_globalnamelist_seviriclr.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_ssmis.yaml b/test/testinput/cxwriter_globalnamelist_ssmis.yaml index 1fe7b951..35d051a0 100644 --- a/test/testinput/cxwriter_globalnamelist_ssmis.yaml +++ b/test/testinput/cxwriter_globalnamelist_ssmis.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_sternamwr.yaml b/test/testinput/cxwriter_globalnamelist_sternamwr.yaml index 246ac028..9c0ff7a3 100644 --- a/test/testinput/cxwriter_globalnamelist_sternamwr.yaml +++ b/test/testinput/cxwriter_globalnamelist_sternamwr.yaml @@ -34,9 +34,9 @@ observations: expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column 3 - observation 4 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 diff --git a/test/testinput/cxwriter_globalnamelist_surface.yaml b/test/testinput/cxwriter_globalnamelist_surface.yaml index 1d5eab04..ce87ff5d 100644 --- a/test/testinput/cxwriter_globalnamelist_surface.yaml +++ b/test/testinput/cxwriter_globalnamelist_surface.yaml @@ -33,7 +33,7 @@ observations: expected_upper_air_variables: ["1","3","4","5","11","29","30","31","34","35"] expected_main_table_columns: - # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["17.10","27.10","57.10","67.10","37.10","47.10", + - ["17.10","27.10","57.10","6710.00","37.10","47.10", "7.10","1.10","1.20","1.30","81.10","81.20","81.30", "91.10","91.20","91.30","11.10","11.20","11.30", "41.10","41.20","41.30","21.10","21.20","21.30", @@ -44,7 +44,7 @@ observations: "**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********", "32.30","52.10","**********","52.30","72.10","**********", "72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["17.40","27.40","57.40","67.40","37.40","47.40", + - ["17.40","27.40","57.40","6740.00","37.40","47.40", "7.40","4.10","4.20","4.30","84.10","84.20","84.30", "94.10","94.20","94.30","14.10","14.20","14.30", "44.10","44.20","44.30","24.10","24.20","24.30", From b6e1951c4e127b95ea7f7b206c6044951604b3a1 Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Wed, 17 Jun 2026 13:59:50 +0100 Subject: [PATCH 3/5] Fix ukv test reference --- test/testinput/cxwriter_ukvnamelist_seviriasr.yaml | 6 +++--- test/testinput/cxwriter_ukvnamelist_seviriclr.yaml | 6 +++--- test/testinput/cxwriter_ukvnamelist_surface.yaml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/testinput/cxwriter_ukvnamelist_seviriasr.yaml b/test/testinput/cxwriter_ukvnamelist_seviriasr.yaml index b57b9322..cfbe13d7 100644 --- a/test/testinput/cxwriter_ukvnamelist_seviriasr.yaml +++ b/test/testinput/cxwriter_ukvnamelist_seviriasr.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_ukvnamelist_seviriclr.yaml b/test/testinput/cxwriter_ukvnamelist_seviriclr.yaml index 35fa9dca..e2a23399 100644 --- a/test/testinput/cxwriter_ukvnamelist_seviriclr.yaml +++ b/test/testinput/cxwriter_ukvnamelist_seviriclr.yaml @@ -27,10 +27,10 @@ observations: expected_upper_air_variables: ["1","5","11","29","30","31","34","35"] expected_main_table_columns: - # batch 1 - 9 1dvalues first ; then 2d values in expected order - - ["27.10","37.10","67.10","77.10","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation + - ["27.10","37.10","67.10","7710.00","47.10","57.10","7.10","87.10","17.10","1.10","1.20","1.30","11.10","11.20","11.30","41.10","41.20","41.30","21.10","21.20","21.30","31.10","31.20","31.30","51.10","51.20","51.30","71.10","71.20","71.30","61.10","61.20","61.30"] # column 1 - 1st observation - ["**********","**********","**********","**********","**********","**********","**********","**********","**********","2.10","**********","2.30","12.10","**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********","32.30","52.10","**********","52.30","72.10","**********","72.30","62.10","**********","62.30"] # column 2 - 2nd observation - - ["27.30","37.30","67.30","77.30","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 - - ["27.40","37.40","67.40","77.40","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 + - ["27.30","37.30","67.30","7730.00","47.30","57.30","7.30","87.30","17.30","3.10","3.20","3.30","13.10","13.20","13.30","43.10","43.20","43.30","23.10","23.20","23.30","33.10","33.20","33.30","53.10","53.20","53.30","73.10","73.20","73.30","63.10","63.20","63.30"] # column3 - observation 3 + - ["27.40","37.40","67.40","7740.00","47.40","57.40","7.40","87.40","17.40","4.10","4.20","4.30","14.10","14.20","14.30","44.10","44.20","44.30","24.10","24.20","24.30","34.10","34.20","34.30","54.10","54.20","54.30","74.10","74.20","74.30","64.10","64.20","64.30"] # column4 - observation 4 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 diff --git a/test/testinput/cxwriter_ukvnamelist_surface.yaml b/test/testinput/cxwriter_ukvnamelist_surface.yaml index 68bea462..c821a39b 100644 --- a/test/testinput/cxwriter_ukvnamelist_surface.yaml +++ b/test/testinput/cxwriter_ukvnamelist_surface.yaml @@ -33,7 +33,7 @@ observations: expected_upper_air_variables: ["1","3","4","5","11","29","30"] expected_main_table_columns: - # observation 3 is rejected by the tests above hence only 3 (1,2,4) columns - - ["17.10","27.10","57.10","67.10","37.10","47.10","77.10", + - ["17.10","27.10","57.10","6710.00","37.10","47.10","77.10", "7.10","87.10","101.10","1.10","1.20","1.30","81.10","81.20","81.30", "91.10","91.20","91.30","11.10","11.20","11.30", "41.10","41.20","41.30","21.10","21.20","21.30", @@ -42,7 +42,7 @@ observations: "**********","102.10","2.10","**********","2.30","82.10","**********","82.30","92.10","**********","92.30","12.10", "**********","12.30","42.10","**********","42.30","22.10","**********","22.30","32.10","**********", "32.30"] # column 2 - 2nd observation - - ["17.40","27.40","57.40","67.40","37.40","47.40","77.40", + - ["17.40","27.40","57.40","6740.00","37.40","47.40","77.40", "7.40","87.40","104.10","4.10","4.20","4.30","84.10","84.20","84.30", "94.10","94.20","94.30","14.10","14.20","14.30", "44.10","44.20","44.30","24.10","24.20","24.30", From bfcf0c2f87be9afe6e40a89b0ad8a637b82ee990 Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Thu, 18 Jun 2026 09:35:01 +0100 Subject: [PATCH 4/5] Updated as suggested by reviewer --- src/opsinputs/opsinputs_cxwriter_mod.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opsinputs/opsinputs_cxwriter_mod.F90 b/src/opsinputs/opsinputs_cxwriter_mod.F90 index bad84fe2..7bf293d1 100644 --- a/src/opsinputs/opsinputs_cxwriter_mod.F90 +++ b/src/opsinputs/opsinputs_cxwriter_mod.F90 @@ -933,7 +933,7 @@ subroutine opsinputs_cxwriter_populatecx(self, ReportFlags, Cx) ! RH now comes from the model interface as a fraction, but OPS expects it as a percentage, so convert here. if (associated(Cx % rh2)) then where (Cx % rh2 /= RMDI) - Cx % rh2 = Cx % rh2 * 100.0_real64 + Cx % rh2 = Cx % rh2 * 100.0 end where end if case (StashCode_u10, StashCode_U10_B_grid) ! IndexCxu10 @@ -1119,7 +1119,7 @@ subroutine opsinputs_cxwriter_populatecx(self, ReportFlags, Cx) ! RH now comes from the model interface as a fraction, but OPS expects it as a percentage, so convert here. if (associated(Cx % rh)) then where (Cx % rh /= RMDI) - Cx % rh = Cx % rh * 100.0_real64 + Cx % rh = Cx % rh * 100.0 end where end if case (StashItem_u, StashCode_u_p_B_grid) ! IndexCxu From 8d64ae9ad8ae4e1d5a46f6b54c197144c060e368 Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Fri, 19 Jun 2026 21:18:35 +0100 Subject: [PATCH 5/5] Make the 100 factor double precision to try and deal with cx comparison differences --- src/opsinputs/opsinputs_cxwriter_mod.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opsinputs/opsinputs_cxwriter_mod.F90 b/src/opsinputs/opsinputs_cxwriter_mod.F90 index 7bf293d1..bad84fe2 100644 --- a/src/opsinputs/opsinputs_cxwriter_mod.F90 +++ b/src/opsinputs/opsinputs_cxwriter_mod.F90 @@ -933,7 +933,7 @@ subroutine opsinputs_cxwriter_populatecx(self, ReportFlags, Cx) ! RH now comes from the model interface as a fraction, but OPS expects it as a percentage, so convert here. if (associated(Cx % rh2)) then where (Cx % rh2 /= RMDI) - Cx % rh2 = Cx % rh2 * 100.0 + Cx % rh2 = Cx % rh2 * 100.0_real64 end where end if case (StashCode_u10, StashCode_U10_B_grid) ! IndexCxu10 @@ -1119,7 +1119,7 @@ subroutine opsinputs_cxwriter_populatecx(self, ReportFlags, Cx) ! RH now comes from the model interface as a fraction, but OPS expects it as a percentage, so convert here. if (associated(Cx % rh)) then where (Cx % rh /= RMDI) - Cx % rh = Cx % rh * 100.0 + Cx % rh = Cx % rh * 100.0_real64 end where end if case (StashItem_u, StashCode_u_p_B_grid) ! IndexCxu