[GRASS-SVN] r44996 - in grass/trunk: gui/wxpython/xml
imagery/i.eb.netrad imagery/i.evapo.mh imagery/i.evapo.pm
imagery/i.evapo.pt
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Jan 12 17:49:43 EST 2011
Author: ychemin
Date: 2011-01-12 14:49:43 -0800 (Wed, 12 Jan 2011)
New Revision: 44996
Modified:
grass/trunk/gui/wxpython/xml/menudata.xml
grass/trunk/imagery/i.eb.netrad/main.c
grass/trunk/imagery/i.evapo.mh/main.c
grass/trunk/imagery/i.evapo.pm/main.c
grass/trunk/imagery/i.evapo.pt/main.c
Log:
more explicit parameter names
Modified: grass/trunk/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.xml 2011-01-12 16:25:36 UTC (rev 44995)
+++ grass/trunk/gui/wxpython/xml/menudata.xml 2011-01-12 22:49:43 UTC (rev 44996)
@@ -2776,7 +2776,7 @@
<help>Computes temporal integration of satellite ET actual (ETa) following the daily ET reference (ETo) from meteorological station(s)</help>
<keywords>imagery,evapotranspiration,temporal,integration</keywords>
<handler>OnMenuCmd</handler>
- <command>i.evapo.time_integration</command>
+ <command>i.evapo.time</command>
</menuitem>
<separator />
<menuitem>
@@ -2784,21 +2784,21 @@
<help>reference evapotranspiration (Hargreaves, modified-H, H and Samani)</help>
<keywords>imagery,reference evapotranspiration,Hargreaves,Samani</keywords>
<handler>OnMenuCmd</handler>
- <command>i.evapo.MH</command>
+ <command>i.evapo.mh</command>
</menuitem>
<menuitem>
<label>Penman-Monteith Evapotranspiration</label>
<help>reference evapotranspiration (FAO 56 and Penman, 1972)</help>
<keywords>imagery,reference evapotranspiration,FAO56,Penman-Monteith,HydroFOSS</keywords>
<handler>OnMenuCmd</handler>
- <command>i.evapo.PM</command>
+ <command>i.evapo.pm</command>
</menuitem>
<menuitem>
<label>Priestley-Taylor Evapotranspiration</label>
<help>reference evapotranspiration (Priestley and Taylor, 1972)</help>
<keywords>imagery,reference evapotranspiration,Priestley-Taylor</keywords>
<handler>OnMenuCmd</handler>
- <command>i.evapo.PT</command>
+ <command>i.evapo.pt</command>
</menuitem>
</items>
</menu>
Modified: grass/trunk/imagery/i.eb.netrad/main.c
===================================================================
--- grass/trunk/imagery/i.eb.netrad/main.c 2011-01-12 16:25:36 UTC (rev 44995)
+++ grass/trunk/imagery/i.eb.netrad/main.c 2011-01-12 22:49:43 UTC (rev 44996)
@@ -71,19 +71,19 @@
input2->answer = _("ndvi");
input3 = G_define_standard_option(G_OPT_R_INPUT);
- input3->key = _("tempk");
+ input3->key = _("temperature");
input3->description =
_("Name of the Surface temperature map [degree Kelvin]");
input3->answer = _("tempk");
input4 = G_define_standard_option(G_OPT_R_INPUT);
- input4->key = _("time");
+ input4->key = _("localutctime");
input4->description =
_("Name of the map of local UTC time of satellite overpass [hh.hhh]");
input4->answer = _("time");
input5 = G_define_standard_option(G_OPT_R_INPUT);
- input5->key = _("dtair");
+ input5->key = _("temperaturedifference2m");
input5->description =
_("Name of the difference of temperature from surface skin to about 2 m height [K]");
input5->answer = _("dtair");
@@ -94,25 +94,23 @@
input6->answer = _("emissivity");
input7 = G_define_standard_option(G_OPT_R_INPUT);
- input7->key = _("tsw");
+ input7->key = _("transmissivitysingleway");
input7->description =
_("Name of the single-way atmospheric transmissivitymap [-]");
input7->answer = _("tsw");
input8 = G_define_standard_option(G_OPT_R_INPUT);
- input8->key = _("doy");
+ input8->key = _("dayofyear");
input8->description = _("Name of the Day Of Year (DOY) map [-]");
input8->answer = _("doy");
input9 = G_define_standard_option(G_OPT_R_INPUT);
- input9->key = _("sunzangle");
+ input9->key = _("sunzenithangle");
input9->description = _("Name of the sun zenith angle map [degrees]");
input9->answer = _("sunzangle");
- output1 = G_define_standard_option(G_OPT_R_INPUT);
- output1->key = _("rnet");
- output1->description = _("Name of the output rnet layer");
- output1->answer = _("rnet");
+ output1 = G_define_standard_option(G_OPT_R_OUTPUT);
+ output1->description = _("Name of the output net radiation layer");
/********************/
if (G_parser(argc, argv))
Modified: grass/trunk/imagery/i.evapo.mh/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.mh/main.c 2011-01-12 16:25:36 UTC (rev 44995)
+++ grass/trunk/imagery/i.evapo.mh/main.c 2011-01-12 22:49:43 UTC (rev 44996)
@@ -74,23 +74,23 @@
/* Define different options */
input_RNET = G_define_standard_option(G_OPT_R_INPUT);
- input_RNET->key = "rnetd";
+ input_RNET->key = "netradiationdiurnal";
input_RNET->description = _("Name of input diurnal net radiation raster map [W/m2/d]");
input_TEMPKAVG = G_define_standard_option(G_OPT_R_INPUT);
- input_TEMPKAVG->key = "tempkavg";
+ input_TEMPKAVG->key = "averagetemperature";
input_TEMPKAVG->description = _("Name of input average air temperature raster map [C]");
input_TEMPKMIN = G_define_standard_option(G_OPT_R_INPUT);
- input_TEMPKMIN->key = "tempkmin";
+ input_TEMPKMIN->key = "minimumtemperature";
input_TEMPKMIN->description = _("Name of input minimum air temperature raster map [C]");
input_TEMPKMAX = G_define_standard_option(G_OPT_R_INPUT);
- input_TEMPKMAX->key = "tempkmax";
+ input_TEMPKMAX->key = "maximumtemperature";
input_TEMPKMAX->description = _("Name of input maximum air temperature raster map [C]");
input_P = G_define_standard_option(G_OPT_R_INPUT);
- input_P->key = "prec";
+ input_P->key = "precipitation";
input_P->label =
_("Name of precipitation raster map [mm/month]");
input_P->description = _("Disabled for original Hargreaves (1985)");
Modified: grass/trunk/imagery/i.evapo.pm/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.pm/main.c 2011-01-12 16:25:36 UTC (rev 44995)
+++ grass/trunk/imagery/i.evapo.pm/main.c 2011-01-12 22:49:43 UTC (rev 44996)
@@ -65,24 +65,24 @@
input_DEM->description = _("Name of input elevation raster map [m a.s.l.]");
input_T = G_define_standard_option(G_OPT_R_INPUT);
- input_T->key = "temp";
+ input_T->key = "temperature";
input_T->description = _("Name of input temperature raster map [C]");
input_RH = G_define_standard_option(G_OPT_R_INPUT);
- input_RH->key = "ru";
- input_RH->description = _("Name of input relative umidity raster map [%]");
+ input_RH->key = "relativehumidity";
+ input_RH->description = _("Name of input relative humidity raster map [%]");
input_u2 = G_define_standard_option(G_OPT_R_INPUT);
- input_u2->key = "ws";
+ input_u2->key = "windspeed";
input_u2->description = _("Name of input wind speed raster map [m/s]");
input_Rn = G_define_standard_option(G_OPT_R_INPUT);
- input_Rn->key = "nsr";
+ input_Rn->key = "netradiation";
input_Rn->description =
_("Name of input net solar radiation raster map [MJ/m2/h]");
input_hc = G_define_standard_option(G_OPT_R_INPUT);
- input_hc->key = "vh";
+ input_hc->key = "cropheight";
input_hc->description = _("Name of input crop height raster map [m]");
output = G_define_standard_option(G_OPT_R_OUTPUT);
Modified: grass/trunk/imagery/i.evapo.pt/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.pt/main.c 2011-01-12 16:25:36 UTC (rev 44995)
+++ grass/trunk/imagery/i.evapo.pt/main.c 2011-01-12 22:49:43 UTC (rev 44996)
@@ -71,23 +71,23 @@
/* Define different options */
input_RNET = G_define_standard_option(G_OPT_R_INPUT);
- input_RNET->key = "rnet";
+ input_RNET->key = "netradiation";
input_RNET->description = _("Name of input net radiation raster map [W/m2]");
input_G0 = G_define_standard_option(G_OPT_R_INPUT);
- input_G0->key = "go";
+ input_G0->key = "soilheatflux";
input_G0->description = _("Name of input soil heat flux raster map [W/m2]");
input_TEMPKA = G_define_standard_option(G_OPT_R_INPUT);
- input_TEMPKA->key = "tempka";
+ input_TEMPKA->key = "airtemperature";
input_TEMPKA->description = _("Name of input air temperature raster map [K]");
input_PATM = G_define_standard_option(G_OPT_R_INPUT);
- input_PATM->key = "patm";
+ input_PATM->key = "atmosphericpressure";
input_PATM->description = _("Name of input atmospheric pressure raster map [millibars]");
input_PT = G_define_option();
- input_PT->key = "pt";
+ input_PT->key = "priestleytaylorcoef";
input_PT->type = TYPE_DOUBLE;
input_PT->required = YES;
input_PT->description = _("Prestley-Taylor coefficient");
More information about the grass-commit
mailing list