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

Final code changes to close #15 #147

Merged
merged 1 commit into from
May 28, 2021
Merged

Conversation

rogerfraser
Copy link
Member

Overview

This pull request closes #15 and fixes a minor defect in the renaming of discontinuity sites:

import

  • Bug fix: When discontinuity sites identified in non-SINEX files are found (c.f. Extend discontinuity renaming functionality, bug fix and other enhancements #88), the convention is to rename the station and its appearance in all associated measurements as <station-name>_yyyydoy, where doy is a three digit string regardless of the day of year. This pull request fixes a defect relating to naming stations when the day of year of the measurement epoch is less than 10 and/or 100. For days of the year less than 10 and/or 100, import now correctly inserts the correct number of zeros into the new discontinuity site name as per the convention. For example, the date 01.01.2010 is now correctly written as <station-name>_2010001 (previous versions would have written this as <station-name>_20101). Note that this defect does not affect the way discontinuities are handled.

adjust

  • Enhancement: This enhancement closes Extending discontinuity renaming functionality #15. When specifying stations to constrain from the adjust command line, this enhancement takes renaming into account if a discontinuity file was introduced by import. For example, if the option and argument --constraints "ALIC,CCC" is provided to adjust and ALIC is a known discontinuity site, the station and its constraint will be interpreted on the fly as ALIC_yyydoy,CCC. This enables the static referencing of discontinuity sites by their primary name irrespective of new events or date changes relating to that site in the discontinuities file.

All applications

  • Warning: To deliver this enhancement, a new field (stationNameOrig) has been added to the binary station file struct (see here). This affects all DynAdjust applications. The practical implication of this change for all users is that binary station files (*.bst) created by previous versions of import cannot be read by this or future versions of geoid, reftran, segment, adjust or plot, and will need to be recreated by import.

@coveralls
Copy link
Collaborator

Coverage Status

Coverage increased (+0.04%) to 81.92% when pulling d76bea9 on rogerfraser:master into fda5e8f on icsm-au:master.

@codecov-commenter
Copy link

Codecov Report

Merging #147 (d76bea9) into master (fda5e8f) will increase coverage by 0.04%.
The diff coverage is 92.30%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #147      +/-   ##
==========================================
+ Coverage   82.10%   82.14%   +0.04%     
==========================================
  Files         117      117              
  Lines       32346    32385      +39     
==========================================
+ Hits        26558    26603      +45     
+ Misses       5788     5782       -6     
Impacted Files Coverage Δ
dynadjust/dynadjust/dnaadjust/dnaadjust.hpp 96.36% <ø> (ø)
dynadjust/include/io/dnaiosnxread.cpp 59.57% <66.66%> (+0.06%) ⬆️
dynadjust/dynadjust/dnaadjust/dnaadjust.cpp 89.11% <86.36%> (+0.09%) ⬆️
...st/dynadjust/dnaadjustwrapper/dnaadjustwrapper.cpp 92.27% <100.00%> (+0.15%) ⬆️
dynadjust/dynadjust/dnaimport/dnainterop.cpp 76.19% <100.00%> (+<0.01%) ⬆️
dynadjust/include/config/dnaprojectfile.cpp 74.67% <100.00%> (+0.02%) ⬆️
dynadjust/include/config/dnatypes.hpp 98.03% <100.00%> (+0.03%) ⬆️
dynadjust/include/functions/dnatemplatefuncs.hpp 75.40% <100.00%> (+0.54%) ⬆️
dynadjust/include/io/dnaiosnx.hpp 100.00% <100.00%> (+5.00%) ⬆️
dynadjust/include/measurement_types/dnastation.cpp 76.83% <100.00%> (+0.22%) ⬆️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fda5e8f...d76bea9. Read the comment docs.

@rogerfraser rogerfraser merged commit f5e13cb into icsm-au:master May 28, 2021
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.

Extending discontinuity renaming functionality
3 participants