From 637692075e1fd7084bfe70062605254c2e0820a7 Mon Sep 17 00:00:00 2001
From: Yi Zhang <zhangyiss@icloud.com>
Date: Fri, 6 Aug 2021 22:16:29 +0800
Subject: [PATCH] update src

---
 src/magtet.cpp |  7 ++-----
 src/magtet.h   | 10 ++--------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/magtet.cpp b/src/magtet.cpp
index 912fa0b..92b9f72 100644
--- a/src/magtet.cpp
+++ b/src/magtet.cpp
@@ -125,12 +125,12 @@ void magtet::write_text(std::string out_name)
 
 void magtet::cal_tensors()
 {
-	//ele_para_.resize(ele_num_);
+	ele_para_.resize(ele_num_);
 
 	gctl::point3dc v1, v2, v3, nf, ne;
 	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)
 		{
@@ -150,9 +150,6 @@ void magtet::cal_tensors()
 
 			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;
 }
diff --git a/src/magtet.h b/src/magtet.h
index 4a9b0cc..6402881 100644
--- a/src/magtet.h
+++ b/src/magtet.h
@@ -31,13 +31,7 @@ class magtet
 {
 public:
 	magtet(){}
-	virtual ~magtet()
-	{
-		for (int i = 0; i < ele_num_; ++i)
-		{
-			delete ele_[i].att;
-		}
-	}
+	virtual ~magtet(){}
 
 	void read_tet(std::string tet_name);
 	void init_magz(std::string para);
@@ -60,7 +54,7 @@ protected:
 	gctl::array<gctl::vertex3dc> node_; // 四面体元素的顶点集
 	gctl::array<mag_tetrahedron> ele_; // 四面体的元素集
 	gctl::array<gctl::point3dc> magz_; // 磁化矢量数组
-	//gctl::array<magtet_para> ele_para_; // 四面体的张量属性与磁化矢量
+	gctl::array<magtet_para> ele_para_; // 四面体的张量属性与磁化矢量
 	gctl::array<gctl::point3dc> site_; // 观测点位置集
 
 	gctl::array<double> mag_pot_; // 正演磁位