Skip to content

Bug fix: ASHRAE clear sky model (used in DESCOND) #485

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

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Bug fix: ASHRAE clear sky model (used in DESCOND) #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57a53cd
Test modification
chipbarnaby Apr 26, 2024
49c5176
Merge branch 'main' into descond-solar
chipbarnaby Apr 29, 2024
ff97db4
Fix typo in ASHRAE clear sky model (ASHRAETauModel())
chipbarnaby Apr 29, 2024
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
4 changes: 2 additions & 2 deletions src/cgwthr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,8 @@ RC DESCOND::dc_CheckFixSolar(
else
{ float ebn, edh;
/*float egl =*/ slASHRAETauModel(sunZen, dc_tauB, dc_tauD, ebn, edh);
if (frDiff( ebn, dc_ebnSlrNoon) > .01f
|| frDiff( edh, dc_edhSlrNoon) > .01f)
if (frDiff( ebn, dc_ebnSlrNoon) > .001f
|| frDiff( edh, dc_edhSlrNoon) > .001f)
oWarn( "ebn/edh mismatch");
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/solar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,8 +1053,8 @@ static bool slASHRAETauModelInv( // derive tauB/tauD from irradiance
// calculate Jacobian
double Jbb = 1.0 / tauB + logm * (-0.406 + 0.021 * tauD);
double Jbd = logm * (-0.268 + 0.021 * tauB);
double Jdb = logm * (+0.205 - 0.190 * tauD);
double Jdd = 1.0 / tauD + logm * (-0.080 - 0.190 * tauB);
double Jdb = logm * (+0.205 - 0.190 * tauD);

// solve system {-F} = [J]{dtau} using Cramer's rule
double detJ = Jbb * Jdd - Jdb * Jbd;
Expand Down Expand Up @@ -2849,7 +2849,7 @@ float ASHRAETauModel( // ASHRAE "tau" clear sky model
double ab,ad;
if (options & 1)
{ // 2013 form
ab = 1.454 - 0.406*tauB - 0.268*tauD - 0.021*tauB*tauD;
ab = 1.454 - 0.406*tauB - 0.268*tauD + 0.021*tauB*tauD;
ad = 0.507 + 0.205*tauB - 0.080*tauD - 0.190*tauB*tauD;
}
else
Expand Down