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

Jump to bottom

r.sun: Incorrect beam radiation for some steep inclined surfaces #2534

Merged
merged 13 commits into from
Mar 23, 2023
Merged

r.sun: Incorrect beam radiation for some steep inclined surfaces #2534

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8be3abe
Issue was that direct beam radiation falling on the back of some stee…
andrewg-cse Aug 24, 2022
1d4338a
Additional tests for incorrect beam radiation fix
andrewg-cse Sep 6, 2022
aead872
Indent code
wenzeslaus Sep 7, 2022
db76e4f
Merge main with indent into r.sun_facing_away_from_sun_fix with selec…
wenzeslaus Sep 7, 2022
294afb2
Altered to used compressed tifs
andrewg-cse Sep 12, 2022
d293e6b
Merge branch 'r.sun_facing_away_from_sun_fix' of github.com:andrewg-c…
andrewg-cse Sep 12, 2022
bb547c4
apply clang-format
nilason Mar 6, 2023
c31c910
Merge branch 'main' into r.sun_facing_away_from_sun_fix
nilason Mar 6, 2023
ed1ac47
revert bad merge conflict fixes
nilason Mar 6, 2023
f739325
fix -Werror=maybe-uninitialized
petrasovaa Mar 16, 2023
250552f
rewrite test to make it simple
petrasovaa Mar 17, 2023
5c50191
Merge remote-tracking branch 'upstream/main' into r.sun_facing_away_f…
petrasovaa Mar 18, 2023
32dbb7b
black and reformat long string
petrasovaa Mar 18, 2023
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
18 changes: 15 additions & 3 deletions raster/r.sun/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,6 +1711,7 @@ void calculate(double singleSlope, double singleAspect, double singleAlbedo,
double locTimeOffset;
double latitude, longitude;
double coslat;
bool shouldBeBestAM, isBestAM;


struct SunGeometryConstDay sunGeom;
Expand Down Expand Up @@ -1838,7 +1839,7 @@ void calculate(double singleSlope, double singleAspect, double singleAlbedo,
}
sunVarGeom.zmax = zmax;
shadowoffset_base = (j % (numRows)) * n * arrayNumInt;
#pragma omp parallel firstprivate(q1,tan_lam_l,z1,i,shadowoffset,longitTime,coslat,coslatsq,latitude,longitude,sin_phi_l,latid_l,sin_u,cos_u,sin_v,cos_v,lum,gridGeom,elevin,aspin,slopein,civiltime,linkein,albedo,latin,coefbh,coefdh,incidout,longin,horizon,beam_rad,insol_time,diff_rad,refl_rad,glob_rad,mapset,per,decimals,str_step)
#pragma omp parallel firstprivate(q1,tan_lam_l,z1,i,shadowoffset,longitTime,coslat,coslatsq,latitude,longitude,sin_phi_l,latid_l,sin_u,cos_u,sin_v,cos_v,lum,gridGeom,elevin,aspin,slopein,civiltime,linkein,albedo,latin,coefbh,coefdh,incidout,longin,horizon,beam_rad,insol_time,diff_rad,refl_rad,glob_rad,mapset,per,decimals,str_step,shouldBeBestAM,isBestAM)
{
#pragma omp for schedule(dynamic) \
firstprivate(sunGeom,sunVarGeom,sunSlopeGeom,sunRadVar) \
Expand Down Expand Up @@ -1952,8 +1953,19 @@ void calculate(double singleSlope, double singleAspect, double singleAlbedo,

q1 = gridGeom.sinlat * cos_u * sin_v +
gridGeom.coslat * sin_u;
tan_lam_l = -cos_u * cos_v / q1;
sunSlopeGeom.longit_l = atan(tan_lam_l);

if (q1 != 0.0) {
tan_lam_l = -cos_u * cos_v / q1;
sunSlopeGeom.longit_l = atan(tan_lam_l);
isBestAM = (tan_lam_l > 0);
} else {
sunSlopeGeom.longit_l = pihalf;
isBestAM = true;
}

shouldBeBestAM = (0.0 < sunSlopeGeom.aspect && sunSlopeGeom.aspect <= M_PI);
sunSlopeGeom.shift12hrs = (shouldBeBestAM != isBestAM);

sunSlopeGeom.lum_C31_l = cos(latid_l) * sunGeom.cosdecl;
sunSlopeGeom.lum_C33_l = sin_phi_l * sunGeom.sindecl;

Expand Down
10 changes: 7 additions & 3 deletions raster/r.sun/rsunlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,10 @@ double lumcline2(struct SunGeometryConstDay *sungeom,
/* func = cube; */
sunVarGeom->isShadow = 0;

double timeOffset = 0;
if (sunSlopeGeom->shift12hrs)
timeOffset = M_PI;

if (useShadow()) {
length = 0;

Expand Down Expand Up @@ -383,7 +387,7 @@ double lumcline2(struct SunGeometryConstDay *sungeom,
}
*/
s = sunSlopeGeom->lum_C31_l
* cos(-sungeom->timeAngle - sunSlopeGeom->longit_l)
* cos(-sungeom->timeAngle - sunSlopeGeom->longit_l + timeOffset)
+ sunSlopeGeom->lum_C33_l; /* Jenco */
}

Expand All @@ -409,7 +413,7 @@ double lumcline2(struct SunGeometryConstDay *sungeom,
}
*/
s = sunSlopeGeom->lum_C31_l
* cos(-sungeom->timeAngle - sunSlopeGeom->longit_l)
* cos(-sungeom->timeAngle - sunSlopeGeom->longit_l + timeOffset)
+ sunSlopeGeom->lum_C33_l; /* Jenco */
}
}
Expand All @@ -424,7 +428,7 @@ double lumcline2(struct SunGeometryConstDay *sungeom,
}
*/
s = sunSlopeGeom->lum_C31_l
* cos(-sungeom->timeAngle - sunSlopeGeom->longit_l)
* cos(-sungeom->timeAngle - sunSlopeGeom->longit_l + timeOffset)
+ sunSlopeGeom->lum_C33_l; /* Jenco */
}

Expand Down
2 changes: 1 addition & 1 deletion raster/r.sun/sunradstruct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ struct SunGeometryVarSlope
double lum_C33_l;
double slope;
double aspect;

bool shift12hrs;
};


Expand Down