diff --git a/modules/dmrpp_module/DmrppArray.cc b/modules/dmrpp_module/DmrppArray.cc index accd2e4012..d522db0587 100644 --- a/modules/dmrpp_module/DmrppArray.cc +++ b/modules/dmrpp_module/DmrppArray.cc @@ -2845,8 +2845,10 @@ bool DmrppArray::read() { bool buffer_chunk_case = array_to_read->use_buffer_chunk(); if (!array_to_read->is_projected()) { + BESDEBUG(MODULE, prolog << "Reading data from chunks, unconstrained." << endl); - // KENT: Only here we need to consider the direct buffer IO. + + // Here we need to consider the direct chunk IO. if (this->get_dio_flag()) { BESDEBUG(MODULE, prolog << "Using direct IO" << endl); if (buffer_chunk_case && DmrppRequestHandler::use_buffer_chunk) @@ -2865,6 +2867,8 @@ bool DmrppArray::read() { } } else { BESDEBUG(MODULE, prolog << "Reading data from chunks, constrained." << endl); + // We need to check if this is a good subset case that the direct chunk IO can handle. + bool direct_io_subset = check_dio_subset(); // Also buffer chunks for the non-contiguous chunk case. if (buffer_chunk_case && DmrppRequestHandler::use_buffer_chunk) { @@ -3778,4 +3782,72 @@ unsigned long long DmrppArray::obtain_buffer_end_pos(const vectorvar()->name() << endl); + no_dio = true; + break; + } + } + if (no_dio) + return false; + + // Obtain the chunk dimension sizes + const vector &chunk_dim_sizes = get_chunk_dimension_sizes(); + + // If the subset size is smaller than a chunk size, no direct chunk IO. + di = dim_begin(); + int dim_rank_count = 0; + for (; di != de; di++) { + int64_t start = dimension_start_ll (di, true); + int64_t stop = dimension_stop_ll (di, true); + if ((start+chunk_dim_sizes[dim_rank_count])>stop) { + BESDEBUG(PARSER, prolog << "start of this dimension: " <var()->name() << endl); + no_dio = true; + break; + } + dim_rank_count++; + } + if (no_dio) + return false; + + // If the starting point of the subset is not the starting point of a chunk,no direct chunk IO. + di = dim_begin(); + dim_rank_count = 0; + for (; di != de; di++) { + int64_t start = dimension_start_ll (di, true); + if ((start%chunk_dim_sizes[dim_rank_count])!=0) { + BESDEBUG(PARSER, prolog << "start of this dimension: " <var()->name() << endl); + no_dio = true; + break; + } + dim_rank_count++; + } + if (no_dio) + return false; + + BESDEBUG(PARSER, prolog << "Can do direct IO subset: the variable name is: " <var()->name() << endl); + + return true; + +} + } // namespace dmrpp diff --git a/modules/dmrpp_module/DmrppArray.h b/modules/dmrpp_module/DmrppArray.h index f677005f0a..bc3e8d68fc 100644 --- a/modules/dmrpp_module/DmrppArray.h +++ b/modules/dmrpp_module/DmrppArray.h @@ -172,6 +172,8 @@ class DmrppArray : public libdap::Array, public dmrpp::DmrppCommon { bool use_direct_io_opt(); + bool check_dio_subset(); + unsigned long long inflate_simple(char **destp, unsigned long long dest_len, char *src, unsigned long long src_len); public: diff --git a/modules/fileout_netcdf/data/h5_six_big_chunks_comp.h5 b/modules/fileout_netcdf/data/h5_six_big_chunks_comp.h5 new file mode 100644 index 0000000000..8b2d98fd61 Binary files /dev/null and b/modules/fileout_netcdf/data/h5_six_big_chunks_comp.h5 differ diff --git a/modules/fileout_netcdf/data/h5_six_big_chunks_comp.h5.dmrpp b/modules/fileout_netcdf/data/h5_six_big_chunks_comp.h5.dmrpp new file mode 100644 index 0000000000..22e1847f27 --- /dev/null +++ b/modules/fileout_netcdf/data/h5_six_big_chunks_comp.h5.dmrpp @@ -0,0 +1,33 @@ + + + + + + + 10 10 + + + + + + + + + + + 2026-02-10T21:34:57Z + + + 3.21.1 + + + 3.21.1 + + + libdap-3.21.1 + + + build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M + + + diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd new file mode 100644 index 0000000000..241b2f9efc --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd @@ -0,0 +1,11 @@ + + + dap2 + /data/h5_six_big_chunks_comp.h5.dmrpp + + + /DS1[0:1:10][10:1:20] + + + + diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.data b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.data new file mode 100644 index 0000000000..b22c417f97 --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.data @@ -0,0 +1,30 @@ +netcdf test { +dimensions: + dim1 = 11 ; + dim2 = 11 ; +variables: + ubyte DS1(dim1, dim2) ; + +// global attributes: + :build_dmrpp_metadata.created = "removed date-time" ; + :build_dmrpp_metadata.build_dmrpp = "3.21.1" ; + :build_dmrpp_metadata.bes = "3.21.1" ; + :build_dmrpp_metadata.libdap = "libdap-3.21.1" ; + :build_dmrpp_metadata.invocation = "build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M" ; + :history = "removed date-timex h5_six_big_chunks_comp.h5.dmrpp\n" ; + :history_json = "[{\"$schema\":\"https://harmony.earthdata.nasa.gov/schemas/history/0.1.0/history-0.1.0.json\",\"date_time\":\"removed date-time\",\"program\":\"hyrax\",\"version\":\"1.16.3\",\"parameters\":[{\"request_url\":\"h5_six_big_chunks_comp.h5.dmrpp\"}]}]" ; +data: + + DS1 = + 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, + 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, + 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, + 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, + 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, + 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, + 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, + 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, + 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, + 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, + 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51 ; +} diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.header b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.header new file mode 100644 index 0000000000..be1ed04ab2 --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.header @@ -0,0 +1,16 @@ +netcdf test { +dimensions: + dim1 = 11 ; + dim2 = 11 ; +variables: + ubyte DS1(dim1, dim2) ; + +// global attributes: + :build_dmrpp_metadata.created = "removed date-time" ; + :build_dmrpp_metadata.build_dmrpp = "3.21.1" ; + :build_dmrpp_metadata.bes = "3.21.1" ; + :build_dmrpp_metadata.libdap = "libdap-3.21.1" ; + :build_dmrpp_metadata.invocation = "build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M" ; + :history = "removed date-timex h5_six_big_chunks_comp.h5.dmrpp\n" ; + :history_json = "[{\"$schema\":\"https://harmony.earthdata.nasa.gov/schemas/history/0.1.0/history-0.1.0.json\",\"date_time\":\"removed date-time\",\"program\":\"hyrax\",\"version\":\"1.16.3\",\"parameters\":[{\"request_url\":\"h5_six_big_chunks_comp.h5.dmrpp\"}]}]" ; +} diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.ver b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.ver new file mode 100644 index 0000000000..c7a611d52e --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd.baseline.ver @@ -0,0 +1 @@ +netCDF-4 diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd new file mode 100644 index 0000000000..f6188e0af4 --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd @@ -0,0 +1,11 @@ + + + dap2 + /data/h5_six_big_chunks_comp.h5.dmrpp + + + /DS1[0:1:8][10:1:20] + + + + diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.data b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.data new file mode 100644 index 0000000000..d0fa57518f --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.data @@ -0,0 +1,28 @@ +netcdf test { +dimensions: + dim1 = 9 ; + dim2 = 11 ; +variables: + ubyte DS1(dim1, dim2) ; + +// global attributes: + :build_dmrpp_metadata.created = "removed date-time" ; + :build_dmrpp_metadata.build_dmrpp = "3.21.1" ; + :build_dmrpp_metadata.bes = "3.21.1" ; + :build_dmrpp_metadata.libdap = "libdap-3.21.1" ; + :build_dmrpp_metadata.invocation = "build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M" ; + :history = "removed date-timex h5_six_big_chunks_comp.h5.dmrpp\n" ; + :history_json = "[{\"$schema\":\"https://harmony.earthdata.nasa.gov/schemas/history/0.1.0/history-0.1.0.json\",\"date_time\":\"removed date-time\",\"program\":\"hyrax\",\"version\":\"1.16.3\",\"parameters\":[{\"request_url\":\"h5_six_big_chunks_comp.h5.dmrpp\"}]}]" ; +data: + + DS1 = + 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, + 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, + 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, + 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, + 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, + 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, + 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, + 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, + 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49 ; +} diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.header b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.header new file mode 100644 index 0000000000..dc550b798b --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.header @@ -0,0 +1,16 @@ +netcdf test { +dimensions: + dim1 = 9 ; + dim2 = 11 ; +variables: + ubyte DS1(dim1, dim2) ; + +// global attributes: + :build_dmrpp_metadata.created = "removed date-time" ; + :build_dmrpp_metadata.build_dmrpp = "3.21.1" ; + :build_dmrpp_metadata.bes = "3.21.1" ; + :build_dmrpp_metadata.libdap = "libdap-3.21.1" ; + :build_dmrpp_metadata.invocation = "build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M" ; + :history = "removed date-timex h5_six_big_chunks_comp.h5.dmrpp\n" ; + :history_json = "[{\"$schema\":\"https://harmony.earthdata.nasa.gov/schemas/history/0.1.0/history-0.1.0.json\",\"date_time\":\"removed date-time\",\"program\":\"hyrax\",\"version\":\"1.16.3\",\"parameters\":[{\"request_url\":\"h5_six_big_chunks_comp.h5.dmrpp\"}]}]" ; +} diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.ver b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.ver new file mode 100644 index 0000000000..c7a611d52e --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd.baseline.ver @@ -0,0 +1 @@ +netCDF-4 diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd new file mode 100644 index 0000000000..90a3d710f0 --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd @@ -0,0 +1,11 @@ + + + dap2 + /data/h5_six_big_chunks_comp.h5.dmrpp + + + /DS1[1:1:11][10:1:20] + + + + diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.data b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.data new file mode 100644 index 0000000000..a1fee01b44 --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.data @@ -0,0 +1,30 @@ +netcdf test { +dimensions: + dim1 = 11 ; + dim2 = 11 ; +variables: + ubyte DS1(dim1, dim2) ; + +// global attributes: + :build_dmrpp_metadata.created = "removed date-time" ; + :build_dmrpp_metadata.build_dmrpp = "3.21.1" ; + :build_dmrpp_metadata.bes = "3.21.1" ; + :build_dmrpp_metadata.libdap = "libdap-3.21.1" ; + :build_dmrpp_metadata.invocation = "build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M" ; + :history = "removed date-timex h5_six_big_chunks_comp.h5.dmrpp\n" ; + :history_json = "[{\"$schema\":\"https://harmony.earthdata.nasa.gov/schemas/history/0.1.0/history-0.1.0.json\",\"date_time\":\"removed date-time\",\"program\":\"hyrax\",\"version\":\"1.16.3\",\"parameters\":[{\"request_url\":\"h5_six_big_chunks_comp.h5.dmrpp\"}]}]" ; +data: + + DS1 = + 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, + 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, + 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, + 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, + 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, + 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, + 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, + 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, + 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, + 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, + 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52 ; +} diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.header b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.header new file mode 100644 index 0000000000..be1ed04ab2 --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.header @@ -0,0 +1,16 @@ +netcdf test { +dimensions: + dim1 = 11 ; + dim2 = 11 ; +variables: + ubyte DS1(dim1, dim2) ; + +// global attributes: + :build_dmrpp_metadata.created = "removed date-time" ; + :build_dmrpp_metadata.build_dmrpp = "3.21.1" ; + :build_dmrpp_metadata.bes = "3.21.1" ; + :build_dmrpp_metadata.libdap = "libdap-3.21.1" ; + :build_dmrpp_metadata.invocation = "build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M" ; + :history = "removed date-timex h5_six_big_chunks_comp.h5.dmrpp\n" ; + :history_json = "[{\"$schema\":\"https://harmony.earthdata.nasa.gov/schemas/history/0.1.0/history-0.1.0.json\",\"date_time\":\"removed date-time\",\"program\":\"hyrax\",\"version\":\"1.16.3\",\"parameters\":[{\"request_url\":\"h5_six_big_chunks_comp.h5.dmrpp\"}]}]" ; +} diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.ver b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.ver new file mode 100644 index 0000000000..c7a611d52e --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd.baseline.ver @@ -0,0 +1 @@ +netCDF-4 diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd new file mode 100644 index 0000000000..03cf618efe --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd @@ -0,0 +1,11 @@ + + + dap2 + /data/h5_six_big_chunks_comp.h5.dmrpp + + + /DS1[0:1:11][0:2:22] + + + + diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.data b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.data new file mode 100644 index 0000000000..670351c708 --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.data @@ -0,0 +1,31 @@ +netcdf test { +dimensions: + dim1 = 12 ; + dim2 = 12 ; +variables: + ubyte DS1(dim1, dim2) ; + +// global attributes: + :build_dmrpp_metadata.created = "removed date-time" ; + :build_dmrpp_metadata.build_dmrpp = "3.21.1" ; + :build_dmrpp_metadata.bes = "3.21.1" ; + :build_dmrpp_metadata.libdap = "libdap-3.21.1" ; + :build_dmrpp_metadata.invocation = "build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M" ; + :history = "removed date-timex h5_six_big_chunks_comp.h5.dmrpp\n" ; + :history_json = "[{\"$schema\":\"https://harmony.earthdata.nasa.gov/schemas/history/0.1.0/history-0.1.0.json\",\"date_time\":\"removed date-time\",\"program\":\"hyrax\",\"version\":\"1.16.3\",\"parameters\":[{\"request_url\":\"h5_six_big_chunks_comp.h5.dmrpp\"}]}]" ; +data: + + DS1 = + 1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, + 2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, + 3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, + 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, + 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49, + 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 50, + 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, + 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, + 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53, + 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 50, 54, + 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55, + 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56 ; +} diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.header b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.header new file mode 100644 index 0000000000..1dc89ad011 --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.header @@ -0,0 +1,16 @@ +netcdf test { +dimensions: + dim1 = 12 ; + dim2 = 12 ; +variables: + ubyte DS1(dim1, dim2) ; + +// global attributes: + :build_dmrpp_metadata.created = "removed date-time" ; + :build_dmrpp_metadata.build_dmrpp = "3.21.1" ; + :build_dmrpp_metadata.bes = "3.21.1" ; + :build_dmrpp_metadata.libdap = "libdap-3.21.1" ; + :build_dmrpp_metadata.invocation = "build_dmrpp -f /Users/myang6/work/opendap/hyrax-2013/h5_six_big_chunks_comp.h5 -r h5_six_big_chunks_comp.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M" ; + :history = "removed date-timex h5_six_big_chunks_comp.h5.dmrpp\n" ; + :history_json = "[{\"$schema\":\"https://harmony.earthdata.nasa.gov/schemas/history/0.1.0/history-0.1.0.json\",\"date_time\":\"removed date-time\",\"program\":\"hyrax\",\"version\":\"1.16.3\",\"parameters\":[{\"request_url\":\"h5_six_big_chunks_comp.h5.dmrpp\"}]}]" ; +} diff --git a/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.ver b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.ver new file mode 100644 index 0000000000..c7a611d52e --- /dev/null +++ b/modules/fileout_netcdf/tests/bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd.baseline.ver @@ -0,0 +1 @@ +netCDF-4 diff --git a/modules/fileout_netcdf/tests/testsuite.at b/modules/fileout_netcdf/tests/testsuite.at index 6797db4504..6007f3f9d0 100644 --- a/modules/fileout_netcdf/tests/testsuite.at +++ b/modules/fileout_netcdf/tests/testsuite.at @@ -455,3 +455,9 @@ AT_BESCMD_NETCDF_RESPONSE_TEST_NC4_ENHANCED_GRP(bescmd/compound_simple_bigger_ch AT_BESCMD_NETCDF_RESPONSE_TEST_NC4_ENHANCED_GRP(bescmd/h5_one_bigger_chunk_size_comp.h5.dmrpp.bescmd) AT_BESCMD_NETCDF_RESPONSE_TEST_NC4_ENHANCED_GRP(bescmd/nc4_group_atomic_puredim_2d_unlimited_comp.nc.dmrpp.bescmd) AT_BESCMD_NETCDF_RESPONSE_TEST_NC4_ENHANCED_GRP(bescmd/nc4_unlimited_1_big_comp.nc.dmrpp.bescmd) + +# Direct chunk IO for the subset cases. +AT_BESCMD_NETCDF_RESPONSE_TEST_NC4_ENHANCED_GRP(bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint.bescmd) +AT_BESCMD_NETCDF_RESPONSE_TEST_NC4_ENHANCED_GRP(bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_2.bescmd) +AT_BESCMD_NETCDF_RESPONSE_TEST_NC4_ENHANCED_GRP(bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_3.bescmd) +AT_BESCMD_NETCDF_RESPONSE_TEST_NC4_ENHANCED_GRP(bescmd/h5_six_big_chunks_comp.h5.dmrpp_constraint_4.bescmd)