Skip to content

Commit 1e9af8f

Browse files
thwbeckerthwbecker
committed
Changed naming convention
1 parent 05c03b5 commit 1e9af8f

File tree

5 files changed

+285
-278
lines changed

5 files changed

+285
-278
lines changed

‎Makefile‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ DEFINES = $(RICK_DEFINES) $(HEAL_DEFINES)
133133
LIBS = $(HC_LIBS) $(HEAL_LIBS) $(RICK_LIB)
134134

135135

136-
all: all_no_gmt sh_tools hc_tools
136+
all: all_no_gmt sh_tools hc_tools gmt_tools
137137

138138
all_no_gmt: $(ODIR) $(BDIR) libs hc_tools
139139

@@ -144,6 +144,9 @@ hc_tools: $(BDIR)/hc $(BDIR)/hc_visc_scan $(BDIR)/hc_invert_dtopo \
144144
$(BDIR)/hc_extract_sh_layer $(BDIR)/hc_extract_spatial \
145145
$(BDIR)/rotvec2vel $(BDIR)/print_gauss_lat
146146

147+
gmt_tools: $(BDIR)/grdgrd2correlation
148+
149+
147150
weird_tools: $(BDIR)/convert_bernhard_dens
148151

149152
libs: $(ODIR) $(BDIR) hc_lib $(HEAL_LIBS) $(RICK_LIB)
@@ -154,9 +157,9 @@ ggrd_lib: ggrd_proto $(GGRD_LIBS)
154157

155158
debug_libs: $(HC_LIBS_DEBUG)
156159

157-
really_all: proto all debug_libs $(BDIR)/hc.dbg \
160+
really_all: proto all debug_libs weird_tools $(BDIR)/hc.dbg \
158161
hcplates $(BDIR)/ggrd_test $(BDIR)/grdinttester \
159-
$(BDIR)/prem2dsm $(BDIR)/prem2r
162+
$(BDIR)/prem2dsm $(BDIR)/prem2r
160163

161164

162165

@@ -205,7 +208,7 @@ $(BDIR)/print_gauss_lat: print_gauss_lat.c $(PREM_OBJS)
205208
$(LIB_FLAGS) -lrick -lhc $(LDFLAGS) -lm
206209

207210
$(BDIR)/convert_bernhard_dens: convert_bernhard_dens.c
208-
$(CC) $(CFLAGS) convert_bernhard_dens.c -o $(BDIR)/convert_bernhard_dens -lm $(INC_FLAGS) \
211+
$(CC) $(CFLAGS) convert_bernhard_dens.c $(PREM_OBJS) -o $(BDIR)/convert_bernhard_dens -lm $(INC_FLAGS) \
209212
$(LIB_FLAGS) -lrick -lhc $(LDFLAGS)
210213

211214
$(BDIR)/rotvec2vel: rotvec2vel.c $(PREM_OBJS)
@@ -250,6 +253,10 @@ $(BDIR)/grdinttester: $(GGRD_INCS) $(LIBS) $(GGRD_LIBS) $(INCS) grdinttester.c
250253
$(CC) $(LIB_FLAGS) grdinttester.c $(GGRD_DEFINES) -o $(BDIR)/grdinttester \
251254
$(GGRD_LIBS_LINKLINE) -lhc -lrick -lm $(LDFLAGS)
252255

256+
$(BDIR)/grdgrd2correlation: $(GGRD_INCS) $(LIBS) $(GGRD_LIBS) $(INCS) grdgrd2correlation.c fitxyee_util.c
257+
$(CC) $(LIB_FLAGS) grdgrd2correlation.c fitxyee_util.c $(GGRD_DEFINES) -o $(BDIR)/grdgrd2correlation \
258+
$(GGRD_LIBS_LINKLINE) -lhc -lrick -lm $(LDFLAGS)
259+
253260
$(BDIR)/hc_extract_sh_layer: $(LIBS) $(INCS) $(PREM_OBJS) $(ODIR)/hc_extract_sh_layer.o
254261
$(CC) $(LIB_FLAGS) $(ODIR)/hc_extract_sh_layer.o \
255262
-o $(BDIR)/hc_extract_sh_layer $(PREM_OBJS) \

