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

Sorts the list of FLUXNET csv files returned from glob. #2836

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

DanielAdriaansen
Copy link
Contributor

Closes #2834.

In the metplus.log file, I see for each season (DJF, MAM, JJA, SON), the list of FLUXNET sites is now always alphabetical:

Starting Terrestrial Coupling Index Calculation for: DJF
FOUND FLUXNET FILES FOR STATIONS:
['AR-SLu', 'AT-Neu', 'AU-ASM', 'AU-Ade', 'AU-Cpr', 'AU-Cum', 'AU-DaP', 'AU-DaS', 'AU-Dry', 'AU-Emr', 'AU-Fog', 'AU-GWW', 'AU-Gin', 'AU-How', 'AU-Lox', 'AU-RDF', 'AU-Rig', 'AU-Rob', 'AU-Stp', 'AU-TTE', 'AU-Tum', 'AU-Wac', 'AU-Whr', 'AU-Wom', 'AU-Ync', 'BE-Lon', 'BE-Vie', 'BR-Sa3', 'CA-Gro', 'CA-NS1', 'CA-NS2', 'CA-NS3', 'CA-NS4', 'CA-NS5', 'CA-NS6', 'CA-NS7', 'CA-Oas', 'CA-Obs', 'CA-Qfo', 'CA-SF1', 'CA-SF2', 'CA-SF3', 'CA-TP1', 'CA-TP2', 'CA-TP3', 'CA-TP4', 'CA-TPD', 'CH-Cha', 'CH-Dav', 'CH-Fru', 'CH-Lae', 'CH-Oe1', 'CH-Oe2', 'CN-Cha', 'CN-Cng', 'CN-Dan', 'CN-Din', 'CN-Du2', 'CN-Du3', 'CN-Ha2', 'CN-HaM', 'CN-Qia', 'CN-Sw2', 'CZ-BK1', 'CZ-BK2', 'DE-Geb', 'DE-Gri', 'DE-Hai', 'DE-Kli', 'DE-Lkb', 'DE-Lnf', 'DE-Obe', 'DE-Seh', 'DE-Tha', 'DK-Eng', 'DK-Fou', 'DK-Sor', 'ES-Amo', 'ES-LJu', 'ES-LgS', 'FI-Hyy', 'FI-Jok', 'FI-Sod', 'FR-Gri', 'FR-LBr', 'GF-Guy', 'GH-Ank', 'GL-ZaH', 'IT-BCi', 'IT-CA1', 'IT-CA2', 'IT-CA3', 'IT-Col', 'IT-Cp2', 'IT-Cpz', 'IT-Isp', 'IT-Lav', 'IT-MBo', 'IT-Noe', 'IT-PT1', 'IT-Ren', 'IT-Ro1', 'IT-Ro2', 'IT-SR2', 'IT-SRo', 'IT-Tor', 'JP-MBF', 'JP-SMF', 'MY-PSO', 'NL-Loo', 'PA-SPn', 'PA-SPs', 'RU-Fyo', 'RU-Ha1', 'SD-Dem', 'SJ-Blv', 'SN-Dhr', 'US-AR1', 'US-AR2', 'US-ARM', 'US-ARb', 'US-ARc', 'US-Blo', 'US-CRT', 'US-Cop', 'US-GLE', 'US-Goo', 'US-IB2', 'US-KS1', 'US-KS2', 'US-LWW', 'US-Lin', 'US-MMS', 'US-Me1', 'US-Me2', 'US-Me3', 'US-Me4', 'US-Me5', 'US-Me6', 'US-NR1', 'US-Ne1', 'US-Ne2', 'US-Ne3', 'US-Oho', 'US-PFa', 'US-Prr', 'US-SRC', 'US-SRG', 'US-SRM', 'US-Sta', 'US-Syv', 'US-Ton', 'US-Tw2', 'US-Tw3', 'US-UMB', 'US-UMd', 'US-Var', 'US-WCr', 'US-Whs', 'US-Wkg', 'ZM-Mon']

And, in the MPR file from Point-Stat, the sites are listed alphabetically as well.

  • Describe testing already performed for these changes:

  • Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:

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

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

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

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

  • Do these changes introduce new SonarQube findings? [Yes or No]

    If yes, please describe:

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

Pull Request Checklist

See the METplus Workflow for details.

  • Add any new Python packages to the METplus Components Python Requirements table.
  • For any new datasets, an entry to the METplus Verification Datasets Guide.
  • 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) and Development issue
    Select: Milestone as the version that will include these changes
    Select: Coordinated METplus-X.Y Support project for bugfix releases or METplus-Wrappers-X.Y.Z Development project for official releases
  • After submitting the PR, select the ⚙️ icon in the Development section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected.
  • 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.

@DanielAdriaansen DanielAdriaansen added this to the METplus-6.0.0 milestone Dec 13, 2024
@DanielAdriaansen DanielAdriaansen linked an issue Dec 13, 2024 that may be closed by this pull request
24 tasks
Copy link
Collaborator

@georgemccabe georgemccabe left a comment

Choose a reason for hiding this comment

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

@DanielAdriaansen and I looked at the output and are OK with the changes. I will make the same change for main_v6.0 and update the truth data for both.

@georgemccabe georgemccabe merged commit d19d396 into develop Dec 16, 2024
76 of 77 checks passed
@georgemccabe georgemccabe deleted the bugfix_2834_tci_diffs branch December 16, 2024 17:50
georgemccabe pushed a commit that referenced this pull request Dec 16, 2024
georgemccabe pushed a commit that referenced this pull request Dec 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: 🏁 Done
Development

Successfully merging this pull request may close these issues.

Bugfix: Fix differences from TCI use case
2 participants