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

[becker at geodynamics.org]

Author: becker
Date: 2012-10-31 19:16:40 -0700 (Wed, 31 Oct 2012)
New Revision: 20975

Added:
   mc/1D/hc/trunk/ggrd_base.h
Removed:
   mc/1D/hc/trunk/ggrd.h
Modified:
   mc/1D/hc/trunk/Makefile
   mc/1D/hc/trunk/ggrd_grdtrack_util.h
   mc/1D/hc/trunk/hc.h
   mc/1D/hc/trunk/make_tar
Log:
Changed header file naming convention.



Modified: mc/1D/hc/trunk/Makefile
===================================================================
--- mc/1D/hc/trunk/Makefile	2012-10-31 15:57:51 UTC (rev 20974)
+++ mc/1D/hc/trunk/Makefile	2012-11-01 02:16:40 UTC (rev 20975)
@@ -83,7 +83,7 @@
 	$(PREM_DEFINES)
 GGRD_LIB_FLAGS = -L$(GMTHOME)/lib -L$(NETCDFHOME)/lib 
 GGRD_LIBS = $(ODIR)/libggrd.a $(ODIR)/libggrd.dfast.a $(ODIR)/libggrd.dbg.a 
-GGRD_INCS = $(PREM_INCS)  ggrd_grdtrack_util.h ggrd.h ggrd_struc.h
+GGRD_INCS = $(PREM_INCS)  ggrd_grdtrack_util.h ggrd_base.h ggrd_struc.h
 
 #
 #

Deleted: mc/1D/hc/trunk/ggrd.h
===================================================================
--- mc/1D/hc/trunk/ggrd.h	2012-10-31 15:57:51 UTC (rev 20974)
+++ mc/1D/hc/trunk/ggrd.h	2012-11-01 02:16:40 UTC (rev 20975)
@@ -1,66 +0,0 @@
-#ifndef __READ_GGRD_HEADER__
-
-//
-//     max order of interpolation - 1
-//     ie. if 3, this means will do fourth order on 0,1,2,GGRD_DEF_ORDER arrays
-#define GGRD_MAX_ORDER 5
-  //     order of derivatives needed in general for the weighting routine
-#define GGRD_MAX_IORDER 1
-
-#define GGRD_MAX_ORDERP1 (GGRD_MAX_ORDER+1)
-#define GGRD_MAX_IORDERP1 (GGRD_MAX_IORDER+1)
-
-#ifndef GGRD_CPREC			/* 
-				   precision for most C functions
-				*/
-#define GGRD_CPREC double
-#define GGRD_EPS 5e-15
-#define ggrd_boolean unsigned char
-#ifndef HC_FLT_FORMAT
-#define HC_FLT_FORMAT "%lf"
-#endif
-#endif
-
-/* string length */
-#define GGRD_STRLEN 300
-
-/* errors */
-#define GGRD_PE(x) {fprintf(stderr,"ggrd: %s\n",x);}
-#define GGRD_MEMERROR(x) {fprintf(stderr,"%s: memory allocation error, exiting\n",x);exit(-1);}
-/* radius of CMB */
-#define GGRD_RCMB_ND 0.546225
-
-#ifdef M_PI
-#define GGRD_PI M_PI
-#else
-#define GGRD_PI 3.1415926535897932384626433832795
-#endif
-
-#ifndef GGRD_TWOPI
-#define GGRD_TWOPI 6.283185307179586476925286766559005768394
-#endif
-
-/* 180/pi */
-#ifndef GGRD_PIF
-#define GGRD_PIF 57.295779513082320876798154814105
-#endif 
-/* 
-   
-modes
-
-*/
-#define GGRD_NORMAL 0
-#define GGRD_ONLY_VEL_STATS 1
-
-
-#include "ggrd_struc.h"
-
-/* filenames */
-
-#define GGRD_VSFILE "vrms.dat"	/* vel stat file */
-#define GGRD_THFILE "vtimes.dat" /* times for velocities */
-#define GGRD_DFILE "vdepth.dat"	/* depth layer file */
-
-#define  __READ_GGRD_HEADER__
-
-#endif

