Skip to content

Commit 14f2227

Browse files
committed
fix bug in compile
1 parent f0c176f commit 14f2227

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

source/module_basis/module_ao/test/ORB_unittest.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ void test_orb::TearDown()
2828
}
2929
ooo.clear_after_ions(OGT, ORB, 0, nproj);
3030
delete[] nproj;
31-
delete[] orbital_fn;
3231
return;
3332
}
3433

@@ -75,7 +74,7 @@ void test_orb::set_orbs()
7574
ORB.init(ofs_running,
7675
ntype_read,
7776
"./",
78-
orbital_fn,
77+
orbital_fn.data(),
7978
descriptor_file,
8079
lmax,
8180
lcao_ecut,
@@ -114,7 +113,7 @@ void test_orb::set_files()
114113

115114
ModuleBase::GlobalFunc::SCAN_BEGIN(ifs, "NUMERICAL_ORBITAL");
116115

117-
orbital_fn = new std::string[ntype_read];
116+
orbital_fn.resize(ntype_read);
118117

119118
for (int it = 0; it < ntype_read; it++)
120119
{

source/module_basis/module_ao/test/ORB_unittest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class test_orb : public testing::Test
6666
int lmax = 1;
6767
double lat0 = 1.0;
6868
std::string case_dir = "./GaAs/";
69-
std::string* orbital_fn;
69+
std::vector<std::string> orbital_fn;
7070
std::string descriptor_file;
7171
};
7272
#endif

source/module_hamilt_lcao/module_deltaspin/test/prepare_unitcell.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class UcellTestPrepare
8282
ucell.atom_mass = new double[ucell.ntype];
8383
ucell.pseudo_fn = new std::string[ucell.ntype];
8484
ucell.pseudo_type = new std::string[ucell.ntype];
85-
ucell.orbital_fn = new std::string[ucell.ntype];
85+
ucell.orbital_fn.resize(ucell.ntype);
8686
ucell.magnet.start_magnetization = new double[ucell.ntype]; // mag set here
8787
ucell.magnet.ux_[0] = 0.0; // ux_ set here
8888
ucell.magnet.ux_[1] = 0.0;

source/module_io/json_output/test/para_json_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ TEST(AbacusJsonTest, Init_stru_test)
338338
double lat0 = 10.0;
339339
ucell.ntype = 1;
340340
ucell.pseudo_fn = new std::string[1];
341-
ucell.orbital_fn = new std::string[1];
341+
ucell.orbital_fn.resize(1);
342342
ucell.atoms = atomlist;
343343
ucell.atom_label = new std::string[1];
344344
ucell.lat0 = lat0;

source/module_io/test/to_qo_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,8 @@ TEST_F(toQOTest, CalculateSelfOvlpRMinimal)
649649
PARAM.input.qo_screening_coeff);
650650
std::vector<ModuleBase::Vector3<double>> kvecs_d;
651651
kvecs_d.push_back(ModuleBase::Vector3<double>(0.0, 0.0, 0.0)); // Gamma point
652-
ucell.orbital_fn.data()[0] = "Si_special_use_unittest.orb"; // generated in unittest BuildAo
653-
ucell.orbital_fn.data()[1] = "C_special_use_unittest.orb"; // generated in unittest BuildAo
652+
ucell.orbital_fn[0] = "Si_special_use_unittest.orb"; // generated in unittest BuildAo
653+
ucell.orbital_fn[1] = "C_special_use_unittest.orb"; // generated in unittest BuildAo
654654
ucell.atoms[1].nwl = 1; // only s and p for C
655655
tqo.initialize(PARAM.sys.global_out_dir,
656656
"",
@@ -718,8 +718,8 @@ TEST_F(toQOTest, CalculateSelfOvlpKSymmetrical)
718718
{"minimal-nodeless", "minimal-nodeless"},
719719
PARAM.input.qo_thr,
720720
PARAM.input.qo_screening_coeff);
721-
ucell.orbital_fn.data()[0] = "Si_special_use_unittest.orb"; // generated in unittest BuildAo
722-
ucell.orbital_fn.data()[1] = "C_special_use_unittest.orb"; // generated in unittest BuildAo
721+
ucell.orbital_fn[0] = "Si_special_use_unittest.orb"; // generated in unittest BuildAo
722+
ucell.orbital_fn[1] = "C_special_use_unittest.orb"; // generated in unittest BuildAo
723723
ucell.atoms[1].nwl = 1; // only s and p for C
724724

725725
std::vector<ModuleBase::Vector3<double>> kvecs_d;
@@ -894,8 +894,8 @@ TEST_F(toQOTest, CalculateSelfOvlpRFull)
894894
PARAM.input.qo_screening_coeff);
895895
std::vector<ModuleBase::Vector3<double>> kvecs_d;
896896
kvecs_d.push_back(ModuleBase::Vector3<double>(0.0, 0.0, 0.0)); // Gamma point
897-
ucell.orbital_fn.data()[0] = "Si_special_use_unittest.orb"; // generated in unittest BuildAo
898-
ucell.orbital_fn.data()[1] = "C_special_use_unittest.orb"; // generated in unittest BuildAo
897+
ucell.orbital_fn[0] = "Si_special_use_unittest.orb"; // generated in unittest BuildAo
898+
ucell.orbital_fn[1] = "C_special_use_unittest.orb"; // generated in unittest BuildAo
899899
ucell.atoms[1].nwl = 1; // only s and p for C
900900
PARAM.input.qo_thr = 1e-10;
901901
tqo.initialize(PARAM.sys.global_out_dir,

0 commit comments

Comments
 (0)