Skip to content

Commit 931f4ac

Browse files
committed
update print_cell
1 parent aabb29a commit 931f4ac

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

source/module_cell/print_cell.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ namespace unitcell
3131
const double& x = direct? atoms[it].taud[ia].x: atoms[it].tau[ia].x;
3232
const double& y = direct? atoms[it].taud[ia].y: atoms[it].tau[ia].y;
3333
const double& z = direct? atoms[it].taud[ia].z: atoms[it].tau[ia].z;
34-
table += FmtCore::format(" %-s%-5d%10.3f%10.3f%10.3f%8.3f%8.3f%8.3f%8.3f\n",
34+
table += FmtCore::format("%8s%10.3f%10.3f%10.3f%8.3f%8.3f%8.3f%8.3f\n",
3535
atoms[it].label,
36-
ia+1,
3736
x,
3837
y,
3938
z,

source/module_cell/test/unitcell_test.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,8 @@ TEST_F(UcellTest, PrintTauDirect)
10181018
ifs.open("print_tau_direct");
10191019
std::string str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
10201020
EXPECT_THAT(str, testing::HasSubstr("DIRECT COORDINATES"));
1021-
EXPECT_THAT(str, testing::HasSubstr("taud_C1 0.1000000000 0.1000000000 0.1000000000"));
1021+
EXPECT_THAT(str, testing::HasSubstr(" C 0.100 0.100 0.100 0.000 0.100 0.100 0.100"));
1022+
EXPECT_THAT(str, testing::HasSubstr(" H 0.150 0.150 0.150 0.000 0.100 0.100 0.100"));
10221023
ifs.close();
10231024
remove("print_tau_direct");
10241025
}
@@ -1036,7 +1037,8 @@ TEST_F(UcellTest, PrintTauCartesian)
10361037
ifs.open("print_tau_Cartesian");
10371038
std::string str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
10381039
EXPECT_THAT(str, testing::HasSubstr("CARTESIAN COORDINATES"));
1039-
EXPECT_THAT(str, testing::HasSubstr("tauc_C1 1.0000000000 1.0000000000 1.0000000000"));
1040+
EXPECT_THAT(str, testing::HasSubstr(" C 1.000 1.000 1.000 0.000 0.000 0.000 0.000"));
1041+
EXPECT_THAT(str, testing::HasSubstr(" H 1.500 1.500 1.500 0.000 0.000 0.000 0.000"));
10401042
ifs.close();
10411043
remove("print_tau_Cartesian");
10421044
}

0 commit comments

Comments
 (0)