[GRASS-SVN] r35938 - grass/trunk/raster/r.sun2
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Feb 19 05:31:28 EST 2009
Author: neteler
Date: 2009-02-19 05:31:28 -0500 (Thu, 19 Feb 2009)
New Revision: 35938
Modified:
grass/trunk/raster/r.sun2/main.c
Log:
merged pre-fork updates from old r.sun into r.sun2
Modified: grass/trunk/raster/r.sun2/main.c
===================================================================
--- grass/trunk/raster/r.sun2/main.c 2009-02-19 10:24:21 UTC (rev 35937)
+++ grass/trunk/raster/r.sun2/main.c 2009-02-19 10:31:28 UTC (rev 35938)
@@ -27,6 +27,7 @@
/*v. 2.0 July 2002, NULL data handling, JH */
/*v. 2.1 January 2003, code optimization by Thomas Huld, JH */
+/*v. 3.0 February 2006, several changes (shadowing algorithm, earth's curvature JH */
#include <stdio.h>
#include <stdlib.h>
@@ -63,13 +64,9 @@
const double deg2rad = M_PI / 180.;
const double rad2deg = 180. / M_PI;
-
-
FILE *felevin, *faspin, *fslopein, *flinkein, *falbedo, *flatin;
FILE *fincidout, *fbeam_rad, *finsol_time, *fdiff_rad, *frefl_rad;
-FILE *fw;
-
const char *elevin;
const char *aspin;
const char *slopein;
@@ -220,11 +217,13 @@
G_gisinit(argv[0]);
module = G_define_module();
+ module->keywords = _("raster");
+ module->label = _("Solar irradiance and irradiation model.");
module->description =
_("Computes direct (beam), diffuse and reflected solar irradiation raster "
"maps for given day, latitude, surface and atmospheric conditions. Solar "
"parameters (e.g. sunrise, sunset times, declination, extraterrestrial "
- "irradiance, daylight length) are saved in a local text file. "
+ "irradiance, daylight length) are saved in the map history file. "
"Alternatively, a local time can be specified to compute solar "
"incidence angle and/or irradiance raster maps. The shadowing effect of "
"the topography is optionally incorporated.");
@@ -371,6 +370,7 @@
parm.incidout->key = "incidout";
parm.incidout->type = TYPE_STRING;
parm.incidout->required = NO;
+ parm.incidout->gisprompt = "new,cell,raster";
parm.incidout->description = _("Output incidence angle raster map (mode 1 only)");
parm.incidout->guisection = _("Output_options");
@@ -378,6 +378,7 @@
parm.beam_rad->key = "beam_rad";
parm.beam_rad->type = TYPE_STRING;
parm.beam_rad->required = NO;
+ parm.beam_rad->gisprompt = "new,cell,raster";
parm.beam_rad->description =
_("Output beam irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
parm.beam_rad->guisection = _("Output_options");
@@ -386,6 +387,7 @@
parm.insol_time->key = "insol_time";
parm.insol_time->type = TYPE_STRING;
parm.insol_time->required = NO;
+ parm.insol_time->gisprompt = "new,cell,raster";
parm.insol_time->description = _("Output insolation time raster map [h] (mode 2 only)");
parm.insol_time->guisection = _("Output_options");
@@ -393,6 +395,7 @@
parm.diff_rad->key = "diff_rad";
parm.diff_rad->type = TYPE_STRING;
parm.diff_rad->required = NO;
+ parm.diff_rad->gisprompt = "new,cell,raster";
parm.diff_rad->description =
_("Output diffuse irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
parm.diff_rad->guisection = _("Output_options");
@@ -401,6 +404,7 @@
parm.refl_rad->key = "refl_rad";
parm.refl_rad->type = TYPE_STRING;
parm.refl_rad->required = NO;
+ parm.refl_rad->gisprompt = "new,cell,raster";
parm.refl_rad->description =
_("Output ground reflected irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
parm.refl_rad->guisection = _("Output_options");
@@ -409,6 +413,7 @@
parm.glob_rad->key = "glob_rad";
parm.glob_rad->type = TYPE_STRING;
parm.glob_rad->required = NO;
+ parm.glob_rad->gisprompt = "new,cell,raster";
parm.glob_rad->description =
_("Output global (total) irradiance/irradiation [W.m-2] (mode 1) or irradiance/irradiation raster map [Wh.m-2.day-1] (mode 2)");
parm.glob_rad->guisection = _("Output_options");
@@ -581,11 +586,10 @@
setHorizonInterval(deg2rad * horizonStep);
else
G_fatal_error(_("The horizon step size must be greater than 0."));
-
}
- else if(useHorizonData()) {
+ else if(useHorizonData()) {
G_fatal_error(_("If you use the horizon option you must also set the 'horizonstep' parameter."));
- }
+ }
tt = parm.ltime->answer;
@@ -597,8 +601,8 @@
}
else {
if (incidout != NULL)
- G_fatal_error(_("incidout requres time parameter to be set"));
- G_message(_("Mode 2: integrated daily irradiation"));
+ G_fatal_error(_("incidout requires time parameter to be set"));
+ G_message(_("Mode 2: integrated daily irradiation for a given day of the year"));
}
/*
@@ -630,7 +634,9 @@
*/
/* HB 6/2008: why is the above commented out? instead of sscanf, maybe nicer to use:
G_scan_lat(parm.lat->answer, &latitude);
-*/
+ MN 2/2009: latitude doesn't exist! also G_scan_lat() does not exist in GRASS
+*/
+
if (parm.slopein->answer == NULL)
sscanf(parm.slope->answer, "%lf", &singleSlope);
singleSlope *= deg2rad;
@@ -652,9 +658,7 @@
* must be one.
*/
G_fatal_error(_("If you use -s and no horizon rasters, numpartitions must be =1"));
-
}
-
}
gridGeom.stepxy = dist * 0.5 * (gridGeom.stepx + gridGeom.stepy);
@@ -686,7 +690,6 @@
}
else if (useHorizonData()) {
arrayNumInt = (int)(360. / horizonStep);
-
}
}
else {
@@ -709,7 +712,7 @@
/* Set up parameters for projection to lat/long if necessary */
-
+ if (latin == NULL && lt == NULL && (G_projection() != PROJECTION_LL)) {
struct Key_Value *in_proj_info, *in_unit_info;
if ((in_proj_info = G_get_projinfo()) == NULL)
@@ -731,8 +734,8 @@
sprintf(oproj.proj, "ll");
if ((oproj.pj = pj_latlong_from_proj(iproj.pj)) == NULL)
G_fatal_error(_("Unable to set up lat/long projection parameters"));
+ }
-
/**********end of parser - ******************************/
if ((G_projection() == PROJECTION_LL)) {
@@ -1822,6 +1825,9 @@
la_min = AMIN1(la_min, latitude);
latitude *= deg2rad;
}
+ /* MN 2/2009: should it be??
+ if (latin == NULL && lt == NULL && (G_projection() != PROJECTION_LL)) {
+ */
if ((G_projection() != PROJECTION_LL)) {
longitude = gridGeom.xp;
More information about the grass-commit
mailing list