Skip to content

FIX: add last segemnt contribution to traveltime in raytracing #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 2, 2025
Merged

FIX: add last segemnt contribution to traveltime in raytracing #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8673602
FIX: add last segemnt contribution to traveltime in raytracing
Dengda98 Sep 2, 2025
3b9735a
Merge branch 'main' into raytracing
Dengda98 Sep 2, 2025
d843b52
BUILD: add -std=gnu99
Dengda98 Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pyfmm/C_extension/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ endif
ARCH =

# -ffast-math -march=native -mtune=native # 如果加上这些选项，数学库-lm需要在编译动态库时再次显式指定。总是gcc的编译参数的前后顺序很讲究
CFLAGS = $(LINK_STATIC) -lm -O3 -g -fPIC \
CFLAGS = $(LINK_STATIC) -lm -std=gnu99 -O3 -fPIC \
-Wall $(STACK_MEM) -I$(shell realpath $(INC_DIR)) $(ARCH) $(FOMPFLAGS) # -fsanitize=address -lasan

SRCS = $(wildcard $(SRC_DIR)/*.c)
Expand All @@ -69,10 +69,12 @@ DEPS_DOUBLE := $(OBJS_DOUBLE:.o=.d)
# 生成的库名称
TARGET_FLOAT = $(LIB_NAME)_float$(LIB_EXT)
TARGET_DOUBLE = $(LIB_NAME)_double$(LIB_EXT)
STATIC_TARGET_FLOAT = $(LIB_NAME)_float.a
STATIC_TARGET_DOUBLE = $(LIB_NAME)_double.a

.PHONY: all clean cleanbuild

all: $(BUILD_DIR) $(LIB_DIR) $(TARGET_FLOAT) $(TARGET_DOUBLE)
all: $(BUILD_DIR) $(LIB_DIR) $(TARGET_FLOAT) $(TARGET_DOUBLE) $(STATIC_TARGET_FLOAT) $(STATIC_TARGET_DOUBLE)

$(BUILD_DIR):
@mkdir -p $@
Expand Down Expand Up @@ -112,6 +114,11 @@ $(TARGET_FLOAT): $(OBJS_FLOAT)
$(TARGET_DOUBLE): $(OBJS_DOUBLE)
$(CC) -shared -o $@ $^ $(LDFLAGS)

$(STATIC_TARGET_FLOAT): $(OBJS_FLOAT)
ar rcs $@ $^

$(STATIC_TARGET_DOUBLE): $(OBJS_DOUBLE)
ar rcs $@ $^

cleanbuild:
rm -rf $(BUILD_DIR)
Expand Down
8 changes: 0 additions & 8 deletions pyfmm/C_extension/include/mallocfree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,5 @@ void free3d(void ***arr, MYINT n1, MYINT n2);
void free2d(void **arr, MYINT n1);


/**
* 释放一维指针内存空间
*
* @param arr (in)一维指针
*
*/
void free1d(void *arr);



45 changes: 29 additions & 16 deletions pyfmm/C_extension/src/fmm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ HEAP_DATA * FastMarching_with_initial(

// break loop in advance when reach the boundary
if( edgeStop!=NULL && (
edgeStop[0]&&ir0==0 || edgeStop[1]&&ir0==nr-1 ||
edgeStop[2]&&it0==0 || edgeStop[3]&&it0==nt-1 ||
edgeStop[4]&&ip0==0 || edgeStop[5]&&ip0==np-1)) break;
(edgeStop[0]&&ir0==0) || (edgeStop[1]&&ir0==nr-1) ||
(edgeStop[2]&&it0==0) || (edgeStop[3]&&it0==nt-1) ||
(edgeStop[4]&&ip0==0) || (edgeStop[5]&&ip0==np-1))) break;



Expand Down Expand Up @@ -606,14 +606,14 @@ HEAP_DATA * init_source_TT_refinegrid(

}}

free1d(rfg_TT);
free1d(rfg_Slw);
free1d(rfg_rs);
free1d(rfg_ts);
free1d(rfg_ps);
free(rfg_TT);
free(rfg_Slw);
free(rfg_rs);
free(rfg_ts);
free(rfg_ps);

free1d(rfg_FMM_data);
free1d(rfg_NroIdx);
free(rfg_FMM_data);
free(rfg_NroIdx);


return FMM_data;
Expand Down Expand Up @@ -980,17 +980,30 @@ MYREAL FMM_raytracing(
rays[3*idot] = r0;
rays[3*idot+1] = t0;
rays[3*idot+2] = p0;

if(Slw != NULL){
// compute distance of last two points
if(sphcoord){
rtp2xyz(r1, t1, p1, &x1, &y1, &z1);
dx = x1-x0;
dy = y1-y0;
dz = z1-z0;
dist = sqrt(dx*dx + dy*dy + dz*dz);
} else {
dist = sqrt(pow(r0-r1,2) + pow(t0-t1,2) + pow(p0-p1,2));
}
rmid = (r0 + r1)/2.0;
tmid = (t0 + t1)/2.0;
pmid = (p0 + p1)/2.0;
travt1 += trilinear_one_ravel(
rs, nr, ts, nt, ps, np, ntp, Slw, rmid, tmid, pmid,
NULL, NULL, NULL, NULL, NULL) * dist;
}

idot++;
*N = idot;

if(Slw != NULL){
rmid = (r0 + rays[3*idot-3])/2.0;
tmid = (t0 + rays[3*idot-2])/2.0;
pmid = (p0 + rays[3*idot-1])/2.0;
travt1 += trilinear_one_ravel(
rs, nr, ts, nt, ps, np, ntp, Slw, rmid, tmid, pmid,
NULL, NULL, NULL, NULL, NULL) * seglen1;
return travt1;
} else {
return travt;
Expand Down
5 changes: 0 additions & 5 deletions pyfmm/C_extension/src/mallocfree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,3 @@ void free2d(void **arr, MYINT n1){
}
free(arr);
}

void free1d(void *arr){
free(arr);
}