diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..4f159de4803e90f124427b1ce04a59696b0372ce --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5 filter=lfs diff=lfs merge=lfs -text diff --git a/edosl0util/cli/rdrmerge.py b/edosl0util/cli/rdrmerge.py index 0a12727a75a36ad9cd0215b83a8da134390e4afc..506a8e0de1b8ec08cff2db76a88030dc4c6f4b5e 100644 --- a/edosl0util/cli/rdrmerge.py +++ b/edosl0util/cli/rdrmerge.py @@ -80,7 +80,13 @@ def extract_packets(sat, product, fpath, workdir="."): return outputs -start_of_mission = {"snpp": datetime(2011, 10, 28), "noaa20": datetime(2017, 11, 18)} +start_of_mission = { + "snpp": datetime(2011, 10, 28), + "npp": datetime(2011, 10, 28), + "j01": datetime(2017, 11, 18), + "jpss1": datetime(2017, 11, 18), + "noaa20": datetime(2017, 11, 18), +} def merge_rdrs(inputs): diff --git a/tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5 b/tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5 new file mode 100644 index 0000000000000000000000000000000000000000..c4d98a72ed49f9b0fd8945995a92179c09011b9f --- /dev/null +++ b/tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b43663102af691fc30d09cf2ea8a686a2d5a2af0dc17b7274eb806822ec255e +size 282464388 diff --git a/tests/test_rdrmerge.py b/tests/test_rdrmerge.py index 7d7105fef29e6a0d97a8740932101ac0b6ae8e30..b4e49fb9cc54c3d75624642b6250b352da4b4955 100644 --- a/tests/test_rdrmerge.py +++ b/tests/test_rdrmerge.py @@ -35,3 +35,15 @@ def test_rdrmerge_viirs(testdir): outputs = rdrmerge.merge_rdrs(rdrs) assert len(outputs) == 1 assert os.path.exists(outputs[0]) + + +@pytest.mark.slow +def test_rdrmerge_viirs_j1(testdir): + rdrs = glob( + os.path.join(os.getcwd(), "tests/fixtures/merge/RNSCA-RVIRS_j01_d2019*.h5") + ) + testdir.chdir() + + outputs = rdrmerge.merge_rdrs(rdrs) + assert len(outputs) == 1 + assert os.path.exists(outputs[0])