release 4.6.6 (bug fixes with ifort)

trunk/DIVA3D/divastripped/awkfilter

@@ -0,0 +1,14 @@
+#!/bin/bash
+export LC_ALL=C
+awk '{ sum += $1;  L[n++] = $1 } 
+ END {
+ for (j=1;j<3;j++){
+ for (i=1; i<n-1; i++) {
+ FL[i]=(L[i+1]+L[i-1]+2*L[i])/4}; FL[0]=(L[0]+L[1])/2; FL[n-1]=(L[n-2]+L[n-1])/2 
+ for (i=0; i<n; i++) {
+ L[i]=FL[i] }
+ }
+ for (i=0; i<n; i++) {
+ print L[i]}
+ }
+ ' $1

trunk/DIVA3D/divastripped/crossval

@@ -0,0 +1,27 @@
+#!/bin/bash
+cd divawork
+if [ -f ../output/diva.log ] ; then
+ cp -f ../output/diva.log .
+fi
+cp ../input/valatxy.coord fort.20
+cp ../output/valatxyascii.anl fort.21
+VALEX=$(head -22 ../input/param.par | tail -1)
+echo $VALEX | ../../bin/cverror.a >> diva.log
+if [ $? -ne 0 ];then
+echo ' '
+echo --------------------------------------------
+echo A problem was encountered during execution !
+echo                cverror.a
+echo Check execution track
+echo --------------------------------------------
+echo ' ' >> diva.log
+echo -------------------------------------------- >> diva.log
+echo A problem was encountered during execution ! >> diva.log
+echo                cverror.a  >> diva.log
+echo Check execution track >> diva.log
+echo -------------------------------------------- >> diva.log
+fi
+echo Exclusion value used $VALEX
+cat fort.22 >> crossval.dat
+ cp -f diva.log ../output/.
+cd ..

trunk/DIVA3D/divastripped/dbdb2diva

@@ -0,0 +1,70 @@
+#!/bin/bash
+echo //////////////////////////////////////////////////
+echo                 Generating topography
+echo //////////////////////////////////////////////////
+echo ' '
+echo Cleaning up old files
+echo ' '
+rm -f ./divawork/fort.10
+rm -f ./divawork/fort.11
+rm -f ./divawork/fort.12
+rm -f ./divawork/fort.20
+echo Finished cleaning 
+FILENAME=./input/topo.asc
+head -1 $FILENAME > bidon
+FNAME=bidon
+{ 
+read AA BB CC DD EE
+} < $FNAME
+echo $AA $BB $CC $DD $EE
+head -2 $FILENAME | tail -1 > bidon
+FNAME=bidon
+{ 
+read AAB BBB CCB DDB EEB
+} < $FNAME
+echo $AAB $BBB $CCB $DDB $EEB
+echo Making TopoInfo.dat
+echo ${AA#*:} > ./output/TopoInfo.dat
+echo ${CC#*:} >> ./output/TopoInfo.dat
+echo ${EE#*:} >> ./output/TopoInfo.dat
+echo ${EE#*:} >> ./output/TopoInfo.dat
+echo ${AAB#*:} >> ./output/TopoInfo.dat
+echo ${BBB#*:} >> ./output/TopoInfo.dat
+echo   >> ./output/TopoInfo.dat
+cat ./output/TopoInfo.dat
+mv ./output/TopoInfo.dat  ./divawork/fort.10
+cat ./input/topo.asc > ./divawork/fort.11
+cd ./divawork
+if [ -f ../output/diva.log ] ; then
+ cp  -f ../output/diva.log .
+fi
+../../bin/dbdb2diva.a >> diva.log
+if [ $? -ne 0 ];then
+echo ' '
+echo --------------------------------------------
+echo A problem was encountered during execution !
+echo                dbdb2diva.a
+echo Check execution track
+echo --------------------------------------------
+echo ' ' >> diva.log
+echo -------------------------------------------- >> diva.log
+echo A problem was encountered during execution ! >> diva.log
+echo                dbdb2diva.a  >> diva.log
+echo Check execution track >> diva.log
+echo -------------------------------------------- >> diva.log
+fi
+ cp -f diva.log  ../output/.
+cd ..
+mv ./divawork/fort.12 ./output/topo.grd
+mv ./divawork/fort.20 ./output/TopoInfo.dat
+rm ./divawork/fort.10
+rm ./divawork/fort.11
+echo -----------------------
+echo Topography is generated 
+echo -----------------------
+if [ "$1" == "-r" ]
+then
+echo 'Moving topography files into ./input directory'
+cp -v ./output/topo.grd ./input
+cp -v ./output/TopoInfo.dat ./input
+fi