zhangyiss/magtet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update src

Browse Source
This commit is contained in:
张壹 2021-08-06 22:16:29 +08:00
parent d810b054b4
commit 637692075e
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/magtet.cpp
View File

@ -125,12 +125,12 @@ void magtet::write_text(std::string out_name)
void magtet::cal_tensors() void magtet::cal_tensors()
{ {
//ele_para_.resize(ele_num_); ele_para_.resize(ele_num_);
gctl::point3dc v1, v2, v3, nf, ne; gctl::point3dc v1, v2, v3, nf, ne;
for (int e = 0; e < ele_num_; ++e) for (int e = 0; e < ele_num_; ++e)
{ {
ele_[e].att = new magtet_para; ele_[e].att = ele_para_.get(e);
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
@ -150,9 +150,6 @@ void magtet::cal_tensors()
ele_[e].att->mag_amp[i] = gctl::dot(magz_[e], ele_[e].att->fnorm[i]); ele_[e].att->mag_amp[i] = gctl::dot(magz_[e], ele_[e].att->fnorm[i]);
} }
// link magtet_para to tetrahedron's attribute
//ele_[e].att = ele_para_.get(e);
} }
return; return;
} }

10
src/magtet.h
View File

@ -31,13 +31,7 @@ class magtet
{ {
public: public:
magtet(){} magtet(){}
virtual ~magtet() virtual ~magtet(){}
{
for (int i = 0; i < ele_num_; ++i)
{
delete ele_[i].att;
}
}
void read_tet(std::string tet_name); void read_tet(std::string tet_name);
void init_magz(std::string para); void init_magz(std::string para);
@ -60,7 +54,7 @@ protected:
gctl::array<gctl::vertex3dc> node_; // 四面体元素的顶点集 gctl::array<gctl::vertex3dc> node_; // 四面体元素的顶点集
gctl::array<mag_tetrahedron> ele_; // 四面体的元素集 gctl::array<mag_tetrahedron> ele_; // 四面体的元素集
gctl::array<gctl::point3dc> magz_; // 磁化矢量数组 gctl::array<gctl::point3dc> magz_; // 磁化矢量数组
//gctl::array<magtet_para> ele_para_; // 四面体的张量属性与磁化矢量 gctl::array<magtet_para> ele_para_; // 四面体的张量属性与磁化矢量
gctl::array<gctl::point3dc> site_; // 观测点位置集 gctl::array<gctl::point3dc> site_; // 观测点位置集
gctl::array<double> mag_pot_; // 正演磁位 gctl::array<double> mag_pot_; // 正演磁位