Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix 2370 main_v10.1 - 6 line headers and yyyy-MMM #2397

Merged
merged 3 commits into from
Jan 10, 2023

Conversation

hsoh-u
Copy link
Collaborator

@hsoh-u hsoh-u commented Jan 10, 2023

Expected Differences

#2370:
AERONET V3 input files with the 7 lines header were supported before. The fix is to support 6 lines header (without site_name at line 2). The concatenation of multiple AERONET V3 files should be 6 lines header (can be done by deleting line 2 if 7 lines header).

  • The Date & Time columns can be any place (were reserved at the first and second columns)
  • The sanity checking with site_name still remains with 7 lines header, but disabled with 6 lines header input.

sanity checking: the site_name at the line 2 and the site_name at the first data column should match.

#2383: Avoid AOD 550 calculation if any inputs are negative.

  • Do these changes introduce new tools, command line arguments, or configuration file options? [No]

    If yes, please describe:

  • Do these changes modify the structure of existing or add new output data types (e.g. statistic line types or NetCDF variables)? [No]

    If yes, please describe:

Pull Request Testing

  • Describe testing already performed for these changes:

#2370

/d1/personal/hsoh/git/bugfixes/bugfix_2370_aeronetv3_main10_1/MET/met/bin/ascii2nc /d1/personal/hsoh/data/discussions/discussions_1888/20221202.lev15.org.txt aeronet_v3_combined.nc -format aeronetv3

Tested with the sample files at /d1/personal/hsoh/data/discussions/discussions_1888

/d1/personal/hsoh/data/discussions/discussions_1888/GSFC_20221202.lev15.txt: contains just one site with 6 lines header
/d1/personal/hsoh/data/discussions/discussions_1888/20221202.lev15.org.txt: contains multiple sites with 6 lines header
/d1/personal/hsoh/data/discussions/discussions_1888/20221202.lev15.txt: reduced from 20221202.lev15.org.txt for unittest

#2383

/d1/personal/hsoh/git/bugfixes/bugfix_2370_aeronetv3_main10_1/MET/met/bin/ascii2nc /d1/personal/hsoh/data/MET-2383/20221209.lev15.txt 20221209.lev15.nc -format aeronetv3

ncdump 20221209.lev15.nc | grep NaN | wc -l
0
  • Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:

test with other 6 line herder inputs

  • Do these changes include sufficient documentation updates, ensuring that no errors or warnings exist in the build of the documentation? [No]

  • Do these changes include sufficient testing updates? [No]

  • Will this PR result in changes to the test suite? [No]

    If yes, describe the new output and/or changes to the existing output:

  • Please complete this pull request review by [Fill in date].

Pull Request Checklist

See the METplus Workflow for details.

  • Review the source issue metadata (required labels, projects, and milestone).
  • Complete the PR definition above.
  • Ensure the PR title matches the feature or bugfix branch name.
  • Define the PR metadata, as permissions allow.
    Select: Reviewer(s)
    Select: Organization level software support Project or Repository level development cycle Project
    Select: Milestone as the version that will include these changes
  • After submitting the PR, select Development issue with the original issue number.
  • After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
  • Close the linked issue and delete your feature or bugfix branch from GitHub.

@hsoh-u hsoh-u requested a review from jprestop January 10, 2023 18:01
Copy link
Collaborator

@jprestop jprestop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested on the files obtained in the following way:

wget --no-check-certificate -q -O 20221204.lev15 "https://aeronet.gsfc.nasa.gov/cgi-bin/print_web_data_v3?year=2022&month=12&day=04&year2=2022&month2=12&day2=04&AOD15=1&AVG=10&if_no_html=1"
wget --no-check-certificate -q -O GSFC_20221204.lev15 "https://aeronet.gsfc.nasa.gov/cgi-bin/print_web_data_v3?site=GSFC&year=2022&month=12&day=04&year2=2022&month2=12&day2=04&AOD15=1&AVG=10&if_no_html=1"

The files produced the expected results. I approve this request.

@jprestop
Copy link
Collaborator

@hsoh-u Do we need to change anything to get the Documentation error fixed?

@hsoh-u
Copy link
Collaborator Author

hsoh-u commented Jan 10, 2023

@hsoh-u Do we need to change anything to get the Documentation error fixed?

Our user guide was not updated because we don't have the documentation of AERONET V3 format. The fix was made based on the sample data file.

@hsoh-u hsoh-u merged commit f828a4f into main_v10.1 Jan 10, 2023
@JohnHalleyGotway JohnHalleyGotway deleted the bugfix_2370_aeronetv3_main10_1 branch February 28, 2023 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants