[GRASS-SVN] r61630 - grass/trunk/raster3d grass/trunk/raster3d/r3.flow grass/trunk/raster3d/r3.gradient/testsuite grass-addons/grass7/raster3d

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-08-14 08:18:41 -0700 (Thu, 14 Aug 2014)
New Revision: 61630

Added:
   grass/trunk/raster3d/r3.flow/
   grass/trunk/raster3d/r3.gradient/
Removed:
   grass-addons/grass7/raster3d/Makefile
   grass-addons/grass7/raster3d/r3.flow/
   grass-addons/grass7/raster3d/r3.gradient/
Modified:
   grass/trunk/raster3d/Makefile
   grass/trunk/raster3d/r3.flow/Makefile
   grass/trunk/raster3d/r3.flow/test_main.c
   grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py
Log:
move r3.flow and r3.gradient to trunk

Modified: grass/trunk/raster3d/Makefile
===================================================================
--- grass/trunk/raster3d/Makefile	2014-08-14 15:16:17 UTC (rev 61629)
+++ grass/trunk/raster3d/Makefile	2014-08-14 15:18:41 UTC (rev 61630)
@@ -2,6 +2,8 @@
 
 SUBDIRS = \
 	r3.cross.rast \
+	r3.flow \
+	r3.gradient \
 	r3.gwflow \
 	r3.in.ascii \
 	r3.in.bin \

Modified: grass/trunk/raster3d/r3.flow/Makefile
===================================================================
--- grass-addons/grass7/raster3d/r3.flow/Makefile	2014-08-14 14:20:55 UTC (rev 61628)
+++ grass/trunk/raster3d/r3.flow/Makefile	2014-08-14 15:18:41 UTC (rev 61630)
@@ -1,12 +1,15 @@
 MODULE_TOPDIR = ../..
 
-PGM=r3.flow
+PROGRAMS=r3.flow test.r3flow 
 
 LIBES = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(VECTORLIB) $(DBMILIB)
 DEPENDENCIES = $(RASTER3DDEP) $(RASTERDEP) $(GISDEP) $(VECTORDEP) $(DBMIDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
-include $(MODULE_TOPDIR)/include/Make/Module.make
+r3_flow_OBJS = main.o flowline.o integrate.o interpolate.o voxel_traversal.o
+test_r3flow_OBJS = test_main.o flowline.o integrate.o interpolate.o voxel_traversal.o
 
-default: cmd
+include $(MODULE_TOPDIR)/include/Make/Multi.make
+
+default: multi

Modified: grass/trunk/raster3d/r3.flow/test_main.c
===================================================================
--- grass-addons/grass7/raster3d/r3.flow/test_main.c	2014-08-14 14:20:55 UTC (rev 61628)
+++ grass/trunk/raster3d/r3.flow/test_main.c	2014-08-14 15:18:41 UTC (rev 61630)
@@ -29,7 +29,7 @@
 
 }
 
-int test_main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
     int i;
     struct GModule *module;

Modified: grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py
===================================================================
--- grass-addons/grass7/raster3d/r3.gradient/testsuite/r3gradient_test.py	2014-08-14 14:20:55 UTC (rev 61628)
+++ grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py	2014-08-14 15:18:41 UTC (rev 61630)
@@ -141,17 +141,9 @@
         self.assertRaster3dFitsUnivar(raster='test_grad_y', reference=r3univar_test_grad_y, precision=1e-8)
         self.assertRaster3dFitsUnivar(raster='test_grad_z', reference=r3univar_test_grad_z, precision=1e-8)
 
-    def test_gradient_procs(self):
-        self.runModule('g.region', res3=10, n=100, s=0, w=0, e=120, b=0, t=50)
-        self.assertModule('r3.gradient', input='test_map_1_ref', block_size=[200, 2, 50], nprocs=3,
-                          output=['test_grad_x', 'test_grad_y', 'test_grad_z'], overwrite=True)
-        self.assertRaster3dFitsUnivar(raster='test_grad_x', reference=r3univar_test_grad_x, precision=1e-8)
-        self.assertRaster3dFitsUnivar(raster='test_grad_y', reference=r3univar_test_grad_y, precision=1e-8)
-        self.assertRaster3dFitsUnivar(raster='test_grad_z', reference=r3univar_test_grad_z, precision=1e-8)
-
     def test_gradient_nulls(self):
         self.runModule('g.region', res3=1, n=5, s=0, w=0, e=5, b=0, t=5)
-        self.assertModule('r3.gradient', input='test_map_2_ref', block_size=[200, 2, 50], nprocs=3,
+        self.assertModule('r3.gradient', input='test_map_2_ref', block_size=[200, 2, 50],
                           output=['test_null_grad_x', 'test_null_grad_y', 'test_null_grad_z'])
         self.assertRaster3dFitsUnivar(raster='test_null_grad_x',
                                       reference=r3univar_test_nulls_grad_x, precision=1e-8)

Deleted: grass-addons/grass7/raster3d/Makefile
===================================================================
--- grass-addons/grass7/raster3d/Makefile	2014-08-14 15:16:17 UTC (rev 61629)
+++ grass-addons/grass7/raster3d/Makefile	2014-08-14 15:18:41 UTC (rev 61630)
@@ -1,10 +0,0 @@
-MODULE_TOPDIR = ..
-
-SUBDIRS = \
-	r3.flow \
-	r3.gradient
-
-include $(MODULE_TOPDIR)/include/Make/Dir.make
-
-default: subdirs
-