[cig-commits] r9104 - mc/1D/hc/trunk

[becker at geodynamics.org]

Author: becker
Date: 2008-01-21 00:25:09 -0800 (Mon, 21 Jan 2008)
New Revision: 9104

Modified:
   mc/1D/hc/trunk/ggrd_readgrds.c
Log:
Updated from GMT4 < 4.1.2 to new convention.



Modified: mc/1D/hc/trunk/ggrd_readgrds.c
===================================================================
--- mc/1D/hc/trunk/ggrd_readgrds.c	2008-01-21 00:04:32 UTC (rev 9103)
+++ mc/1D/hc/trunk/ggrd_readgrds.c	2008-01-21 08:25:09 UTC (rev 9104)
@@ -41,7 +41,8 @@
   format
 
 */
-
+int finite(double );		/* why? */
+    
 /* init a v structure  */
 void ggrd_init_vstruc(struct ggrd_vel *v)
 {
@@ -108,7 +109,7 @@
     wraparound = FALSE,
     pixelreg = FALSE,
     weighted = TRUE;
-  char sname[GGRD_STRLEN],suffix[50],loc_prefix[50],*char_dummy,
+  char sname[GGRD_STRLEN],suffix[50],loc_prefix[50],*char_dummy=NULL,
     vsfile_loc[GGRD_STRLEN],tfilename[GGRD_STRLEN];
   float *fgrd;
   double *dgrd;
@@ -499,7 +500,7 @@
   if(read_gmt){
     // check for NaNs
     for(i=0;i < nm;i++)
-      if(!finite(fb[i])){
+      if(!finite((double)fb[i])){
 	fb[i] = 0.0;
 	if(!(*warned)){
 	  fprintf(stderr,"WARNING: at least one NaN entry in the data has been replaced with zero\n");
@@ -509,7 +510,7 @@
   }else{
     // check for NaNs
     for(i=0;i<nm;i++)
-      if(!finite(db[i])){
+      if(!finite((double)db[i])){
 	db[i]=0.0;
 	if(!(*warned)){
 	  fprintf(stderr,"WARNING: at least one NaN entry in the data has been replaced with zero\n");