diff --git a/data/prism/prism_B.nc b/data/prism/prism_B.nc index 8ee252a..2e74d43 100644 Binary files a/data/prism/prism_B.nc and b/data/prism/prism_B.nc differ diff --git a/data/prism/prism_T.nc b/data/prism/prism_T.nc index 820f741..ec2a90f 100644 Binary files a/data/prism/prism_T.nc and b/data/prism/prism_T.nc differ diff --git a/data/prism/prism_V.nc b/data/prism/prism_V.nc index ea8b5f1..e259520 100644 Binary files a/data/prism/prism_V.nc and b/data/prism/prism_V.nc differ diff --git a/log.txt b/log.txt index 66f3810..a8a8fec 100644 --- a/log.txt +++ b/log.txt @@ -1,5 +1,5 @@ -tet-file = data/pipeline/pipeline -mag-file = data/pipeline/magz.txt -site-file = data/pipeline/site.txt -obs-file = data/pipeline/pipeline +tet-file = data/prism/prism.1 +mag-file = (0,0,200) +site-file = -30/30/-30/30/10/81/81 +obs-file = data/prism/prism cal-type = potential gradient tensor diff --git a/src/magtet.cpp b/src/magtet.cpp index ac65d75..500b315 100644 --- a/src/magtet.cpp +++ b/src/magtet.cpp @@ -1,10 +1,6 @@ #include "magtet.h" -magtet::magtet(){} - -magtet::~magtet(){} - void magtet::read_tet(std::string tet_name) { gctl::read_Tetgen_node(tet_name, node_); @@ -140,7 +136,7 @@ void magtet::cal_tensors() v1 = *ele_[e].fget(i, 1) - *ele_[e].fget(i, 0); v2 = *ele_[e].fget(i, 2) - *ele_[e].fget(i, 0); nf = gctl::cross(v1, v2).normal(); - // The space is declared by the read_magz() function + // The space is declared by the init_magz() function ele_para_[e].fnorm[i] = nf; for (int j = 0; j < 3; ++j) @@ -151,7 +147,7 @@ void magtet::cal_tensors() ele_para_[e].etang[j+i*3] = gctl::cross(nf, ne); } - ele_para_[e].mag_amp[i] = gctl::dot(magz_[e], ele_para_[e].fnorm[i]); + ele_para_[e].mag_amp[i] = gctl::dot(magz_[e], nf); } // link magtet_para to tetrahedron's attribute diff --git a/src/magtet.h b/src/magtet.h index ad65b09..fac1eec 100644 --- a/src/magtet.h +++ b/src/magtet.h @@ -19,6 +19,11 @@ #define RUN_ECHO(action, msg) do {std::clog << msg << "... \n"; action;} while(0); +/** + * @brief 计算磁场所需的四面体张量信息与磁化强度 + * + * 此结构体将连接至四面体元素的att指针上 + */ struct magtet_para { double mag_amp[4]; @@ -28,9 +33,6 @@ struct magtet_para class magtet { public: - magtet(); - virtual ~magtet(); - void read_tet(std::string tet_name); void init_magz(std::string para); void init_site(std::string para);