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

[becker at geodynamics.org]

Author: becker
Date: 2010-04-28 12:05:40 -0700 (Wed, 28 Apr 2010)
New Revision: 16592

Modified:
   mc/1D/hc/trunk/Makefile
   mc/1D/hc/trunk/ggrd_readgrds.c
   mc/1D/hc/trunk/ggrd_velinterpol.c
   mc/1D/hc/trunk/hc_constants.h
   mc/1D/hc/trunk/hc_polsol.c
   mc/1D/hc/trunk/sh_exp.c
Log:
Further adjustments to improve compatibilty with new GMT.



Modified: mc/1D/hc/trunk/Makefile
===================================================================
--- mc/1D/hc/trunk/Makefile	2010-04-28 15:30:49 UTC (rev 16591)
+++ mc/1D/hc/trunk/Makefile	2010-04-28 19:05:40 UTC (rev 16592)
@@ -275,7 +275,7 @@
 
 # debugging objects
 $(ODIR)/%.dbg.o: %.c  $(INCS)
-	$(CC) $(CFLAGS_DEBUG) $(INC_FLAGS) $(DEFINES) -c $< -o $(ODIR)/$*.dbg.o
+	$(CC) $(CFLAGS_DEBUG) -DHC_DEBUG $(INC_FLAGS) $(DEFINES) -c $< -o $(ODIR)/$*.dbg.o
 
 $(ODIR)/%.dbg.o: %.f90 $(INCS)
-	$(F90) $(F90FLAGS_DEBUG) $(DEFINES) -c $< -o $(ODIR)/$*.dbg.o
+	$(F90) $(F90FLAGS_DEBUG) -DHC_DEBUG $(DEFINES) -c $< -o $(ODIR)/$*.dbg.o

Modified: mc/1D/hc/trunk/ggrd_readgrds.c
===================================================================
--- mc/1D/hc/trunk/ggrd_readgrds.c	2010-04-28 15:30:49 UTC (rev 16591)
+++ mc/1D/hc/trunk/ggrd_readgrds.c	2010-04-28 19:05:40 UTC (rev 16592)
@@ -546,7 +546,7 @@
     }
   }
   if(set_to_constant){
-#ifdef DEBUG
+#ifdef HC_DEBUG
     fprintf(stderr,"ggrd_resort_and_check: WARNING: setting this field to constant: %g\n",
 	    constant);
 #endif

Modified: mc/1D/hc/trunk/ggrd_velinterpol.c
===================================================================
--- mc/1D/hc/trunk/ggrd_velinterpol.c	2010-04-28 15:30:49 UTC (rev 16591)
+++ mc/1D/hc/trunk/ggrd_velinterpol.c	2010-04-28 19:05:40 UTC (rev 16592)
@@ -242,7 +242,7 @@
     grid[j+i] = igrid[HC_PHI][i] * ggrd->v.dphi;
   
 
-#ifdef DEBUG
+#ifdef HC_DEBUG
   //     
   //     check if all indices are ok
   //     

Modified: mc/1D/hc/trunk/hc_constants.h
===================================================================
--- mc/1D/hc/trunk/hc_constants.h	2010-04-28 15:30:49 UTC (rev 16591)
+++ mc/1D/hc/trunk/hc_constants.h	2010-04-28 19:05:40 UTC (rev 16592)
@@ -5,8 +5,8 @@
 
 */
 // now taken from earth model
-#define HC_RE_KM 6371.0		/* radius(Earth) in [km] (equivalent
-				   volume radius of std ellipsoid) */
+#define HC_RE_KM 6371.0087714		/* radius(Earth) in [km] (equivalent
+					   volume radius of std ellipsoid) */
 
 
 #define HC_TIMESCALE_YR 1e6	/* timescale [yr] */

Modified: mc/1D/hc/trunk/hc_polsol.c
===================================================================
--- mc/1D/hc/trunk/hc_polsol.c	2010-04-28 15:30:49 UTC (rev 16591)
+++ mc/1D/hc/trunk/hc_polsol.c	2010-04-28 19:05:40 UTC (rev 16592)
@@ -206,7 +206,7 @@
       define a few offset and size pointers
   */
 
-#ifdef DEBUG
+#ifdef HC_DEBUG
   if(hc->nradp2 != nrad + 2){
     fprintf(stderr,"hc_polsol: radius number mismatch\n");
     exit(-1);

Modified: mc/1D/hc/trunk/sh_exp.c
===================================================================
--- mc/1D/hc/trunk/sh_exp.c	2010-04-28 15:30:49 UTC (rev 16591)
+++ mc/1D/hc/trunk/sh_exp.c	2010-04-28 19:05:40 UTC (rev 16592)
@@ -52,7 +52,7 @@
   exp->spectral_init = FALSE;
   /* type of expansion, e.g. SH_HEALPIX or SH_RICK, this will be checked later */
   exp->type = type;
-#ifdef DEBUG
+#ifdef HC_DEBUG
   /* 
      l and m bounds 
   */
@@ -1682,7 +1682,7 @@
 #endif
   HC_CPREC s1;
   int index;
-#ifdef DEBUG
+#ifdef HC_DEBUG
   /* do some checks */
   if((m > l)||(l<0)||(m<0)){
     fprintf(stderr,"sh_get_coeff: error: attempting to read l=%i and m=%i\n",
@@ -1786,7 +1786,7 @@
 #endif
   HC_CPREC s1;
   int index;
-#ifdef DEBUG
+#ifdef HC_DEBUG
   /* do some checks */
   if((m > l)||(l<0)||(m<0)){
     fprintf(stderr,"sh_write_coeff: error: attempting to write l=%i and m=%i\n",