‎Makefile.include‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#ADD_FLAGS = -DHC_PRECISION=32
1010
#
1111
# double precision
12-
ADD_FLAGS = -fPIC
12+
#ADD_FLAGS = -fPIC
13+
ADD_FLAGS =
1314

1415

1516
GGRD_INC_FLAGS = -I$(GMT4HOME)/include -I$(NETCDFDIR)/include

‎fitxyee.h‎

Lines changed: 51 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,76 @@
11
/* fitxyee.c */
2-
#include <math.h>
3-
#include <stdio.h>
4-
#include <stdlib.h>
5-
#include <string.h>
6-
#define PRECISION double
7-
//#define NR_ACC 1e-7
8-
#define NR_ACC 1e-15
9-
#define NR_EPS 5e-15
10-
#define FOURFORMAT "%lf %lf %lf %lf"
11-
#define TWOFORMAT "%lf %lf"
12-
2+
#include "hc.h"
3+
#define NR_ACC (HC_EPS_PREC*10)
4+
#define NR_EPS HC_EPS_PREC
135
/*
146
157
fit a line through x y data with uncertainties in both x and y
168
17-
$Id: fitxyee.c,v 1.2 2005/07/04 16:47:43 becker Exp becker $
18-
19-
From Numerical Recipes in C, p.668
9+
Copyright Numerical Recipes in C, p.668, do not distribute without
10+
permission
2011
2112
22-
major modifications:
13+
minor modifications:
2314
2415
- using data structure instead of x,y,sigx,sigy
2516
- removed global variables and put those into fit structure
2617
2718
*/
28-
static PRECISION _tmp_sqrarg;
29-
#define SQUARE(a) ((((_tmp_sqrarg=(a))) == 0.0) ? (0.0) : (_tmp_sqrarg*_tmp_sqrarg))
30-
#define SIGN(a,b) ((b) >= 0.0 ? fabs(a) : -fabs(a))
31-
static PRECISION _tmp_maxarg1,_tmp_maxarg2;
32-
#define FMAX(a,b) (_tmp_maxarg1=(a),_tmp_maxarg2=(b),(_tmp_maxarg1) > (_tmp_maxarg2) ?\
19+
static HC_PREC _tmp_sqrarg;
20+
#define NR_SQUARE(a) ((((_tmp_sqrarg=(a))) == 0.0) ? (0.0) : (_tmp_sqrarg*_tmp_sqrarg))
21+
#define NR_SIGN(a,b) ((b) >= 0.0 ? fabs(a) : -fabs(a))
22+
static HC_PREC _tmp_maxarg1,_tmp_maxarg2;
23+
#define NR_FMAX(a,b) (_tmp_maxarg1=(a),_tmp_maxarg2=(b),(_tmp_maxarg1) > (_tmp_maxarg2) ? \
3324
(_tmp_maxarg1) : (_tmp_maxarg2))
3425
/*
3526
data structure
3627
*/
37-
struct dp{
38-
PRECISION x,y,sigx,sigy;
28+
struct nr_dp{
29+
HC_PREC x,y,sigx,sigy;
3930
};
4031
/*
4132
fit structure
4233
*/
43-
struct fits{
34+
struct nr_fits{
4435
int nn;
45-
PRECISION *xx,*yy,*sx,*sy,*ww,aa,offs;
36+
HC_PREC *xx,*yy,*sx,*sy,*ww,aa,offs;
4637
};
4738

4839

4940

50-
void fit(struct dp *, int, PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION *);
51-
void fitexy(struct dp *, int, PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION *);
52-
PRECISION brent(PRECISION, PRECISION, PRECISION, PRECISION (*)(void), struct fits *, PRECISION, PRECISION *);
53-
PRECISION chixy(PRECISION, struct fits *);
54-
PRECISION gammq(PRECISION, PRECISION);
55-
void gcf(PRECISION *, PRECISION, PRECISION, PRECISION *);
56-
void gser(PRECISION *, PRECISION, PRECISION, PRECISION *);
57-
void nrerror(char []);
58-
PRECISION *vector(long, long);
59-
int *ivector(long, long);
60-
unsigned char *cvector(long, long);
61-
unsigned long *lvector(long, long);
62-
PRECISION *dvector(long, long);
63-
PRECISION **matrix(long, long, long, long);
64-
PRECISION **dmatrix(long, long, long, long);
65-
int **imatrix(long, long, long, long);
66-
PRECISION **submatrix(PRECISION **, long, long, long, long, long, long);
67-
PRECISION **convert_matrix(PRECISION *, long, long, long, long);
68-
PRECISION ***f3tensor(long, long, long, long, long, long);
69-
void free_vector(PRECISION *, long, long);
70-
void free_ivector(int *, long, long);
71-
void free_cvector(unsigned char *, long, long);
72-
void free_lvector(unsigned long *, long, long);
73-
void free_dvector(PRECISION *, long, long);
74-
void free_matrix(PRECISION **, long, long, long, long);
75-
void free_dmatrix(PRECISION **, long, long, long, long);
76-
void free_imatrix(int **, long, long, long, long);
77-
void free_submatrix(PRECISION **, long, long, long, long);
78-
void free_convert_matrix(PRECISION **, long, long, long, long);
79-
void free_f3tensor(PRECISION ***, long, long, long, long, long, long);
80-
void avevar(struct dp *, unsigned long, PRECISION *, PRECISION *);
81-
void fitline(PRECISION *, PRECISION *, int, PRECISION *, int, PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION *);
82-
void mnbrak(PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION *, PRECISION (*)(void), struct fits *);
83-
PRECISION zbrent(PRECISION (*)(void), struct fits *, PRECISION, PRECISION, PRECISION);
84-
PRECISION gammln(PRECISION);
85-
int comparef(struct dp *, struct dp *);
41+
void nr_fit(struct nr_dp *, int, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *);
42+
void nr_fitexy(struct nr_dp *, int, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *);
43+
HC_PREC nr_brent(HC_PREC, HC_PREC, HC_PREC, HC_PREC (*)(void), struct nr_fits *, HC_PREC, HC_PREC *);
44+
HC_PREC nr_chixy(HC_PREC, struct nr_fits *);
45+
HC_PREC nr_gammq(HC_PREC, HC_PREC);
46+
void nr_gcf(HC_PREC *, HC_PREC, HC_PREC, HC_PREC *);
47+
void nr_gser(HC_PREC *, HC_PREC, HC_PREC, HC_PREC *);
48+
void nr_error(char []);
49+
HC_PREC *nr_vector(long, long);
50+
int *nr_ivector(long, long);
51+
unsigned char *nr_cvector(long, long);
52+
unsigned long *nr_lvector(long, long);
53+
HC_PREC *nr_dvector(long, long);
54+
HC_PREC **nr_matrix(long, long, long, long);
55+
HC_PREC **nr_dmatrix(long, long, long, long);
56+
int **nr_imatrix(long, long, long, long);
57+
HC_PREC **nr_submatrix(HC_PREC **, long, long, long, long, long, long);
58+
HC_PREC **nr_convert_matrix(HC_PREC *, long, long, long, long);
59+
HC_PREC ***nr_f3tensor(long, long, long, long, long, long);
60+
void nr_free_vector(HC_PREC *, long, long);
61+
void nr_free_ivector(int *, long, long);
62+
void nr_free_cvector(unsigned char *, long, long);
63+
void nr_free_lvector(unsigned long *, long, long);
64+
void nr_free_dvector(HC_PREC *, long, long);
65+
void nr_free_matrix(HC_PREC **, long, long, long, long);
66+
void nr_free_dmatrix(HC_PREC **, long, long, long, long);
67+
void nr_free_imatrix(int **, long, long, long, long);
68+
void nr_free_submatrix(HC_PREC **, long, long, long, long);
69+
void nr_free_convert_matrix(HC_PREC **, long, long, long, long);
70+
void nr_free_f3tensor(HC_PREC ***, long, long, long, long, long, long);
71+
void nr_avevar(struct nr_dp *, unsigned long, HC_PREC *, HC_PREC *);
72+
void nr_fitline(HC_PREC *, HC_PREC *, int, HC_PREC *, int, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *);
73+
void nr_mnbrak(HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC *, HC_PREC (*)(void), struct nr_fits *);
74+
HC_PREC nr_zbrent(HC_PREC (*)(void), struct nr_fits *, HC_PREC, HC_PREC, HC_PREC);
75+
HC_PREC nr_gammln(HC_PREC);
76+
int nr_comparef(struct nr_dp *, struct nr_dp *);

0 commit comments

Comments
 (0)