new b2i framework; 14 tests

test/marine/CMakeLists.txt

@@ -122,15 +122,18 @@ function(ADD_INSITU_TEST testname testbufr)
 	# set(CONFIG_TYPE "json")
 	set(CONFIG_TYPE "yaml")
 
-	if (testbufr STREQUAL "dbuoy")
-		set(DATE "2019010700")
-		set(CYCLE "00")
-	else()
-		set(DATE "2021063006")
-		set(CYCLE "06")
-	endif()
-
-	set(TEST "bufr2ioda_insitu_${testname}")
+	set(DATE "2019010700")
+	set(CYCLE "00")
+	# if (testbufr STREQUAL "dbuoy")
+		# set(DATE "2019010700")
+		# set(CYCLE "00")
+	# else()
+		# set(DATE "2021063006")
+		# set(CYCLE "06")
+	# endif()
+
+	set(TESTEXEC "bufr2ioda_insitu_${testname}.py")
+	set(TEST "bufr2ioda_insitu_${testname}_${testbufr}")
 
 	set(TESTREF_FILE "${TEST}_${DATE}.ref")
 
@@ -159,7 +162,7 @@ function(ADD_INSITU_TEST testname testbufr)
 
 	add_test(
 		NAME test_gdasapp_${TEST}
-		COMMAND ${MARINE_BUFR2IODA_DIR}/${TEST}.py -c ${CONFIG_FILE} -t ${TESTREF_DIR}/${TESTREF_FILE}
+		COMMAND ${MARINE_BUFR2IODA_DIR}/${TESTEXEC} -c ${CONFIG_FILE} -t ${TESTREF_DIR}/${TESTREF_FILE}
 		WORKING_DIRECTORY ${TEST_WORKING_DIR}
 	)
 	set_property(
@@ -176,13 +179,14 @@ if (GENERATE_BUFR2IODA_TESTS)
 	ADD_INSITU_TEST("profile_bathy" "bathy")
 	ADD_INSITU_TEST("profile_glider" "subpfl")
 	ADD_INSITU_TEST("profile_tesac" "tesac")
-	ADD_INSITU_TEST("profile_tropicald" "dbuoy")
-	ADD_INSITU_TEST("profile_tropicalmb" "mbuoyb")
+	ADD_INSITU_TEST("profile_tropical" "dbuoy")
+	ADD_INSITU_TEST("profile_tropical" "mbuoyb")
 	ADD_INSITU_TEST("profile_xbtctd" "xbtctd")
-    # ADD_INSITU_TEST("surface_altkob" "altkob")
-    # ADD_INSITU_TEST("surface_cstgd" "cstgd")
+    ADD_INSITU_TEST("surface_altkob" "altkob")
+    ADD_INSITU_TEST("surface_cstgd" "cstgd")
 	ADD_INSITU_TEST("surface_drifter" "dbuoy")
-	# ADD_INSITU_TEST("surface_drifterb" "dbuoyb")
-    # ADD_INSITU_TEST("surface_shipsu" "shipsu")
+	ADD_INSITU_TEST("surface_drifter" "dbuoyb")
+	ADD_INSITU_TEST("surface_lcman" "lcman")
+    ADD_INSITU_TEST("surface_shipsu" "shipsu")
 	ADD_INSITU_TEST("surface_trkob" "trkob")
 endif()

test/marine/testinput/bufr2ioda_insitu_profile_argo_2021063006.yaml.in → test/marine/testinput/bufr2ioda_insitu_profile_argo_subpfl_2019010700.yaml.in

@@ -3,7 +3,7 @@ data_format: subpfl
 source: NCEP data tank
 data_type: argo
 cycle_type: gdas
-cycle_datetime: '2021063006'
+cycle_datetime: '2019010700'
 dump_directory: __BUFRINPUTDIR__
 ioda_directory: __IODAOUTPUTDIR__
 ocean_basin: __OCEANBASIN__

test/marine/testinput/bufr2ioda_insitu_profile_bathy_2021063006.yaml.in → test/marine/testinput/bufr2ioda_insitu_profile_bathy_bathy_2019010700.yaml.in

@@ -3,7 +3,7 @@ data_format: bathy
 source: NCEP data tank
 data_type: bathy
 cycle_type: gdas
-cycle_datetime: '2021063006'
+cycle_datetime: '2019010700'
 dump_directory: __BUFRINPUTDIR__
 ioda_directory: __IODAOUTPUTDIR__
 ocean_basin: __OCEANBASIN__

test/marine/testinput/bufr2ioda_insitu_profile_glider_2021063006.yaml.in → test/marine/testinput/bufr2ioda_insitu_profile_glider_subpfl_2019010700.yaml.in

@@ -3,7 +3,7 @@ data_format: subpfl
 source: NCEP data tank
 data_type: glider
 cycle_type: gdas
-cycle_datetime: '2021063006'
+cycle_datetime: '2019010700'
 dump_directory: __BUFRINPUTDIR__
 ioda_directory: __IODAOUTPUTDIR__
 ocean_basin: __OCEANBASIN__

test/marine/testinput/bufr2ioda_insitu_profile_tesac_2021063006.yaml.in → test/marine/testinput/bufr2ioda_insitu_profile_tesac_tesac_2019010700.yaml.in

@@ -3,7 +3,7 @@ data_format: tesac
 source: NCEP data tank
 data_type: tesac
 cycle_type: gdas
-cycle_datetime: '2021063006'
+cycle_datetime: '2019010700'
 dump_directory: __BUFRINPUTDIR__
 ioda_directory: __IODAOUTPUTDIR__
 ocean_basin: __OCEANBASIN__

test/marine/testinput/bufr2ioda_insitu_profile_tropicald_2019010700.yaml.in → test/marine/testinput/bufr2ioda_insitu_profile_tropical_dbuoy_2019010700.yaml.in

@@ -1,7 +1,7 @@
 ---
 data_format: dbuoy
 source: NCEP data tank
-data_type: tropicald
+data_type: tropical
 cycle_type: gdas
 cycle_datetime: '2019010700'
 dump_directory: __BUFRINPUTDIR__

test/marine/testinput/bufr2ioda_insitu_profile_tropicalmb_2019010700.yaml.in → test/marine/testinput/bufr2ioda_insitu_profile_tropical_mbuoyb_2019010700.yaml.in

@@ -1,7 +1,7 @@
 ---
-data_format: dbuoy
+data_format: mbuoyb
 source: NCEP data tank
-data_type: tropicald
+data_type: tropical
 cycle_type: gdas
 cycle_datetime: '2019010700'
 dump_directory: __BUFRINPUTDIR__

test/marine/testinput/bufr2ioda_insitu_profile_xbtctd_2021063006.yaml.in → test/marine/testinput/bufr2ioda_insitu_profile_xbtctd_xbtctd_2019010700.yaml.in

@@ -3,7 +3,7 @@ data_format: xbtctd
 source: NCEP data tank
 data_type: xbtctd
 cycle_type: gdas
-cycle_datetime: '2021063006'
+cycle_datetime: '2019010700'
 dump_directory: __BUFRINPUTDIR__
 ioda_directory: __IODAOUTPUTDIR__
 ocean_basin: __OCEANBASIN__

test/marine/testinput/bufr2ioda_insitu_surface_altkob_altkob_2019010700.yaml.in

@@ -0,0 +1,14 @@
+---
+data_format: altkob
+source: NCEP data tank
+data_type: altkob
+cycle_type: gdas
+cycle_datetime: '2019010700'
+dump_directory: __BUFRINPUTDIR__
+ioda_directory: __IODAOUTPUTDIR__
+ocean_basin: __OCEANBASIN__
+data_description: 6-hrly in situ ALTKOB surface
+platform_description: 'Surface obs from altkob: temperature and salinity'
+data_description_file: "__CONFIGDIR__/altkob.yaml"
+data_provider: U.S. NOAA
+

test/marine/testinput/bufr2ioda_insitu_surface_cstgd_cstgd_2019010700.yaml.in

@@ -0,0 +1,14 @@
+---
+data_format: cstgd
+source: NCEP data tank
+data_type: cstgd
+cycle_type: gdas
+cycle_datetime: '2019010700'
+dump_directory: __BUFRINPUTDIR__
+ioda_directory: __IODAOUTPUTDIR__
+ocean_basin: __OCEANBASIN__
+data_description: 6-hrly in situ CSTGD surface
+platform_description: "sea surface temperature obs from cstgd"
+data_description_file: "__CONFIGDIR__/cstgd.yaml"
+data_provider: U.S. NOAA
+

test/marine/testinput/bufr2ioda_insitu_surface_drifter_2019010700.yaml.in → test/marine/testinput/bufr2ioda_insitu_surface_drifter_dbuoy_2019010700.yaml.in

@@ -9,6 +9,6 @@ ioda_directory: __IODAOUTPUTDIR__
 ocean_basin: __OCEANBASIN__
 data_description: 6-hrly in situ drifter profiles
 platform_description: "Lagrangian drifter drogue profiles from dbuy: temperature"
-data_description_file: "__CONFIGDIR__/drifter.yaml"
+data_description_file: "__CONFIGDIR__/dbuoy.yaml"
 data_provider: U.S. NOAA
 

test/marine/testinput/bufr2ioda_insitu_surface_drifter_dbuoyb_2019010700.yaml.in

@@ -0,0 +1,14 @@
+---
+data_format: dbuoyb
+source: NCEP data tank
+data_type: drifter
+cycle_type: gdas
+cycle_datetime: '2019010700'
+dump_directory: __BUFRINPUTDIR__
+ioda_directory: __IODAOUTPUTDIR__
+ocean_basin: __OCEANBASIN__
+data_description: 6-hrly in situ drifter profiles
+platform_description: "Lagrangian drifter drogue profiles from dbuyb: temperature"
+data_description_file: "__CONFIGDIR__/dbuoyb.yaml"
+data_provider: U.S. NOAA
+

test/marine/testinput/bufr2ioda_insitu_surface_lcman_lcman_2019010700.yaml.in

@@ -0,0 +1,14 @@
+---
+data_format: lcman
+source: NCEP data tank
+data_type: lcman
+cycle_type: gdas
+cycle_datetime: '2019010700'
+dump_directory: __BUFRINPUTDIR__
+ioda_directory: __IODAOUTPUTDIR__
+ocean_basin: __OCEANBASIN__
+data_description: 6-hrly in situ LCMAN surface
+platform_description: 'Surface temperature obs from LCMAN'
+data_description_file: "__CONFIGDIR__/lcman.yaml"
+data_provider: U.S. NOAA
+

test/marine/testinput/bufr2ioda_insitu_surface_shipsu_shipsu_2019010700.yaml.in

@@ -0,0 +1,14 @@
+---
+data_format: shipsu
+source: NCEP data tank
+data_type: shipsu
+cycle_type: gdas
+cycle_datetime: '2019010700'
+dump_directory: __BUFRINPUTDIR__
+ioda_directory: __IODAOUTPUTDIR__
+ocean_basin: __OCEANBASIN__
+data_description: 6-hrly in situ SHIPSU surface
+platform_description: "temperature obs from shipsu"
+data_description_file: "__CONFIGDIR__/shipsu.yaml"
+data_provider: U.S. NOAA
+

test/marine/testinput/bufr2ioda_insitu_surface_trkob_2021063006.yaml.in → test/marine/testinput/bufr2ioda_insitu_surface_trkob_trkob_2019010700.yaml.in

@@ -3,7 +3,7 @@ data_format: trkob
 source: NCEP data tank
 data_type: trackob
 cycle_type: gdas
-cycle_datetime: '2021063006'
+cycle_datetime: '2019010700'
 dump_directory: __BUFRINPUTDIR__
 ioda_directory: __IODAOUTPUTDIR__
 ocean_basin: __OCEANBASIN__

test/marine/testinput/cstgd.yaml

@@ -0,0 +1,76 @@
+---
+  - class_name: "Temperature"
+    short_name: "seaSurfaceTemperature"
+    name: "seaSurfaceTemperature"
+    bufr_mnemonic: "*/SST1"
+    descriptor: "ObsValue"
+    units: "degC"
+    depth_profile_var_name: ""
+    data_min: -10.0
+    data_max: 50.0
+    data_error: 0.24
+
+  - class_name: "Longitude"
+    short_name: "longitude"
+    name: "Longitude"
+    bufr_mnemonic: "*/CLON"
+    descriptor: "MetaData"
+    units: "degrees_east"
+    depth_profile_var_name: ""
+    data_min: -180.0
+    data_max: 180.0
+    data_error: 0.0
+
+  - class_name: "Latitude"
+    short_name: "latitude"
+    name: "Latitude"
+    bufr_mnemonic: "*/CLAT"
+    descriptor: "MetaData"
+    units: "degrees_north"
+    depth_profile_var_name: ""
+    data_min: -90.0
+    data_max: 90.0
+    data_error: 0.0
+
+#   - class_name: "StationID"
+#     short_name: "stationID"
+#     name: "BUOY/PLATFORM IDENTIFIER"
+#     bufr_mnemonic: "*/ID2SQ/BPID"
+#     descriptor: "MetaData"
+#     units: ""
+#     depth_profile_var_name: ""
+#     data_min: 0
+#     data_max: 0
+#     data_error: 0
+
+  - class_name: "DateTime"
+    short_name: "dateTime"
+    name: "DateTime"
+    descriptor: "MetaData"
+    units: "seconds since 1970-01-01T00:00:00Z"
+    depth_profile_var_name: ""
+    data_min: 0
+    data_max: 0
+    data_error: 0
+    bufr_mnemonics:
+      year: '*/YEAR'
+      month: '*/MNTH'
+      day: '*/DAYS'
+      hour: '*/HOUR'
+      minute: '*/MINU'
+
+  - class_name: "RcptDateTime2D"
+    short_name: "rcptDateTime"
+    name: "RcptDateTime"
+    descriptor: "MetaData"
+    units: "seconds since 1970-01-01T00:00:00Z"
+    depth_profile_var_name: ""
+    data_min: 0
+    data_max: 0
+    data_error: 0
+    bufr_mnemonics:
+      ryear: '*/RCPTIM/RCYR'
+      rmonth: '*/RCPTIM/RCMO'
+      rday: '*/RCPTIM/RCDY'
+      rhour: '*/RCPTIM/RCHR'
+      rminute: '*/RCPTIM/RCMI'

ush/ioda/bufr2ioda/marine/newb2i/tropical.yaml → test/marine/testinput/dbuoyb.yaml

@@ -2,7 +2,7 @@
   - class_name: "Temperature"
     short_name: "waterTemperature"
     name: "waterTemperature"
-    bufr_mnemonic: "*/DTSCUR/STMP"
+    bufr_mnemonic: "*/IDMSMDBS/BBYSTSL/SST1"
     descriptor: "ObsValue"
     units: "degC"
     depth_profile_var_name: "depth"
@@ -13,7 +13,7 @@
   - class_name: "Salinity"
     short_name: "salinity"
     name: "salinity"
-    bufr_mnemonic: "*/DTSCUR/SALN"
+    bufr_mnemonic: "*/IDMSMDBS/BBYSTSL/SALN"
     descriptor: "ObsValue"
     units: "psu"
     depth_profile_var_name: "depth"
@@ -24,7 +24,7 @@
   - class_name: "Depth"
     short_name: "depth"
     name: "Water depth"
-    bufr_mnemonic: "*/DTSCUR/DBSS"
+    bufr_mnemonic: "*/IDMSMDBS/BBYSTSL/DBSS"
     descriptor: "MetaData"
     units: "m"
     depth_profile_var_name: "depth"
@@ -35,7 +35,7 @@
   - class_name: "Longitude"
     short_name: "longitude"
     name: "Longitude"
-    bufr_mnemonic: "*/CLON"
+    bufr_mnemonic: "*/CLONH"
     descriptor: "MetaData"
     units: "degrees_east"
     depth_profile_var_name: "depth"
@@ -46,7 +46,7 @@
   - class_name: "Latitude"
     short_name: "latitude"
     name: "Latitude"
-    bufr_mnemonic: "*/CLAT"
+    bufr_mnemonic: "*/CLATH"
     descriptor: "MetaData"
     units: "degrees_north"
     depth_profile_var_name: "depth"
@@ -57,7 +57,7 @@
   - class_name: "StationID"
     short_name: "stationID"
     name: "Station Identification"
-    bufr_mnemonic: "*/RPID"
+    bufr_mnemonic: "*/WMOP"
     descriptor: "MetaData"
     units: ""
     depth_profile_var_name: "depth"
@@ -68,7 +68,7 @@
   - class_name: "BuoyType"
     short_name: "buoyType"
     name: "Buoy Type"
-    bufr_mnemonic: "*/RPSEC4/BUYT"
+    bufr_mnemonic: "*/BUYT"
     descriptor: "MetaData"
     units: ""
     depth_profile_var_name: "depth"
@@ -92,7 +92,7 @@
       hour: '*/HOUR'
       minute: '*/MINU'
 
-  - class_name: "RcptDateTime2D"
+  - class_name: "DateTime"
     short_name: "rcptDateTime"
     name: "RcptDateTime"
     descriptor: "MetaData"
@@ -102,8 +102,8 @@
     data_max: 0
     data_error: 0
     bufr_mnemonics:
-      ryear: '*/RCPTIM/RCYR'
-      rmonth: '*/RCPTIM/RCMO'
-      rday: '*/RCPTIM/RCDY'
-      rhour: '*/RCPTIM/RCHR'
-      rminute: '*/RCPTIM/RCMI'
+      ryear: '*/RCYR'
+      rmonth: '*/RCMO'
+      rday: '*/RCDY'
+      rhour: '*/RCHR'
+      rminute: '*/RCMI'