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.

Sign up for GitHub

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

Time zone fix for NSRDB MSG V1.0.0 #1140

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Time zone fix for NSRDB MSG V1.0.0 #1140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions shared/lib_weatherfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static float col_or_nan(const std::string& s)
}
}
else
return std::numeric_limits<float>::quiet_NaN();;
return std::numeric_limits<float>::quiet_NaN();
}

static double conv_deg_min_sec(double degrees,
Expand Down Expand Up @@ -824,9 +824,11 @@ bool weatherfile::open(const std::string& file, bool header_only)
{
m_hdr.lon = col_or_nan(value);
}
else if (name == "tz" || name == "timezone" || name == "time zone") // require "time zone" and "local time zone" columns in NSRDB files are the same
else if (name == "tz" || name == "timezone" || name == "time zone" || name == "local time zone") // require "time zone" and "local time zone" columns in NSRDB files are the same
{
m_hdr.tz = col_or_nan(value);
// some nsrdb endpoints like nsrdb-msg-v1-0-0 have both "local time zone" and "time zone" with "time zone" empty, so we need to read "local time zone" and ignore "time zone"
if (std::isnan(m_hdr.tz)) // only assign value if one was not assigned in an earlier pass
m_hdr.tz = col_or_nan(value);
}
else if (name == "el" || name == "elev" || name == "elevation" || name == "site elevation" || name == "altitude")
{
Expand Down
Loading