compiler warnings eliminated

jalessandri · Jan 30, 2019 · 26610d7 · 26610d7
1 parent d631527
commit 26610d7
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 6 deletions.
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,18 @@
 ============================================================
 
+Wed Jan 30 16:45:18 EET 2019
+
+compiler warnings eliminated
+
+ Rules.make                |    1 +
+ fem3d/femelab1.f          |    5 +++++
+ fem3d/sub2linear.f        |    2 ++
+ fembin/gmv.sh             |   22 ++++++++++++++++++----
+ femcheck/rules/Rules.dist |    1 +
+ 5 files changed, 27 insertions(+), 4 deletions(-)
+
+============================================================
+
 Fri Jan 18 18:25:27 CET 2019
 
 more to make a release

diff --git a/Rules.make b/Rules.make
@@ -357,6 +357,7 @@ WTABS = -Wno-tabs
 ifeq ($(GMV),4)
   WTABS = -Wtabs
 endif
+#$(warning gmv=$(GMV) wtabs=$(WTABS))
 #WTABS = -Wtabs			#NEMUNAS_FIX_OLD
 
 FGNU_GENERAL = 

diff --git a/VERSION b/VERSION
@@ -1,3 +1,5 @@
+version  7_5_55    18-01-2019    VERS_7_5_55   commit_2019-01-30
+
 version  7_5_55    18-01-2019    VERS_7_5_55   commit_2019-01-18
 
 version  7_5_55    18-01-2019    VERS_7_5_55

diff --git a/fem3d/femelab1.f b/fem3d/femelab1.f
@@ -878,6 +878,11 @@ subroutine handle_extract(breg,np,regpar,iextract)
 
 	integer iscanf
 
+	x0 = 0.
+	y0 = 0.
+	dx = 0.
+	dy = 0.
+
         call clo_get_option('nodei',snode)
         call clo_get_option('coord',scoord)
 

diff --git a/fem3d/sub2linear.f b/fem3d/sub2linear.f
@@ -92,6 +92,7 @@ subroutine linear2vals(nlvddi,n,m,il,vals,rlin,nlin)
 
         integer i,j,lmax,nl,ne
 
+	ne = 0
         nl = 0
 
         do i=1,m
@@ -160,6 +161,7 @@ subroutine dlinear2vals(nlvddi,n,m,il,vals,rlin,nlin)
 
         integer i,j,lmax,nl,ne
 
+	ne = 0
         nl = 0
 
         do i=1,m

diff --git a/fem3d/subver.f b/fem3d/subver.f
@@ -362,14 +362,14 @@ module shyfem_version
 c
 c \newcommand{\VERSION}{7.5.55}
 c \newcommand{\version}{7\_5\_55}
-c \newcommand{\COMMIT}{2019-01-18}
+c \newcommand{\COMMIT}{2019-01-30}
 c
 c DOCS	END
 
         implicit none
 
         character*10, parameter :: version = '7.5.55'
-        character*10, parameter :: commit  = '2019-01-18'
+        character*10, parameter :: commit  = '2019-01-30'
         character*17, parameter :: text    = 'SHYFEM VERSION = '
 
         character*40, parameter :: string = text//version//'  '//commit

diff --git a/fembin/gmv.sh b/fembin/gmv.sh
@@ -7,9 +7,23 @@
 prog=$( which gfortran )
 
 if [ -n "$prog" ]; then
-  $prog --version			\
-		| head -1		\
-                | sed -e 's/.*) *//' 	\
-		| sed -e 's/\..*//'
+  version=$( $prog -v 2>&1 | tail -1 | cut -d " " -f 3 )
+  if [ -z "$version" ]; then
+    #echo "*** cannot determine gfortran version... (gmv.sh)"
+    #$prog -v
+    #exit 1
+    echo ""
+  else
+    mversion=$( echo $version | sed -e 's/\..*//' )
+    #echo "version=$version  major_version=$mversion"
+    echo "$mversion"
+  fi
 fi
 
+#if [ -n "$prog" ]; then
+#  $prog --version
+#               | head -1               \
+#                | sed -e 's/.*) *//'   \
+#               | sed -e 's/\..*//'
+#fi
+
diff --git a/femcheck/rules/Rules.dist b/femcheck/rules/Rules.dist
@@ -357,6 +357,7 @@ WTABS = -Wno-tabs
 ifeq ($(GMV),4)
   WTABS = -Wtabs
 endif
+#$(warning gmv=$(GMV) wtabs=$(WTABS))
 #WTABS = -Wtabs			#NEMUNAS_FIX_OLD
 
 FGNU_GENERAL =
-Original file line number
+Diff line change
@@ Expand Up / @@ -878,6 +878,11 @@ subroutine handle_extract(breg,np,regpar,iextract) @@
     	integer iscanf
+    	x0 = 0.
+    	y0 = 0.
+    	dx = 0.
+    	dy = 0.
             call clo_get_option('nodei',snode)
             call clo_get_option('coord',scoord)
@@ Expand Down @@