[cig-commits] r8992 - mc/1D/hc/trunk
becker at geodynamics.org
becker at geodynamics.org
Mon Jan 7 18:11:58 PST 2008
Author: becker
Date: 2008-01-07 18:11:57 -0800 (Mon, 07 Jan 2008)
New Revision: 8992
Modified:
mc/1D/hc/trunk/Makefile
mc/1D/hc/trunk/ggrd.h
mc/1D/hc/trunk/ggrd_grdtrack_util.h
mc/1D/hc/trunk/ggrd_struc.h
mc/1D/hc/trunk/hc.h
mc/1D/hc/trunk/hc_auto_proto.h
mc/1D/hc/trunk/make_tar
mc/1D/hc/trunk/prem.h
mc/1D/hc/trunk/prem_util.c
mc/1D/hc/trunk/sh_syn.c
Log:
Minor fix to make compilation smoother with GMT4.2.1
Modified: mc/1D/hc/trunk/Makefile
===================================================================
--- mc/1D/hc/trunk/Makefile 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/Makefile 2008-01-08 02:11:57 UTC (rev 8992)
@@ -19,8 +19,10 @@
GGRD_INC_FLAGS = -I$(GMTHOME)/include -I$(NETCDFHOME)/include
GGRD_LIBS_LINKLINE = -lggrd -lgmt -lnetcdf
#
+#
# for GMT version >= 4.1.2, uncomment the next two lines
-#GGRD_INC_FLAGS = -I$(GMTHOME)/include -I$(NETCDFHOME)/include -DUSE_GMT4
+#
+#GGRD_INC_FLAGS = -I$(GMTHOME)/include -I$(NETCDFHOME)/include -DUSE_GMT4
#GGRD_LIBS_LINKLINE = -lggrd -lgmt -lpsl -lnetcdf
#
#
Modified: mc/1D/hc/trunk/ggrd.h
===================================================================
--- mc/1D/hc/trunk/ggrd.h 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/ggrd.h 2008-01-08 02:11:57 UTC (rev 8992)
@@ -1,7 +1,4 @@
#ifndef __READ_GGRD_HEADER__
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
//
// max order of interpolation - 1
Modified: mc/1D/hc/trunk/ggrd_grdtrack_util.h
===================================================================
--- mc/1D/hc/trunk/ggrd_grdtrack_util.h 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/ggrd_grdtrack_util.h 2008-01-08 02:11:57 UTC (rev 8992)
@@ -5,17 +5,19 @@
*/
-#include <string.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
#ifndef __GGRD_READ_GMT__
#include "gmt.h"
#define __GGRD_READ_GMT__
#endif
+
#include "ggrd.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
/*
wrappers
Modified: mc/1D/hc/trunk/ggrd_struc.h
===================================================================
--- mc/1D/hc/trunk/ggrd_struc.h 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/ggrd_struc.h 2008-01-08 02:11:57 UTC (rev 8992)
@@ -4,8 +4,11 @@
*/
+#ifndef __GMT_INCLUDED__
#include "gmt.h"
#include "gmt_bcr.h"
+#define __GMT_INCLUDED__
+#endif
/*
plate tectonic stages interpolation structure
Modified: mc/1D/hc/trunk/hc.h
===================================================================
--- mc/1D/hc/trunk/hc.h 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/hc.h 2008-01-08 02:11:57 UTC (rev 8992)
@@ -9,12 +9,11 @@
*/
#ifndef __HC_READ_HEADER_FILE__
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <malloc.h>
-#include <limits.h>
+#ifndef __GMT_INCLUDED__
+#include "gmt.h"
+#include "gmt_bcr.h"
+#define __GMT_INCLUDED__
+#endif
#include "hc_filenames.h"
/*
@@ -79,6 +78,15 @@
*/
#include "sh.h"
+
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <malloc.h>
+#include <limits.h>
+
+
/*
use short format for spherical harmonic models
Modified: mc/1D/hc/trunk/hc_auto_proto.h
===================================================================
--- mc/1D/hc/trunk/hc_auto_proto.h 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/hc_auto_proto.h 2008-01-08 02:11:57 UTC (rev 8992)
@@ -16,8 +16,6 @@
void ggrd_vecrealloc(double **, int, char *);
float ggrd_gt_rms(float *, int);
float ggrd_gt_mean(float *, int);
-void ggrd_global_bcr_assign(struct BCR *);
-void my_GMT_bcr_init(struct GRD_HEADER *, int *, int, struct BCR *);
/* ggrd_readgrds.c */
void ggrd_init_vstruc(struct ggrd_vel *);
int ggrd_read_vel_grids(struct ggrd_vel *, double, unsigned short, unsigned short, char *);
Modified: mc/1D/hc/trunk/make_tar
===================================================================
--- mc/1D/hc/trunk/make_tar 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/make_tar 2008-01-08 02:11:57 UTC (rev 8992)
@@ -2,7 +2,7 @@
#
# create a tar file
#
-ver=${1-0.1.1}
+ver=${1-0.1.3}
date=`date '+%m%d%y'`
tf=$HOME/tmp/hc-$ver.$date.tgz
@@ -28,8 +28,15 @@
cd -
-cp $tf $HOME/public_html/ftp/
+mv $tf $HOME/public_html/software/
+tf=$HOME/public_html/software/hc-$ver.$date.tgz
echo $0: output in $tf
-ls $HOME/public_html/ftp/*tgz
+if [ -s $tf ];then
+ cd $HOME/public_html/
+ ln -fs software/hc-$ver.$date.tgz hc-recent.tgz
+ echo $0: linked to hc-recent.tgz in `pwd`
+ cd -
+fi
+
Modified: mc/1D/hc/trunk/prem.h
===================================================================
--- mc/1D/hc/trunk/prem.h 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/prem.h 2008-01-08 02:11:57 UTC (rev 8992)
@@ -9,11 +9,8 @@
#ifndef __READ_PREM_HEADER__
#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <limits.h>
-#include <string.h>
+
#define PREM_F_STRING "%lf"
/* default number of layers */
Modified: mc/1D/hc/trunk/prem_util.c
===================================================================
--- mc/1D/hc/trunk/prem_util.c 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/prem_util.c 2008-01-08 02:11:57 UTC (rev 8992)
@@ -9,8 +9,10 @@
- */
+*/
#include "prem.h"
+#include <math.h>
+#include <stdlib.h>
/*
given a radius in ruinits and n layers at radii, find the layer index
Modified: mc/1D/hc/trunk/sh_syn.c
===================================================================
--- mc/1D/hc/trunk/sh_syn.c 2008-01-08 01:36:49 UTC (rev 8991)
+++ mc/1D/hc/trunk/sh_syn.c 2008-01-08 02:11:57 UTC (rev 8992)
@@ -1,7 +1,7 @@
+#include "hc.h"
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#include "hc.h"
/*
More information about the cig-commits
mailing list