[GRASS-SVN] r68574 - in grass-addons/grass7/imagery: i.evapo.potrad i.evapo.senay i.spec.unmix

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Jun 2 02:11:01 PDT 2016


Author: ychemin
Date: 2016-06-02 02:11:01 -0700 (Thu, 02 Jun 2016)
New Revision: 68574

Modified:
   grass-addons/grass7/imagery/i.evapo.potrad/et_pot_day.c
   grass-addons/grass7/imagery/i.evapo.senay/et_pot_day.c
   grass-addons/grass7/imagery/i.spec.unmix/main.c
Log:
expanded actual seconds per day computation instead of magic number

Modified: grass-addons/grass7/imagery/i.evapo.potrad/et_pot_day.c
===================================================================
--- grass-addons/grass7/imagery/i.evapo.potrad/et_pot_day.c	2016-06-02 09:04:38 UTC (rev 68573)
+++ grass-addons/grass7/imagery/i.evapo.potrad/et_pot_day.c	2016-06-02 09:11:01 UTC (rev 68574)
@@ -8,7 +8,7 @@
     double latent, result;
 
     latent = (2.501 - (0.002361 * (tempk - 273.15))) * 1000000.0;
-    result = (rnetd * 86400 * 1000.0) / (latent * roh_w);
+    result = (rnetd * (24.0*60.0*60.0) / 1000.0) / (latent * roh_w);
     return result;
 }
 

Modified: grass-addons/grass7/imagery/i.evapo.senay/et_pot_day.c
===================================================================
--- grass-addons/grass7/imagery/i.evapo.senay/et_pot_day.c	2016-06-02 09:04:38 UTC (rev 68573)
+++ grass-addons/grass7/imagery/i.evapo.senay/et_pot_day.c	2016-06-02 09:11:01 UTC (rev 68574)
@@ -8,7 +8,7 @@
     double latent, result;
 
     latent = (2.501 - (0.002361 * (tempk - 273.15))) * 1000000.0;
-    result = (rnetd * 86400 * 1000.0) / (latent * roh_w);
+    result = (rnetd * 24.0*60.0*60.0 / 1000.0) / (latent * roh_w);
     return result;
 }
 

Modified: grass-addons/grass7/imagery/i.spec.unmix/main.c
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/main.c	2016-06-02 09:04:38 UTC (rev 68573)
+++ grass-addons/grass7/imagery/i.spec.unmix/main.c	2016-06-02 09:11:01 UTC (rev 68574)
@@ -199,7 +199,7 @@
 	for (j = 0; j < A->cols; j++)
 	    if (j != i)
 		if (anglefield[i][j] < 8.0)
-		    G_fatal_error(_("Spectral entries row %i: and row %i: in "
+		    G_message(_("Spectral entries row %i: and row %i: in "
 				    "your matrix are linear dependent!\nYou "
 				    "have to revise your reference spectra."),
 				  i, j);



More information about the grass-commit mailing list