Added: mc/1D/hc/trunk/ggrd_base.h
===================================================================
--- mc/1D/hc/trunk/ggrd_base.h	                        (rev 0)
+++ mc/1D/hc/trunk/ggrd_base.h	2012-11-01 02:16:40 UTC (rev 20975)
@@ -0,0 +1,66 @@
+#ifndef __READ_GGRD_HEADER__
+
+//
+//     max order of interpolation - 1
+//     ie. if 3, this means will do fourth order on 0,1,2,GGRD_DEF_ORDER arrays
+#define GGRD_MAX_ORDER 5
+  //     order of derivatives needed in general for the weighting routine
+#define GGRD_MAX_IORDER 1
+
+#define GGRD_MAX_ORDERP1 (GGRD_MAX_ORDER+1)
+#define GGRD_MAX_IORDERP1 (GGRD_MAX_IORDER+1)
+
+#ifndef GGRD_CPREC			/* 
+				   precision for most C functions
+				*/
+#define GGRD_CPREC double
+#define GGRD_EPS 5e-15
+#define ggrd_boolean unsigned char
+#ifndef HC_FLT_FORMAT
+#define HC_FLT_FORMAT "%lf"
+#endif
+#endif
+
+/* string length */
+#define GGRD_STRLEN 300
+
+/* errors */
+#define GGRD_PE(x) {fprintf(stderr,"ggrd: %s\n",x);}
+#define GGRD_MEMERROR(x) {fprintf(stderr,"%s: memory allocation error, exiting\n",x);exit(-1);}
+/* radius of CMB */
+#define GGRD_RCMB_ND 0.546225
+
+#ifdef M_PI
+#define GGRD_PI M_PI
+#else
+#define GGRD_PI 3.1415926535897932384626433832795
+#endif
+
+#ifndef GGRD_TWOPI
+#define GGRD_TWOPI 6.283185307179586476925286766559005768394
+#endif
+
+/* 180/pi */
+#ifndef GGRD_PIF
+#define GGRD_PIF 57.295779513082320876798154814105
+#endif 
+/* 
+   
+modes
+
+*/
+#define GGRD_NORMAL 0
+#define GGRD_ONLY_VEL_STATS 1
+
+
+#include "ggrd_struc.h"
+
+/* filenames */
+
+#define GGRD_VSFILE "vrms.dat"	/* vel stat file */
+#define GGRD_THFILE "vtimes.dat" /* times for velocities */
+#define GGRD_DFILE "vdepth.dat"	/* depth layer file */
+
+#define  __READ_GGRD_HEADER__
+
+#endif

Modified: mc/1D/hc/trunk/ggrd_grdtrack_util.h
===================================================================
--- mc/1D/hc/trunk/ggrd_grdtrack_util.h	2012-10-31 15:57:51 UTC (rev 20974)
+++ mc/1D/hc/trunk/ggrd_grdtrack_util.h	2012-11-01 02:16:40 UTC (rev 20975)
@@ -13,7 +13,7 @@
 #endif
 
 
-#include "ggrd.h"
+#include "ggrd_base.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: mc/1D/hc/trunk/hc.h
===================================================================
--- mc/1D/hc/trunk/hc.h	2012-10-31 15:57:51 UTC (rev 20974)
+++ mc/1D/hc/trunk/hc.h	2012-11-01 02:16:40 UTC (rev 20975)
@@ -124,7 +124,6 @@
    dealing with velocity grids 
 
 */
-#include "ggrd.h"
 #include "ggrd_grdtrack_util.h"
 /*
 

Modified: mc/1D/hc/trunk/make_tar
===================================================================
--- mc/1D/hc/trunk/make_tar	2012-10-31 15:57:51 UTC (rev 20974)
+++ mc/1D/hc/trunk/make_tar	2012-11-01 02:16:40 UTC (rev 20975)
@@ -2,7 +2,7 @@
 #
 # create a tar file 
 #
-ver=${1-1.0.2}
+ver=${1-1.0.3}
 date=`date '+%m%d%y'`
 
 tf=$HOME/tmp/hc-$ver.$date.tgz