[GRASS-SVN] r31256 - grass-addons/raster/r.inund.fluv
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon May 5 11:08:20 EDT 2008
Author: robertomarzocchi
Date: 2008-05-05 11:08:20 -0400 (Mon, 05 May 2008)
New Revision: 31256
Modified:
grass-addons/raster/r.inund.fluv/Makefile
grass-addons/raster/r.inund.fluv/README.txt
grass-addons/raster/r.inund.fluv/install.sh
grass-addons/raster/r.inund.fluv/r.inund.fluv
grass-addons/raster/r.inund.fluv/r.inund.fluv_62
Log:
Modified: grass-addons/raster/r.inund.fluv/Makefile
===================================================================
--- grass-addons/raster/r.inund.fluv/Makefile 2008-05-05 13:05:40 UTC (rev 31255)
+++ grass-addons/raster/r.inund.fluv/Makefile 2008-05-05 15:08:20 UTC (rev 31256)
@@ -5,28 +5,28 @@
include $(MODULE_TOPDIR)/include/Make/Script.make
include $(MODULE_TOPDIR)/include/Make/Module.make
+default: $(ETC)/fortran_code/fortran_code/$(PGM) html
-default: DIR $(ETC)/fortran_code/$(PGM) html
-
DIR:
- mkdir -p $(MODULE_TOPDIR)/etc/fortran_code/
+ mkdir -p $(ETC)/fortran_code/fortran_code/
-$(ETC)/fortran_code/$(PGM): $(OBJ)
- gfortran -O1 -o find_main_channel.exe find_main_channel.f90
- gfortran -O1 -o clean_inundation.exe clean_inundation.f90
- gfortran -O1 -o 2d_path.exe 2d_path.f90
- gfortran -O1 -o correction_from_path.exe correction_from_path.f90
- $(INSTALL) find_main_channel.exe $(MODULE_TOPDIR)/etc/fortran_code
- $(INSTALL) clean_inundation.exe $(MODULE_TOPDIR)/etc/fortran_code
- $(INSTALL) 2d_path.exe $(MODULE_TOPDIR)/etc/fortran_code
- $(INSTALL) correction_from_path.exe $(MODULE_TOPDIR)/etc/fortran_code
- $(INSTALL) dati.mod $(MODULE_TOPDIR)/etc/fortran_code
- $(INSTALL) dd.mod $(MODULE_TOPDIR)/etc/fortran_code
- $(INSTALL) $(PGM) $(MODULE_TOPDIR)/scripts/
+$(ETC)/fortran_code/fortran_code/$(PGM): $(OBJ)
+ gfortran -O1 -o find_main_channel find_main_channel.f90
+ gfortran -O1 -o clean_inundation clean_inundation.f90
+ gfortran -O1 -o 2d_path 2d_path.f90
+ gfortran -O1 -o correction_from_path correction_from_path.f90
+ $(INSTALL) find_main_channel$(EXE) $(ETC)/fortran_code/fortran_code
+ $(INSTALL) clean_inundation$(EXE) $(ETC)/fortran_code/fortran_code
+ $(INSTALL) 2d_path$(EXE) $(ETC)/fortran_code/fortran_code
+ $(INSTALL) correction_from_path$(EXE) $(ETC)/fortran_code/fortran_code
+ $(INSTALL) dati.mod $(ETC)/fortran_code/fortran_code
+ $(INSTALL) dd.mod $(ETC)/fortran_code/fortran_code
+ $(INSTALL) $(PGM) $(GISBASE)/scripts/
html:
- $(MKDIR) $(MODULE_TOPDIR)/docs/html
+ $(MKDIR) $(GISBASE)/docs/html
$(INSTALL_DATA) $(PGM).html $(MODULE_TOPDIR)/docs/html/
clean:
- -rm -f find_main_channel.exe clean_inundation.exe 2d_path.exe correction_from_path.exe dati.mod dd.mod
\ No newline at end of file
+ -rm -f find_main_channel$(EXE) clean_inundation$(EXE) 2d_path$(EXE) correction_from_path$(EXE) dati.mod dd.mod
+
\ No newline at end of file
Modified: grass-addons/raster/r.inund.fluv/README.txt
===================================================================
--- grass-addons/raster/r.inund.fluv/README.txt 2008-05-05 13:05:40 UTC (rev 31255)
+++ grass-addons/raster/r.inund.fluv/README.txt 2008-05-05 15:08:20 UTC (rev 31256)
@@ -26,9 +26,12 @@
(see description.html)
******************************************************************
+Now we're adjusting the Makefile and a simple installation is wi
+
+
+
**************** Users of GRASS 6.3 ******************************
-1) Run the install.sh script
-sh install.sh
+1)
**************** Users of GRASS 6.2 ******************************
@@ -36,6 +39,5 @@
mv r.inund.fluv r.inund.fluv_63
2) Change the name of script for grass 6.2.x releases
mv r.inund.fluv_62 r.inund.fluv
-3) Run the install.sh script
-sh install.sh
+3)
Modified: grass-addons/raster/r.inund.fluv/install.sh
===================================================================
--- grass-addons/raster/r.inund.fluv/install.sh 2008-05-05 13:05:40 UTC (rev 31255)
+++ grass-addons/raster/r.inund.fluv/install.sh 2008-05-05 15:08:20 UTC (rev 31256)
@@ -26,16 +26,16 @@
# if you have gnu fortran compiler (gcc-gfortran.i386), use the following rows:
-gfortran -O1 -o find_main_channel.exe find_main_channel.f90
-gfortran -O1 -o clean_inundation.exe clean_inundation.f90
-gfortran -O1 -o 2d_path.exe 2d_path.f90
-gfortran -O1 -o correction_from_path.exe correction_from_path.f90
+gfortran -O1 -o find_main_channel find_main_channel.f90
+gfortran -O1 -o clean_inundation clean_inundation.f90
+gfortran -O1 -o 2d_path 2d_path.f90
+gfortran -O1 -o correction_from_path correction_from_path.f90
# if you have a intel fortran compiler, use the following rows
-#ifort -O3 -xW -o find_main_channel.exe find_main_channel.f90
-#ifort -O3 -xW -o clean_inundation.exe clean_inundation.f90
-#ifort -O3 -xW -o 2d_path.exe 2d_path.f90
-#ifort -O3 -xW -o correction_from_path.exe correction_from_path.f90
+#ifort -O3 -xW -o find_main_channel find_main_channel.f90
+#ifort -O3 -xW -o clean_inundation clean_inundation.f90
+#ifort -O3 -xW -o 2d_path 2d_path.f90
+#ifort -O3 -xW -o correction_from_path correction_from_path.f90
rm find_main_channel.f90
rm clean_inundation.f90
Modified: grass-addons/raster/r.inund.fluv/r.inund.fluv
===================================================================
--- grass-addons/raster/r.inund.fluv/r.inund.fluv 2008-05-05 13:05:40 UTC (rev 31255)
+++ grass-addons/raster/r.inund.fluv/r.inund.fluv 2008-05-05 15:08:20 UTC (rev 31256)
@@ -226,16 +226,16 @@
fi
g.remove rast=MASK --quiet
-cartella_nascosta=".temp_grass_script"
+cartella_nascosta="temp_grass_script"
# do not use any space in name of cartella_nascosta
rm -r -f ~/$cartella_nascosta
mkdir ~/$cartella_nascosta
-cp "$GISBASE/etc/fortran_code"/find_main_channel.exe ~/$cartella_nascosta
-cp "$GISBASE/etc/fortran_code"/clean_inundation.exe ~/$cartella_nascosta
-cp "$GISBASE/etc/fortran_code"/2d_path.exe ~/$cartella_nascosta
-cp "$GISBASE/etc/fortran_code"/correction_from_path.exe ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/find_main_channel ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/clean_inundation ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/2d_path ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/correction_from_path ~/$cartella_nascosta
#variables
dtm="$GIS_OPT_DTM"
@@ -257,7 +257,7 @@
echo $res $deltax $deltay > parameter.txt
echo "'"region2.txt"'" "'"dtm2x2"'" "'"limiti_alveo_vect"'" "'"quote_100"'" > nomefile.txt
g.message "Fortran code that automatically find bed river"
-./find_main_channel.exe
+./find_main_channel
rm nomefile.txt
rm parameter.txt
#TEST FORTRAN CODE RUN
@@ -316,7 +316,7 @@
cd
cd $cartella_nascosta
echo "'"inondazione_step2"'" "'"profilo"'" "'"inondazione_nuova.txt"'" "'"quote_punti_adiacenti"'" "'"region20.txt"'" "'"region2.txt"'" "'"dtm2x2"'" > nomefile.txt
-./clean_inundation.exe
+./clean_inundation
rm nomefile.txt
#TEST FORTRAN CODE RUN
@@ -341,7 +341,7 @@
cd
cd $cartella_nascosta
echo "'"profilo"'" "'"inondazione_step3"'" "'"reticolo"'" "'"region20.txt"'" "'"dtm20x20"'" "'"limiti_alveo_vect"'" "'"region2.txt"'" "'"dtm2x2"'" "'"bordi_alveo"'" > nomefile.txt
-./2d_path.exe
+./2d_path
rm nomefile.txt
#TEST FORTRAN CODE RUN
@@ -402,7 +402,7 @@
cd
cd $cartella_nascosta
echo "'"diff_inond"'" "'"punti3d_reticolo"'" "'"correzione"'" "'"region10.txt"'" "'"dtm2x2"'" "'"region2.txt"'" > nomefile.txt
-./correction_from_path.exe
+./correction_from_path
rm nomefile.txt
#TEST FORTRAN CODE RUN
Modified: grass-addons/raster/r.inund.fluv/r.inund.fluv_62
===================================================================
--- grass-addons/raster/r.inund.fluv/r.inund.fluv_62 2008-05-05 13:05:40 UTC (rev 31255)
+++ grass-addons/raster/r.inund.fluv/r.inund.fluv_62 2008-05-05 15:08:20 UTC (rev 31256)
@@ -217,16 +217,16 @@
fi
g.remove rast=MASK
-cartella_nascosta=".temp_grass_script"
+cartella_nascosta="temp_grass_script"
# do not use any space in name of cartella_nascosta
rm -r -f ~/$cartella_nascosta
mkdir ~/$cartella_nascosta
-cp "$GISBASE/etc/fortran_code"/find_main_channel.exe ~/$cartella_nascosta
-cp "$GISBASE/etc/fortran_code"/clean_inundation.exe ~/$cartella_nascosta
-cp "$GISBASE/etc/fortran_code"/2d_path.exe ~/$cartella_nascosta
-cp "$GISBASE/etc/fortran_code"/correction_from_path.exe ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/find_main_channel ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/clean_inundation ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/2d_path ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/correction_from_path ~/$cartella_nascosta
#variables
dtm="$GIS_OPT_DTM"
@@ -248,7 +248,7 @@
echo $res $deltax $deltay > parameter.txt
echo "'"region2.txt"'" "'"dtm2x2"'" "'"limiti_alveo_vect"'" "'"quote_100"'" > nomefile.txt
echo "Fortran code that automatically find bed river"
-./find_main_channel.exe
+./find_main_channel
rm nomefile.txt
rm parameter.txt
#TEST FORTRAN CODE RUN
@@ -307,7 +307,7 @@
cd
cd $cartella_nascosta
echo "'"inondazione_step2"'" "'"profilo"'" "'"inondazione_nuova.txt"'" "'"quote_punti_adiacenti"'" "'"region20.txt"'" "'"region2.txt"'" "'"dtm2x2"'" > nomefile.txt
-./clean_inundation.exe
+./clean_inundation
rm nomefile.txt
#TEST FORTRAN CODE RUN
@@ -332,7 +332,7 @@
cd
cd $cartella_nascosta
echo "'"profilo"'" "'"inondazione_step3"'" "'"reticolo"'" "'"region20.txt"'" "'"dtm20x20"'" "'"limiti_alveo_vect"'" "'"region2.txt"'" "'"dtm2x2"'" "'"bordi_alveo"'" > nomefile.txt
-./2d_path.exe
+./2d_path
rm nomefile.txt
#TEST FORTRAN CODE RUN
@@ -393,7 +393,7 @@
cd
cd $cartella_nascosta
echo "'"diff_inond"'" "'"punti3d_reticolo"'" "'"correzione"'" "'"region10.txt"'" "'"dtm2x2"'" "'"region2.txt"'" > nomefile.txt
-./correction_from_path.exe
+./correction_from_path
rm nomefile.txt
#TEST FORTRAN CODE RUN
More information about the grass-commit
mailing list