[GRASS-SVN] r44997 - in grass/trunk/imagery: i.aster.toar i.biomass
i.eb.eta i.eb.h_SEBAL01 i.eb.soilheatflux i.sunhours
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Jan 12 18:04:05 EST 2011
Author: ychemin
Date: 2011-01-12 15:04:05 -0800 (Wed, 12 Jan 2011)
New Revision: 44997
Modified:
grass/trunk/imagery/i.aster.toar/main.c
grass/trunk/imagery/i.biomass/main.c
grass/trunk/imagery/i.eb.eta/main.c
grass/trunk/imagery/i.eb.h_SEBAL01/main.c
grass/trunk/imagery/i.eb.soilheatflux/main.c
grass/trunk/imagery/i.sunhours/main.c
Log:
more explicit parameter names
Modified: grass/trunk/imagery/i.aster.toar/main.c
===================================================================
--- grass/trunk/imagery/i.aster.toar/main.c 2011-01-12 22:49:43 UTC (rev 44996)
+++ grass/trunk/imagery/i.aster.toar/main.c 2011-01-12 23:04:05 UTC (rev 44997)
@@ -108,7 +108,7 @@
input->description = _("Names of ASTER DN layers (15 layers)");
input1 = G_define_option();
- input1->key = "doy";
+ input1->key = "dayofyear";
input1->type = TYPE_DOUBLE;
input1->required = YES;
input1->gisprompt = "value";
Modified: grass/trunk/imagery/i.biomass/main.c
===================================================================
--- grass/trunk/imagery/i.biomass/main.c 2011-01-12 22:49:43 UTC (rev 44996)
+++ grass/trunk/imagery/i.biomass/main.c 2011-01-12 23:04:05 UTC (rev 44997)
@@ -60,25 +60,25 @@
input1->description = _("Name of fPAR raster map");
input2 = G_define_standard_option(G_OPT_R_INPUT);
- input2->key = "luf";
+ input2->key = "lightuseefficiency";
input2->description =
_("Name of light use efficiency raster map (UZB:cotton=1.9)");
input3 = G_define_standard_option(G_OPT_R_INPUT);
- input3->key = "lat";
+ input3->key = "latitude";
input3->description = _("Name of degree latitude raster map [dd.ddd]");
input4 = G_define_standard_option(G_OPT_R_INPUT);
- input4->key = "doy";
+ input4->key = "dayofyear";
input4->description = _("Name of Day of Year raster map [1-366]");
input5 = G_define_standard_option(G_OPT_R_INPUT);
- input5->key = "tsw";
+ input5->key = "transmissivitysingleway";
input5->description =
_("Name of single-way transmissivity raster map [0.0-1.0]");
input6 = G_define_standard_option(G_OPT_R_INPUT);
- input6->key = "wa";
+ input6->key = "wateravailability";
input6->description =
_("Value of water availability raster map [0.0-1.0]");
Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c 2011-01-12 22:49:43 UTC (rev 44996)
+++ grass/trunk/imagery/i.eb.eta/main.c 2011-01-12 23:04:05 UTC (rev 44997)
@@ -49,24 +49,23 @@
/* Define the different options */
input1 = G_define_standard_option(G_OPT_R_INPUT);
- input1->key = "rnetday";
+ input1->key = "netradiationdiurnal";
input1->description = _("Name of the diurnal Net Radiation map [W/m2]");
input1->answer = "rnetday";
input2 = G_define_standard_option(G_OPT_R_INPUT);
- input2->key = "evapfr";
+ input2->key = "evaporativefraction";
input2->description = _("Name of the evaporative fraction map [-]");
input2->answer = "evapfr";
input3 = G_define_standard_option(G_OPT_R_INPUT);
- input3->key = "tempk";
+ input3->key = "temperature";
input3->description = _("Name of the surface skin temperature [K]");
input3->answer = "tempk";
output1 = G_define_standard_option(G_OPT_R_OUTPUT);
output1->description =
_("Name of the output actual evapotranspiration layer [mm/d]");
- output1->answer = "eta";
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/trunk/imagery/i.eb.h_SEBAL01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2011-01-12 22:49:43 UTC (rev 44996)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2011-01-12 23:04:05 UTC (rev 44997)
@@ -89,65 +89,65 @@
/* Define different options */
input_Rn = G_define_standard_option(G_OPT_R_INPUT);
- input_Rn->key = "rnet";
+ input_Rn->key = "netradiation";
input_Rn->description =
_("Name of instantaneous Net Radiation raster map [W/m2]");
input_g0 = G_define_standard_option(G_OPT_R_INPUT);
- input_g0->key = "g0";
+ input_g0->key = "soilheatflux";
input_g0->description =
_("Name of instantaneous soil heat flux raster map [W/m2]");
input_z0m = G_define_standard_option(G_OPT_R_INPUT);
- input_z0m->key = "z0m";
+ input_z0m->key = "aerodynresistance";
input_z0m->description =
_("Name of aerodynamic resistance to heat momentum raster map [s/m]");
input_t0dem = G_define_standard_option(G_OPT_R_INPUT);
- input_t0dem->key = "t0dem";
+ input_t0dem->key = "temperaturemeansealevel";
input_t0dem->description =
_("Name of altitude corrected surface temperature raster map [K]");
input_ustar = G_define_option();
- input_ustar->key = "ustar";
+ input_ustar->key = "frictionvelocitystar";
input_ustar->type = TYPE_DOUBLE;
input_ustar->required = YES;
input_ustar->gisprompt = "old,value";
input_ustar->answer = "0.32407";
- input_ustar->description = _("Value of the friction velocity [m/s]");
+ input_ustar->description = _("Value of the height independent friction velocity (u*) [m/s]");
input_ustar->guisection = _("Parameters");
input_ea = G_define_option();
- input_ea->key = "ea";
+ input_ea->key = "vapourpressureactual";
input_ea->type = TYPE_DOUBLE;
input_ea->required = YES;
input_ea->answer = "1.511";
- input_ea->description = _("Value of the actual vapour pressure [KPa]");
+ input_ea->description = _("Value of the actual vapour pressure (e_act) [KPa]");
input_ea->guisection = _("Parameters");
input_row_wet = G_define_option();
- input_row_wet->key = "row_wet";
+ input_row_wet->key = "row_wet_pixel";
input_row_wet->type = TYPE_DOUBLE;
input_row_wet->required = NO;
input_row_wet->description = _("Row value of the wet pixel");
input_row_wet->guisection = _("Parameters");
input_col_wet = G_define_option();
- input_col_wet->key = "col_wet";
+ input_col_wet->key = "column_wet_pixel";
input_col_wet->type = TYPE_DOUBLE;
input_col_wet->required = NO;
input_col_wet->description = _("Column value of the wet pixel");
input_col_wet->guisection = _("Parameters");
input_row_dry = G_define_option();
- input_row_dry->key = "row_dry";
+ input_row_dry->key = "row_dry_pixel";
input_row_dry->type = TYPE_DOUBLE;
input_row_dry->required = NO;
input_row_dry->description = _("Row value of the dry pixel");
input_row_dry->guisection = _("Parameters");
input_col_dry = G_define_option();
- input_col_dry->key = "col_dry";
+ input_col_dry->key = "column_dry_pixel";
input_col_dry->type = TYPE_DOUBLE;
input_col_dry->required = NO;
input_col_dry->description = _("Column value of the dry pixel");
Modified: grass/trunk/imagery/i.eb.soilheatflux/main.c
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/main.c 2011-01-12 22:49:43 UTC (rev 44996)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c 2011-01-12 23:04:05 UTC (rev 44997)
@@ -1,7 +1,7 @@
/****************************************************************************
*
- * MODULE: i.eb.g0
+ * MODULE: i.eb.soilheatflux
* AUTHOR(S): Yann Chemin - yann.chemin at gmail.com
* PURPOSE: Calculates an approximation of soil heat flux
* as seen in Bastiaanssen (1995) using time of
@@ -63,16 +63,16 @@
input2->description = _("Name of NDVI raster map [-1.0;+1.0]");
input3 = G_define_standard_option(G_OPT_R_INPUT);
- input3->key = "tempk";
+ input3->key = "temperature";
input3->description =
_("Name of Surface temperature raster map [degree Kelvin]");
input4 = G_define_standard_option(G_OPT_R_INPUT);
- input4->key = "rnet";
+ input4->key = "netradiation";
input4->description = _("Name of Net Radiation raster map [W/m2]");
input5 = G_define_standard_option(G_OPT_R_INPUT);
- input5->key = "time";
+ input5->key = "localutctime";
input5->description =
_("Name of time of satellite overpass raster map [local UTC]");
@@ -179,4 +179,3 @@
exit(EXIT_SUCCESS);
}
-
Modified: grass/trunk/imagery/i.sunhours/main.c
===================================================================
--- grass/trunk/imagery/i.sunhours/main.c 2011-01-12 22:49:43 UTC (rev 44996)
+++ grass/trunk/imagery/i.sunhours/main.c 2011-01-12 23:04:05 UTC (rev 44997)
@@ -50,11 +50,11 @@
/* Define the different options */
input1 = G_define_standard_option(G_OPT_R_INPUT);
- input1->key = _("doy");
+ input1->key = _("dayofyear");
input1->description = _("Name of the day of year input map");
input2 = G_define_standard_option(G_OPT_R_INPUT);
- input2->key = _("lat");
+ input2->key = _("latitude");
input2->description = _("Name of the latitude input map");
output1 = G_define_standard_option(G_OPT_R_OUTPUT);
More information about the grass-commit
mailing list