From a464e1ac481be527d4f299e705d29d0d73a40a30 Mon Sep 17 00:00:00 2001 From: John-Sharples Date: Mon, 16 Sep 2024 16:12:45 +0000 Subject: [PATCH] 318: update tests/data for MTD 3d cluster --- .../mtd_CONV_TIME_20100517_010000V_3d_pair_cluster.txt | 5 +++++ METdbLoad/test/test_met_db_load.py | 9 ++++++++- METdbLoad/test/test_read_data_files.py | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 METdbLoad/test/data/mtd/mtd_CONV_TIME_20100517_010000V_3d_pair_cluster.txt diff --git a/METdbLoad/test/data/mtd/mtd_CONV_TIME_20100517_010000V_3d_pair_cluster.txt b/METdbLoad/test/data/mtd/mtd_CONV_TIME_20100517_010000V_3d_pair_cluster.txt new file mode 100644 index 0000000..ce9d856 --- /dev/null +++ b/METdbLoad/test/data/mtd/mtd_CONV_TIME_20100517_010000V_3d_pair_cluster.txt @@ -0,0 +1,5 @@ +VERSION MODEL DESC FCST_LEAD FCST_VALID OBS_LEAD OBS_VALID T_DELTA FCST_T_BEG FCST_T_END FCST_RAD FCST_THR OBS_T_BEG OBS_T_END OBS_RAD OBS_THR FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBJECT_ID OBJECT_CAT SPACE_CENTROID_DIST TIME_CENTROID_DELTA AXIS_DIFF SPEED_DELTA DIRECTION_DIFF VOLUME_RATIO START_TIME_DELTA END_TIME_DELTA INTERSECTION_VOLUME DURATION_DIFF INTEREST +V12.0.0 FCST NA NA 20100517_010000 NA 20100517_010000 010000 -2 3 2 >=0.5 -1 1 2 >=0.5 APCP_01 kg/m^2 A01 APCP_01 kg/m^2 A01 CF001_CO001 CF001_CO001 6.89 -0.01 3.894 0.37 31.96 1.19 0 0 47061 0 -1.000 +V12.0.0 FCST NA NA 20100517_010000 NA 20100517_010000 010000 -2 3 2 >=0.5 -1 1 2 >=0.5 APCP_01 kg/m^2 A01 APCP_01 kg/m^2 A01 CF002_CO002 CF002_CO002 60.32 -1.06 5.214 1.07 3.46 0.75 0 0 0 0 -1.000 +V12.0.0 FCST NA NA 20100517_010000 NA 20100517_010000 010000 -2 3 2 >=0.5 -1 1 2 >=0.5 APCP_01 kg/m^2 A01 APCP_01 kg/m^2 A01 CF003_CO003 CF003_CO003 65.19 -0.67 62.974 -3.31 177.03 0.98 0 -1 7 -1 -1.000 +V12.0.0 FCST NA NA 20100517_010000 NA 20100517_010000 010000 -2 3 2 >=0.5 -1 1 2 >=0.5 APCP_01 kg/m^2 A01 APCP_01 kg/m^2 A01 CF004_CO004 CF004_CO004 4.72 0.84 2.870 -1.85 1.95 0.90 -2 0 1151 2 -1.000 diff --git a/METdbLoad/test/test_met_db_load.py b/METdbLoad/test/test_met_db_load.py index deb92a8..a4c3727 100644 --- a/METdbLoad/test/test_met_db_load.py +++ b/METdbLoad/test/test_met_db_load.py @@ -85,6 +85,8 @@ def assert_count_rows(cur, table, expected_count): { "mtd_2d_obj": 278, "mtd_3d_obj_single": 8, + "mtd_3d_obj_pair": 4, + "mtd_header": 24, }, ), ( @@ -128,9 +130,14 @@ def test_met_db_table_counts( expected_counts, ): + load_flags = { + "mode_header_db_check": "true", + "mtd_header_db_check": "true", + } + test_args = dict_to_args( { - "xmlfile": str(get_xml_test_file(tmp_path, met_data_dir, met_tool)), + "xmlfile": str(get_xml_test_file(tmp_path, met_data_dir, met_tool, load_flags=load_flags)), "index": "true", "tmpdir": [str(tmp_path)], "loglevel": None, diff --git a/METdbLoad/test/test_read_data_files.py b/METdbLoad/test/test_read_data_files.py index 4daa278..ab9825b 100644 --- a/METdbLoad/test/test_read_data_files.py +++ b/METdbLoad/test/test_read_data_files.py @@ -42,7 +42,7 @@ def test_mtd_loads(tmp_path, get_xml_loadfile): ) # number of files - assert len(XML_LOADFILE.load_files) == 2 + assert len(XML_LOADFILE.load_files) == 3 # number of lines of data assert FILE_DATA.mtd_2d_data.shape == (278, 43) assert FILE_DATA.mtd_3d_single_data.shape == (8, 48)