[GRASS-SVN] r59172 - in grass/trunk: imagery/i.atcorr imagery/i.evapo.pm imagery/i.landsat.toar imagery/i.topo.corr lib/arraystats lib/raster raster/r.sunmask raster/r.watershed/ram vector/v.net.salesman
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Mar 2 19:53:36 PST 2014
Author: hamish
Date: 2014-03-02 19:53:36 -0800 (Sun, 02 Mar 2014)
New Revision: 59172
Modified:
grass/trunk/imagery/i.atcorr/computations.cpp
grass/trunk/imagery/i.evapo.pm/functions.c
grass/trunk/imagery/i.landsat.toar/landsat.h
grass/trunk/imagery/i.topo.corr/main.c
grass/trunk/lib/arraystats/class.c
grass/trunk/lib/raster/color_look.c
grass/trunk/lib/raster/color_set.c
grass/trunk/raster/r.sunmask/g_solposition.c
grass/trunk/raster/r.sunmask/main.c
grass/trunk/raster/r.watershed/ram/do_flatarea.c
grass/trunk/vector/v.net.salesman/main.c
Log:
remove non-ASCII chars
Modified: grass/trunk/imagery/i.atcorr/computations.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/computations.cpp 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/imagery/i.atcorr/computations.cpp 2014-03-03 03:53:36 UTC (rev 59172)
@@ -1106,7 +1106,7 @@
ig++;
/* successive orders
- multiple scattering source function at every level within the laye */
+ multiple scattering source function at every level within the layer */
for(k = 1; k <= mu; k++)
{
for(int i = 0; i <= snt; i++)
Modified: grass/trunk/imagery/i.evapo.pm/functions.c
===================================================================
--- grass/trunk/imagery/i.evapo.pm/functions.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/imagery/i.evapo.pm/functions.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -11,7 +11,7 @@
/* constant definition */
/* #define k_sb 4.903 //[MJ/m2*h] Stefan Bolzman constant */
-#define cp 1.013 /* [kJ/kg*°C] specific heat of moist air */
+#define cp 1.013 /* [kJ/kg*degC] specific heat of moist air */
#define epsilon 0.622 /* [-] ratio of molecular weigth of water to dry air */
#define Po 101.3 /* [kPa] atmospheric pressure at sea level */
#define Tko 293.16 /* [K] reference temperature at sea level */
@@ -35,7 +35,7 @@
/* calculus: mean saturation vapoure pressure [KPa] */
ea = 0.61078 * exp((17.27 * T) / (T + 237.3));
- /* calculus: slope of vapoure pressure curve [KPa/°C] */
+ /* calculus: slope of vapoure pressure curve [KPa/degC] */
delta = (4098 * ea) / pow((237.3 + T), 2);
/* calculus: latent heat vapourisation [MJ/kg] */
@@ -44,7 +44,7 @@
/* calculus: atmospheric pressure [KPa] */
P = Po * pow(((Tko - eta * (Z - Ao)) / Tko), (g / (eta * R)));
- /* calculus: psichiometric constant [kPa/°C] */
+ /* calculus: psichiometric constant [kPa/degC] */
gamma = ((cp * P) / (epsilon * lambda)) * 0.001;
/* calculus: aerodynamic resistance [s/m] */
@@ -62,7 +62,7 @@
/* calculus: surface resistance [s/m] */
rs = 100 / (0.5 * 24 * hc);
- /*calculus: modified psichiometric constant [kPa/°C] */
+ /*calculus: modified psichiometric constant [kPa/degC] */
gstar = gamma * (1 + (rs / ra));
/*calculus: net radiation [MJ/m2*d] */
@@ -81,7 +81,7 @@
/* calculus: actual vapoure pressure [kPa] */
ed = Rh * ea / 100;
- /* calculus: virtual temperature [°C] */
+ /* calculus: virtual temperature [degC] */
Tkv = (T + 273.15) / (1 - (0.378 * ed / P));
/* calculus: atmospheric density [Kg/m^3] */
@@ -107,7 +107,7 @@
/* calculus: mean saturation vapoure pressure [KPa] */
ea = 0.61078 * exp((17.27 * T) / (T + 237.3));
- /* calculus: slope of vapoure pressure curve [KPa/°C] */
+ /* calculus: slope of vapoure pressure curve [KPa/degC] */
delta = (4098 * ea) / pow((237.3 + T), 2);
/* calculus: latent heat vapourisation [MJ/kg] */
@@ -116,7 +116,7 @@
/* calculus: atmospheric pressure [KPa] */
P = Po * pow(((Tko - eta * (Z - Ao)) / Tko), (g / (eta * R)));
- /* calculus: di psichiometric constant [kPa/°C] */
+ /* calculus: di psichiometric constant [kPa/degC] */
gamma = ((cp * P) / (epsilon * lambda)) * 0.001;
/* calculus: net radiation [MJ/m2*h] */
@@ -143,18 +143,18 @@
/* calculus of saturation vapour pressure at the temperature T: es[hPa] */
- /* with T[°C] */
+ /* with T[degC] */
es = 6.1078*exp((17.27*T)/(237.3+T);
- /* tangent of the saturated vapour pressure curve: D[hPa/K] with T[°C] */
+ /* tangent of the saturated vapour pressure curve: D[hPa/K] with T[degC] */
D = (25029/pow((273.3+T),2))*exp((17.27*T)/(237.3+T);
/* air pressure at level hM */
P = 1013*exp(-hM/(7991+29.33*Tv));
- /* calculus of lambda [KJ/Kg] with T[°C] */
+ /* calculus of lambda [KJ/Kg] with T[degC] */
lambda = 2500.8 - 2.372*T;
- /* calculus psichiometric constant gamma [hPa/°C] with cp=1.005[KJ/(Kg*K)] */
+ /* calculus psichiometric constant gamma [hPa/degC] with cp=1.005[KJ/(Kg*K)] */
gamma = ((1.005*P)/(0.622*lambda))*0.001;
#endif
Modified: grass/trunk/imagery/i.landsat.toar/landsat.h
===================================================================
--- grass/trunk/imagery/i.landsat.toar/landsat.h 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/imagery/i.landsat.toar/landsat.h 2014-03-03 03:53:36 UTC (rev 59172)
@@ -14,12 +14,12 @@
#define NOMETADATAFILE 0
#define METADATAFILE 1
-/*****************************************************
+/**********************************************************
* Landsat Structures
*
- * Lmax and Lmin in W / (m^2 * sr * µm) -> Radiance
- * Esun in W / (m^2 * µm) -> Irradiance
- ****************************************************/
+ * Lmax and Lmin in W / (m^2 * sr * micron) -> Radiance
+ * Esun in W / (m^2 * micron) -> Irradiance
+ *********************************************************/
#define MAX_BANDS 11
@@ -28,7 +28,7 @@
int number; /* Band number */
int code; /* Band code */
- double wavemax, wavemin; /* Wavelength in µm */
+ double wavemax, wavemin; /* Wavelength in micron */
double esun; /* Mean solar irradiance */
double lmax, lmin; /* Spectral radiance */
Modified: grass/trunk/imagery/i.topo.corr/main.c
===================================================================
--- grass/trunk/imagery/i.topo.corr/main.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/imagery/i.topo.corr/main.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -168,7 +168,7 @@
/* Abre fichero de bandas y el de salida */
strcpy(band.name, input->answers[i]);
Rast_get_cellhd(band.name, "", &hd_band);
- Rast_set_window(&hd_band); /* Antes de out_open y allocate para mismo tamaño */
+ Rast_set_window(&hd_band); /* Antes de out_open y allocate para mismo size */
band.fd = Rast_open_old(band.name, "");
band.type = Rast_get_map_type(band.fd);
if (band.type != DCELL_TYPE) {
Modified: grass/trunk/lib/arraystats/class.c
===================================================================
--- grass/trunk/lib/arraystats/class.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/lib/arraystats/class.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -82,7 +82,7 @@
stats.stdev * scale * (i - nbreaks / 2);
}
- else { /* number of classes is even so mean is a classbreak */
+ else { /* number of classes is even so mean is a classbreak */
/* decide whether to use 1*stdev or 0.5*stdev as step */
i = 1;
@@ -133,8 +133,7 @@
lequi = G_malloc(*nbreaks * sizeof(double));
- /*The following values come from the normal distribution and
- * will be used as:
+ /* The following values come from the normal distribution and will be used as:
* classbreak[i] = (lequi[i] * stdev) + mean;
*/
@@ -208,7 +207,7 @@
basic_stats(data, count, &stats);
- /*check if any of the classbreaks would fall outside of the range min-max */
+ /* Check if any of the classbreaks would fall outside of the range min-max */
j = 0;
for (i = 0; i < *nbreaks; i++) {
if ((lequi[i] * stats.stdev + stats.mean) >= stats.min &&
@@ -218,7 +217,8 @@
}
if (j < (*nbreaks)) {
- G_warning(_("There are classbreaks outside the range min-max. Number of classes reduced to %i, but using probabilities for %i classes."),
+ G_warning(_("There are classbreaks outside the range min-max. Number of "
+ "classes reduced to %i, but using probabilities for %i classes."),
j + 1, *nbreaks + 1);
G_realloc(classbreaks, j * sizeof(double));
for (i = 0; i < j; i++)
@@ -240,13 +240,14 @@
return (1);
}
-/* FixMe: there seems to a problem with array overflow, probably due to the fact that the code was ported from fortran which has 1-based arrays*/
+/* FIXME: there seems to a problem with array overflow, probably due to
+ the fact that the code was ported from fortran which has 1-based arrays*/
double class_discont(double *data, int count, int nbreaks,
double *classbreaks)
{
int *num, nbclass;
double *no, *zz, *nz, *xn, *co;
- double *x; /* Vecteur des observations standardisées */
+ double *x; /* Vector standardized observations */
int i, j, k;
double min = 0, max = 0, rangemax = 0;
int n = 0;
Modified: grass/trunk/lib/raster/color_look.c
===================================================================
--- grass/trunk/lib/raster/color_look.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/lib/raster/color_look.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -30,7 +30,7 @@
* <b>set</b> arrays to be at least dimension <i>n</i>.
*
* <b>Note:</b> The <i>red, green</i>, and <i>blue</i> intensities
- * will be in the range 0 - 255.
+ * will be in the range 0 - 255.
*
* Modified to return a color for NULL-values.
*
Modified: grass/trunk/lib/raster/color_set.c
===================================================================
--- grass/trunk/lib/raster/color_set.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/lib/raster/color_set.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -19,7 +19,7 @@
*
* The <i>red, green</i>, and <i>blue</i> intensities for the color
* associated with category <i>cat</i> are set in the <i>colors</i>
- * structure. The intensities must be in the range 0 - 255. Values
+ * structure. The intensities must be in the range 0 - 255. Values
* below zero are set as zero, values above 255 are set as 255.
*
* <b>Warning: Use of this routine is discouraged because it defeats the new
Modified: grass/trunk/raster/r.sunmask/g_solposition.c
===================================================================
--- grass/trunk/raster/r.sunmask/g_solposition.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/raster/r.sunmask/g_solposition.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -49,7 +49,7 @@
- timezone: DO NOT ADJUST FOR DAYLIGHT SAVINGS TIME.
- timezone: negative for zones west of Greenwich
- lat/long: east and north positive
- - the atmospheric refraction is calculated for 1013hPa, 15°C
+ - the atmospheric refraction is calculated for 1013hPa, 15 degrees C
- time: local time from your watch
*/
Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/raster/r.sunmask/main.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -312,7 +312,7 @@
- timezone: DO NOT ADJUST FOR DAYLIGHT SAVINGS TIME.
- timezone: negative for zones west of Greenwich
- lat/long: east and north positive
- - the atmospheric refraction is calculated for 1013hPa, 15�C
+ - the atmospheric refraction is calculated for 1013hPa, 15 degC
- time: local time from your watch
Order of parameters:
Modified: grass/trunk/raster/r.watershed/ram/do_flatarea.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/do_flatarea.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/raster/r.watershed/ram/do_flatarea.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -4,7 +4,7 @@
*
* Garbrecht, J. & Martz, L. W. (1997)
* The assignment of drainage direction over flat surfaces in raster
- * digital elevation models. J. Hydrol 193, 204–213.
+ * digital elevation models. J. Hydrol 193, 204-213.
*
* the method is modifed for speed, only one pass is necessary to get
* the gradient away from higher terrain
Modified: grass/trunk/vector/v.net.salesman/main.c
===================================================================
--- grass/trunk/vector/v.net.salesman/main.c 2014-03-02 22:37:13 UTC (rev 59171)
+++ grass/trunk/vector/v.net.salesman/main.c 2014-03-03 03:53:36 UTC (rev 59172)
@@ -454,7 +454,7 @@
add_city(city, city1);
}
- /* TODO: optimize tour (some Lin–Kernighan method) */
+ /* TODO: optimize tour (some Lin-Kernighan method) */
if (debug_level >= 2) {
/* debug print */
More information about the grass-commit
mailing list