[GRASS-SVN] r58554 - grass/trunk/raster/r.sun

[svn_grass at osgeo.org]

Author: neteler
Date: 2013-12-29 16:38:49 -0800 (Sun, 29 Dec 2013)
New Revision: 58554

Modified:
   grass/trunk/raster/r.sun/TODO
   grass/trunk/raster/r.sun/r.sun.html
Log:
r.sun manual: update to NC dataset; TODO file updated

Modified: grass/trunk/raster/r.sun/TODO
===================================================================
--- grass/trunk/raster/r.sun/TODO	2013-12-30 00:10:47 UTC (rev 58553)
+++ grass/trunk/raster/r.sun/TODO	2013-12-30 00:38:49 UTC (rev 58554)
@@ -1,7 +1,5 @@
 TODO
 
-11/2008: Integrate latest GRASS 7 API changes
-
 -------
 Probably the sun position calculation shouldbe replaced
 with 
@@ -12,3 +10,25 @@
 solpos.c from NREL and very precise.
 
 MN 4/2001
+
+#### 
+Update
+  http://grasswiki.osgeo.org/wiki/R.sun
+
+####
+Fix http://trac.osgeo.org/grass/ticket/498
+
+pseudo-data test-case
+http://trac.osgeo.org/grass/ticket/498#comment:22
+#spearfish (further north than NC so more defined shadows)
+g.region -d
+r.mapcalc "undulates = (2 + sin( row() * 2 ) + cos( col() * 2 )) * 500"
+r.colors undulates color=bcyr
+nviz undulates
+
+DAY=355
+time r.sun elevin=undulates day=$DAY step=0.05 \
+  beam_rad=rad_test.und.355.beam \
+  diff_rad=rad_test.und.355.diff \
+  refl_rad=rad_test.und.355.refl
+

Modified: grass/trunk/raster/r.sun/r.sun.html
===================================================================
--- grass/trunk/raster/r.sun/r.sun.html	2013-12-30 00:10:47 UTC (rev 58553)
+++ grass/trunk/raster/r.sun/r.sun.html	2013-12-30 00:38:49 UTC (rev 58554)
@@ -253,19 +253,19 @@
 
 <h2>EXAMPLES</h2>
 
-Spearfish example (considering also cast shadows):
+North Carolina example (considering also cast shadows):
 <div class="code"><pre>
-g.region rast=elevation.dem -p
+g.region rast=elevation -p
 
-# calculate horizons
-# (we put a bufferzone of 10% of maxdistance around the study area)
-r.horizon elev_in=elevation.dem horizon_step=30 bufferzone=200 horizon=horangle distance_step=0.7 maxdistance=2000
+# calculate horizon angles (to speed up the subsequent r.sun calculation)
+r.horizon elev_in=elevation horizon_step=30 bufferzone=200 horizon=horangle \
+    maxdistance=5000
 
 # slope + aspect
-r.slope.aspect elevation=elevation.dem aspect=aspect.dem slope=slope.dem
+r.slope.aspect elevation=elevation aspect=aspect.dem slope=slope.dem
 
-# calculate global radiation for day 180 at 14:00hrs
-r.sun elevation.dem horizon=horangle horizon_step=30 asp_in=aspect.dem \
+# calculate global radiation for day 180 at 14:00hrs, using r.horizon output
+r.sun elev_in=elevation horizon=horangle horizon_step=30 asp_in=aspect.dem \
       slope_in=slope.dem glob_rad=global_rad day=180 time=14
 </pre></div>
 
@@ -279,11 +279,11 @@
 g.region rast=elev_ned_30m -p
 
 # considering cast shadows
-r.sun elev_ned_30m lin=2.5 alb=0.2 day=172 \
+r.sun elev_in=elev_ned_30m lin=2.5 alb=0.2 day=172 \
       beam_rad=b172 diff_rad=d172 \
       refl_rad=r172 insol_time=it172
 
-d.mon x0
+d.mon wx0
 # show irradiation raster map [Wh.m-2.day-1]
 d.rast.leg b172
 # show insolation time raster map [h]
@@ -340,7 +340,7 @@
 <a href="http://www.grassbook.org/">r.sun script download</a>)
 <li>
 Page, J. ed. (1986). Prediction of solar radiation on inclined surfaces. Solar
-energy R&D in the European Community, series F – Solar radiation data,
+energy R&D in the European Community, series F - Solar radiation data,
 Dordrecht (D. Reidel), 3, 71, 81-83. 
 <li>
 Page, J., Albuisson, M., Wald, L. (2001). The European solar radiation atlas:
@@ -351,7 +351,7 @@
 Solar energy, 68, 33-48. 
 <li>
 Scharmer, K., Greif, J., eds., (2000). The European solar radiation atlas,
-Vol. 2: Database and exploitation software. Paris (Les Presses de l’ École
+Vol. 2: Database and exploitation software. Paris (Les Presses de l'École
 des Mines).
 <li>
 Joint Research Centre: <a href="http://re.jrc.ec.europa.eu/pvgis/">GIS solar radiation database for Europe</a> and