[cig-commits] r9086 - mc/3D/CitcomS/trunk/lib

[becker at geodynamics.org]

Author: becker
Date: 2008-01-16 18:06:25 -0800 (Wed, 16 Jan 2008)
New Revision: 9086

Modified:
   mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
   mc/3D/CitcomS/trunk/lib/global_defs.h
Log:
Changed GNOMONIC to CITCOM_GNOMONIC to avoid namespace conflict with GMT gmt.h



Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2008-01-17 01:25:15 UTC (rev 9085)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2008-01-17 02:06:25 UTC (rev 9086)
@@ -2799,7 +2799,7 @@
     double u, v, cosc, theta_f, phi_f, dphi, cosd;
     double *cost, *sint, *cosf, *sinf;
 
-    if ((E->gnomonic = malloc((E->lmesh.nsf+1)*sizeof(struct GNOMONIC)))
+    if ((E->gnomonic = malloc((E->lmesh.nsf+1)*sizeof(struct CITCOM_GNOMONIC)))
         == NULL) {
         fprintf(stderr,"Error(define uv)-not enough memory(a)\n");
         exit(10);

Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h	2008-01-17 01:25:15 UTC (rev 9085)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h	2008-01-17 02:06:25 UTC (rev 9086)
@@ -654,7 +654,7 @@
 };
 
 
-struct GNOMONIC {
+struct CITCOM_GNOMONIC {
     /* gnomonic projected coordinate */
     double u;
     double v;
@@ -698,7 +698,7 @@
     /* for chemical convection & composition rheology */
     struct COMPOSITION composition;
 
-    struct GNOMONIC *gnomonic;
+    struct CITCOM_GNOMONIC *gnomonic;
 
     struct COORD *eco[NCS];
     struct IEN *ien[NCS];  /* global */