Added new features to RELEASE.txt:
Packaged input and output
Only requested product granules added to granule table
Fill granules created for any product with at least one real granule
Bug fixes in RELEASE.txt:
JPSS-38
JPSS-39
JPSS-40
test/testfiles
Deleted GMODO_npp_d20120229_t0530029_e0535433_b01757_c20120229113543651262_noaa_ops.h5.
Size was 300+ MB.
testnagg.sh
Changed multipls SVM products tests to -g no since GMODO file is removed.
Added SATMS,TATMS packaging tests.
Removed extra input and geo granules test which needed GMODO file. Should be replaced
by test with other multi-product files.
nagg_write_granules.c
Fixed bug in end_write() exposed by multi-product test with -g no.
Uncomm...
testnagg.sh
Add test that aggregates unpackaged SATMS,TATMS and GATMO files where some of the TATMS granules are missing.
Tested jam & koala, gcc & icc.
BUg fix: select_granules was making extra unnecessary filled granules.
It was because it was calculating next_slot_btime incorrect.
Rewrote the select_granules() into two loops, outer for number of slots
and inner is for number of products found.
Tested: koala.
README
Added file describing characteristics and test purposes of the files in this directory (incomplete).
SATMS, TATMS, GATMO files
1 granule per file product and GEO files to test packaging of unpackaged products. The files for these products are much smaller than the VIIRS products, especially the GEO files.
Tested koala.
Added support of multiple products that some individual product
may have missing granules. No more assumption that all or none
granules of one time slot is missing.
Tested: Koala and jam.
testnagg.sh
Added test with incompatible and compatible input files that are not in the product list to see that they are ignored.
nagg_get_granules.c
Refactored nagg_get_granules() function to ignore geo granules for products that aren't in the product list but are in the input files.
Extracted get_n_geo_ref_value function from nagg_get_granules().
Tested jam & koala, icc & gcc
Added couple features to the test script file:
1. When $NAGG_DEBUG is defined, stdout and stderr are always shown.
2. Generated output files are removed unless $NAGG_NOCLEANUP is defined.
Tested: koala and jam.
Revamp the structure of the test script so that it
shows the result in much readable format.
1. It displays stdout and stderr results only when
it encounter erros.
2. It clearly shows each test is PASSED or FAILED
as instructed.
Tested: koala.
Added tests, both positive and negative tests for "-g <geoproduct>".
Added some white space and markers for easier reading of the shell
scripts.
Tested: Koala.
nagg.h
Add prototype for get_granule_pattern().
nagg_get_granules.c
Add get_granule_pattern() function.
nagg_write_granules.c
Add get_product_id_by_idx() function.
Update code to write missing granules from granule_pattern instead
of from previous granule.
Tests needed for missing granules. Tested manually; will add test to make check tomorrow.
Tested jam & koala, icc & gcc.
Bug fix: compose output file name is not returning the composed output files
properly for multiple products requests for unpackaged format.
The error is in incorrect protocal definition of output_files (was saying it is
an array of NPPFileName_p_t.
Fixed by correcting the protocol to send in an array of NPPFileName_t.
Tested: koala and Jam.
test/testfiles
Added 2 additional test files
testnagg.sh
Added tets for unpackaged inpput, packaged output
nagg_get_granules.c
fixed bug - geofiles should be searched for geo granules only once.
Tested jam & koala, gcc & icc
Fixed a bug in compose_output_fname where it failed to advance the pt pointer
accordingly.
Fixed select_granules() so that it can handle multiple products or no products.
For the latter case, geoproduct must be defined.
Tested: koala.
testfiles
Added SVM04, SVM05 and GMODO test file for future multi-product testing.
testnagg.sh
Added test for -S with packaged SATMS-GATMO input
nagg_main.c
nagg.h
Changed input parameter for start_write from char** to NPPFileName_t * and added geoproduct input parameter for start_write.
nagg_get_granules.c
Changes to limit granules to those for requested products and associated geoproducts.
nagg_write_granules.c
Changes to support packaged or unpackaged output.
-S, -g no...
Updated code in compose_output_fname() to generated file names for sensor and
geolocation products in both Packaged and Unpackaged format. Also support to
generate geolocation product only (-g <geoproduct ID>) and no Geolocation
products (-g no).
src/nagg_select_granules.c
Overhaul to compose_output_fname(), including changing protocols, internal
algorithms.
src/nagg.h
Modified macro NPPFileName_size_max to accommodate Geoproducts are included
in one PACKAGED file. Changed c...
Added expected output (packaged or unpackaged) for certain combinations of parameters passed to start_write function to header block for start_write(). Implementation to follow.
Comment text only
BUg fix: fix -g no so that geoproduct is not set.
Tested: koala(debug printout showed geoproduct is set or not set according
to NOT -g no. Make check reported 2 errors but did not show where it failed.
Implemented -t multiple products in option parse, separated comma list into
list of products, with consistency check with -g <geoproduct>.
src/nagg_main.c
debug statments to print the product list.
src/nagg.h
Added GEOFILE_GEOPRODUCT enum value for geolocation_t for the case of
-g <geoproduct>.
src/nagg_posix.h
Added HDstrchr macro.
src/nagg_options.c
Added code to parse -t multiple products option, automatically look up
Geolocation product for products, verify they u...
nagg_main.c
Removing workaround to set geoproduct to NULL in nagg_main when nagg is invoked with "-g no". Either parse_options should return geoproduct = NULL or we will need to deal with the geoproduct in nagg_get_granules() and elsewhere.
make check will fail for now.
testnagg.sh
Added packaged with -g default test, packaged and unpackaged with -g no tests.
nagg__main.c
Added workaround to set geoproduct to NULL when -g no.
Changed nagg_get_granules geoproduct parameter from char** to char*.
Added granule_pattern_array
nagg.h
Added granule_pattern_t structure
Added granule_pattern_array
nagg_get_granule.c
Changed and renamed group_finder functor to function get_group_granules to get graules of requested products.
Made change...
Added a new column of GPID (Geolocation Product ID) to the two
product tables.a (For the Geolocation product table, GPID is always
NULL since only sensor products may have a Geolocation product ID.
Tested: compiling passed in koala.
New feature: Recognize -S (simple output file format, aka Unpackaged format) as an option. But the recognized option is not passed to the rest of the code yet.
src/nagg_main.c
src/nagg.h
added outfileformat to hold the output file format.
src/nagg_options.c
Recognize -S and set outfileformat.
src/nagg_select_granules.c
Mark the arguments of select_granules as IN or OUT types.
test/testnagg.sh
Added test cases of -S. Since -S is only recognized but not passed to
other pa...
configure.ac:
doc/RELEASE.txt:
src/nagg.h:
README:
Updated version information to for v1.0.1 release.
configure:
Generated from configure.ac.
Tested: koala and jam.
RELEASE.txt
Revise "-g no" entry in new features section to more closely match the message displayed by nagg -h.
nagg_options.c
Make capitalization of Geolocation consistent in help message.
Text changes only.
src/nagg_options.c:
updated to reflect latest implementation and some earlier errors.
src/nagg_select_granules.c
updated the comment block of nagg_select_granules().
Tested: koala.
Cleaned up nagg.docx. Marked clearly what is not supported yet. Removed the "--XXX" style option as the source does not support it yet.
nagg.htm:
nagg.pdf:
Generated from nagg.docx.
NPP-Aggregation-Tool-Components.docx:
Updated by Elena, then Larry, then Albert.
NPP-Aggregation-Tool-Components.htm:
NPP-Aggregation-Tool-Components.pdf:
Generated from NPP-Aggregation-Tool-Components-new.docx.
nagg_get_granules.c
The nagg_get_granules function will return either a valid DPID in geoproduct or NULL. When the function succeeds and returns NULL in geoproduct, it is an indication that no external GEO files should be produced.
Tested jam & koala gcc & icc.
