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

[becker at geodynamics.org]

Author: becker
Date: 2008-03-26 20:57:42 -0700 (Wed, 26 Mar 2008)
New Revision: 11606

Modified:
   mc/1D/hc/trunk/ggrd_grdtrack_util.c
   mc/1D/hc/trunk/ggrd_readgrds.c
Log:
Improved GMT4 handling.



Modified: mc/1D/hc/trunk/ggrd_grdtrack_util.c
===================================================================
--- mc/1D/hc/trunk/ggrd_grdtrack_util.c	2008-03-27 03:36:48 UTC (rev 11605)
+++ mc/1D/hc/trunk/ggrd_grdtrack_util.c	2008-03-27 03:57:42 UTC (rev 11606)
@@ -443,6 +443,8 @@
   GMT_io_init ();/* Init the table i/o structure */
   GMT_grdio_init();
   GMT_program = "g";
+  GMT_make_fnan (GMT_f_NaN);
+  GMT_make_dnan (GMT_d_NaN);
 #endif
   if(verbose >= 2)
     if(*geographic_in)
@@ -528,8 +530,6 @@
     }
 #else  /* 4.1.2 */
     if(GMT_read_grd_info (grdfile,*grd)){
-      
-    //if (GMT_cdf_read_grd_info ((*grd))) {
       fprintf (stderr, "%s: error opening file %s for header\n", 
 	       "ggrd_grdtrack_init", grdfile);
       return 4;

Modified: mc/1D/hc/trunk/ggrd_readgrds.c
===================================================================
--- mc/1D/hc/trunk/ggrd_readgrds.c	2008-03-27 03:36:48 UTC (rev 11605)
+++ mc/1D/hc/trunk/ggrd_readgrds.c	2008-03-27 03:57:42 UTC (rev 11606)
@@ -107,6 +107,13 @@
     mean[4],ddummy,*weights,theta,tmp=0.0;
   /* gmt  */
   struct GRD_HEADER header[1];
+#ifdef USE_GMT4
+  GMT_io_init ();/* Init the table i/o structure */
+  GMT_grdio_init();
+  GMT_program = "g";
+  GMT_make_fnan (GMT_f_NaN);
+  GMT_make_dnan (GMT_d_NaN);
+#endif
 
   in = out = NULL;
   fgrd = NULL;dgrd = NULL;
@@ -240,8 +247,7 @@
 	      return(-2);
 	    }
 #else  /* new */
-	    sprintf(header->name,"%s",sname);
-	    if(GMT_cdf_read_grd_info (header) == -1){
+	    if(GMT_read_grd_info (sname,header) == -1){
 	      fprintf(stderr,"ggrd_read_vel_grids: error opening GMT grd file %s\n",sname);
 	      return(-2);
 	    }
@@ -363,10 +369,8 @@
 	  }
 	  if(ggrd->v.read_gmt){
 #ifdef USE_GMT4
-	    // read the netcdf GRD file
-	    sprintf(header->name,"%s",sname);
-	    GMT_cdf_read_grd (header,fgrd, 0.0, 0.0, 0.0, 0.0, 
-			      dummy, 0);
+	    GMT_read_grd (sname,header,fgrd, 0.0, 0.0, 0.0, 0.0, 
+			  dummy,0);
 #else
 	    GMT_cdf_read_grd (sname,header,fgrd, 0.0, 0.0, 0.0, 0.0, 
 			      dummy, 0);