From 867360245c572e6e9c709edbfa433ecb280a2b04 Mon Sep 17 00:00:00 2001 From: Dengda98 Date: Tue, 2 Sep 2025 23:18:59 +0800 Subject: [PATCH 1/2] FIX: add last segemnt contribution to traveltime in raytracing --- pyfmm/C_extension/Makefile | 9 +++++- pyfmm/C_extension/include/mallocfree.h | 8 ----- pyfmm/C_extension/src/fmm.c | 45 +++++++++++++++++--------- pyfmm/C_extension/src/mallocfree.c | 5 --- 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/pyfmm/C_extension/Makefile b/pyfmm/C_extension/Makefile index b56c9d5..c0d2a3a 100644 --- a/pyfmm/C_extension/Makefile +++ b/pyfmm/C_extension/Makefile @@ -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 $@ @@ -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) diff --git a/pyfmm/C_extension/include/mallocfree.h b/pyfmm/C_extension/include/mallocfree.h index c3ef551..e216271 100644 --- a/pyfmm/C_extension/include/mallocfree.h +++ b/pyfmm/C_extension/include/mallocfree.h @@ -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); - diff --git a/pyfmm/C_extension/src/fmm.c b/pyfmm/C_extension/src/fmm.c index 2e91c6a..411ca15 100644 --- a/pyfmm/C_extension/src/fmm.c +++ b/pyfmm/C_extension/src/fmm.c @@ -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; @@ -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; @@ -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; diff --git a/pyfmm/C_extension/src/mallocfree.c b/pyfmm/C_extension/src/mallocfree.c index 96ff22f..367f9bd 100644 --- a/pyfmm/C_extension/src/mallocfree.c +++ b/pyfmm/C_extension/src/mallocfree.c @@ -73,8 +73,3 @@ void free2d(void **arr, MYINT n1){ } free(arr); } - -void free1d(void *arr){ - free(arr); -} - From d843b5266f0f55122d4e5fcd84c8640ad29a0cbe Mon Sep 17 00:00:00 2001 From: Dengda98 Date: Tue, 2 Sep 2025 23:32:45 +0800 Subject: [PATCH 2/2] BUILD: add -std=gnu99 --- pyfmm/C_extension/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfmm/C_extension/Makefile b/pyfmm/C_extension/Makefile index c0d2a3a..52c52af 100644 --- a/pyfmm/C_extension/Makefile +++ b/pyfmm/C_extension/Makefile @@ -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)