Skip to content

Update the outputs of geometry relaxation #6387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jul 14, 2025
Merged

Update the outputs of geometry relaxation #6387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d4b7ccb
update the output formats of rt-TDDFT
mohanchen Jul 13, 2025
91b0ee5
update the output formats of rt-TDDFT
mohanchen Jul 13, 2025
16398a5
fix a bug
mohanchen Jul 13, 2025
903adbc
update initialized velocities
mohanchen Jul 13, 2025
afe54de
found some output information is still lacking in MD module
mohanchen Jul 13, 2025
b654898
Merge branch 'deepmodeling:develop' into develop
mohanchen Jul 13, 2025
44cfd5e
update output information
mohanchen Jul 14, 2025
1add90d
remove some global variables in relax_driver
mohanchen Jul 14, 2025
2e93be8
update outputs
mohanchen Jul 14, 2025
0987b37
update relaxation outputs
mohanchen Jul 14, 2025
53764d8
update relaxation output messages
mohanchen Jul 14, 2025
899dde9
update tests of print info
mohanchen Jul 14, 2025
c6ae7cb
fix a test
mohanchen Jul 14, 2025
67c9e81
fix cg outputs
mohanchen Jul 14, 2025
c140d24
udpate cg test
mohanchen Jul 14, 2025
106d2a4
update relax tests
mohanchen Jul 14, 2025
8073403
update LCAO output stress format
mohanchen Jul 14, 2025
aae122a
change update_cell.cpp algorithm, when the ion move is larger than th…
mohanchen Jul 14, 2025
386c798
fix tests for unitcells
mohanchen Jul 14, 2025
d53da82
update cell
mohanchen Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions source/source_cell/atom_spec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ class Atom
std::vector<ModuleBase::Vector3<double>> taud; // Direct coordinates of each atom in this type.
std::vector<ModuleBase::Vector3<double>> vel; // velocities of each atom in this type.
std::vector<ModuleBase::Vector3<double>> force; // force acting on each atom in this type.
std::vector<ModuleBase::Vector3<double>>
lambda; // Lagrange multiplier for each atom in this type. used in deltaspin
std::vector<ModuleBase::Vector3<double>> lambda; // Lagrange multiplier for each atom in this type. used in deltaspin
std::vector<ModuleBase::Vector3<int>> constrain; // constrain for each atom in this type. used in deltaspin
std::string label_orb = "\0"; // atomic Element symbol in the orbital file of lcao

Expand Down
6 changes: 5 additions & 1 deletion source/source_cell/test/unitcell_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ TEST_F(UcellDeathTest, RemakeCellWarnings)
}
else
{
EXPECT_THAT(output, testing::HasSubstr("latname not supported!"));
EXPECT_THAT(output, testing::HasSubstr("latname type not supported!"));
}
}
}
Expand Down Expand Up @@ -804,6 +804,9 @@ TEST_F(UcellTest, SelectiveDynamics)
EXPECT_TRUE(ucell->if_atoms_can_move());
}


// mohan comment out 2025-07-14
/*
TEST_F(UcellDeathTest, PeriodicBoundaryAdjustment1)
{
UcellTestPrepare utp = UcellTestLib["C1H2-PBA"];
Expand All @@ -816,6 +819,7 @@ TEST_F(UcellDeathTest, PeriodicBoundaryAdjustment1)
std::string output = testing::internal::GetCapturedStdout();
EXPECT_THAT(output, testing::HasSubstr("the movement of atom is larger than the length of cell"));
}
*/

TEST_F(UcellTest, PeriodicBoundaryAdjustment2)
{
Expand Down
141 changes: 84 additions & 57 deletions source/source_cell/update_cell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#include "update_cell.h"
#include "bcast_cell.h"
#include "source_base/global_function.h"

namespace unitcell
{

void remake_cell(Lattice& lat)
{
ModuleBase::TITLE("Lattice", "rmake_cell");
Expand All @@ -13,18 +15,20 @@ void remake_cell(Lattice& lat)
std::string& latName = lat.latName;
ModuleBase::Matrix3& latvec = lat.latvec;

if (latName == "none") {
ModuleBase::WARNING_QUIT("UnitCell",
"to use fixed_ibrav, latname must be provided");
} else if (latName == "sc") // ibrav = 1
if (latName == "none")
{
ModuleBase::WARNING_QUIT("UnitCell", "to use fixed_ibrav, latname must be provided");
}
else if (latName == "sc") // ibrav = 1
{
double celldm = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2));

latvec.Zero();
latvec.e11 = latvec.e22 = latvec.e33 = celldm;
} else if (latName == "fcc") // ibrav = 2
{
}
else if (latName == "fcc") // ibrav = 2
{
double celldm = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2)) / std::sqrt(2.0);

Expand All @@ -37,8 +41,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = -celldm;
latvec.e32 = celldm;
latvec.e33 = 0.0;
} else if (latName == "bcc") // ibrav = 3
{
}
else if (latName == "bcc") // ibrav = 3
{
double celldm = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2))
/ std::sqrt(3.0);
Expand All @@ -52,9 +57,10 @@ void remake_cell(Lattice& lat)
latvec.e31 = -celldm;
latvec.e32 = -celldm;
latvec.e33 = celldm;
} else if (latName == "hexagonal") // ibrav = 4
{
double celldm1 = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
}
else if (latName == "hexagonal") // ibrav = 4
{
double celldm1 = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2));
double celldm3 = std::sqrt(pow(latvec.e31, 2) + pow(latvec.e32, 2)
+ pow(latvec.e33, 2));
Expand All @@ -69,19 +75,21 @@ void remake_cell(Lattice& lat)
latvec.e31 = 0.0;
latvec.e32 = 0.0;
latvec.e33 = celldm3;
} else if (latName == "trigonal") // ibrav = 5
{
double celldm1 = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
}
else if (latName == "trigonal") // ibrav = 5
{
double celldm1 = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2));
double celldm2 = std::sqrt(pow(latvec.e21, 2) + pow(latvec.e22, 2)
+ pow(latvec.e23, 2));
double celldm12 = (latvec.e11 * latvec.e21 + latvec.e12 * latvec.e22
+ latvec.e13 * latvec.e23);
double cos12 = celldm12 / celldm1 / celldm2;

if (cos12 <= -0.5 || cos12 >= 1.0) {
ModuleBase::WARNING_QUIT("unitcell", "wrong cos12!");
}
if (cos12 <= -0.5 || cos12 >= 1.0)
{
ModuleBase::WARNING_QUIT("unitcell", "wrong cos12!");
}
double t1 = sqrt(1.0 + 2.0 * cos12);
double t2 = sqrt(1.0 - cos12);

Expand All @@ -99,8 +107,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = -e11;
latvec.e32 = e12;
latvec.e33 = e13;
} else if (latName == "st") // ibrav = 6
{
}
else if (latName == "st") // ibrav = 6
{
double celldm1 = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2));
double celldm3 = std::sqrt(pow(latvec.e31, 2) + pow(latvec.e32, 2)
Expand All @@ -114,8 +123,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = 0.0;
latvec.e32 = 0.0;
latvec.e33 = celldm3;
} else if (latName == "bct") // ibrav = 7
{
}
else if (latName == "bct") // ibrav = 7
{
double celldm1 = std::abs(latvec.e11);
double celldm2 = std::abs(latvec.e13);

Expand All @@ -128,8 +138,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = -celldm1;
latvec.e32 = -celldm1;
latvec.e33 = celldm2;
} else if (latName == "so") // ibrav = 8
{
}
else if (latName == "so") // ibrav = 8
{
double celldm1 = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2));
double celldm2 = std::sqrt(pow(latvec.e21, 2) + pow(latvec.e22, 2)
Expand All @@ -146,8 +157,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = 0.0;
latvec.e32 = 0.0;
latvec.e33 = celldm3;
} else if (latName == "baco") // ibrav = 9
{
}
else if (latName == "baco") // ibrav = 9
{
double celldm1 = std::abs(latvec.e11);
double celldm2 = std::abs(latvec.e22);
double celldm3 = std::abs(latvec.e33);
Expand All @@ -161,8 +173,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = 0.0;
latvec.e32 = 0.0;
latvec.e33 = celldm3;
} else if (latName == "fco") // ibrav = 10
{
}
else if (latName == "fco") // ibrav = 10
{
double celldm1 = std::abs(latvec.e11);
double celldm2 = std::abs(latvec.e22);
double celldm3 = std::abs(latvec.e33);
Expand All @@ -176,8 +189,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = 0.0;
latvec.e32 = celldm2;
latvec.e33 = celldm3;
} else if (latName == "bco") // ibrav = 11
{
}
else if (latName == "bco") // ibrav = 11
{
double celldm1 = std::abs(latvec.e11);
double celldm2 = std::abs(latvec.e12);
double celldm3 = std::abs(latvec.e13);
Expand All @@ -191,8 +205,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = -celldm1;
latvec.e32 = -celldm2;
latvec.e33 = celldm3;
} else if (latName == "sm") // ibrav = 12
{
}
else if (latName == "sm") // ibrav = 12
{
double celldm1 = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2));
double celldm2 = std::sqrt(pow(latvec.e21, 2) + pow(latvec.e22, 2)
Expand All @@ -215,16 +230,18 @@ void remake_cell(Lattice& lat)
latvec.e31 = 0.0;
latvec.e32 = 0.0;
latvec.e33 = celldm3;
} else if (latName == "bacm") // ibrav = 13
{
}
else if (latName == "bacm") // ibrav = 13
{
double celldm1 = std::abs(latvec.e11);
double celldm2 = std::sqrt(pow(latvec.e21, 2) + pow(latvec.e22, 2)
+ pow(latvec.e23, 2));
double celldm3 = std::abs(latvec.e13);

double cos12 = latvec.e21 / celldm2;
if (cos12 >= 1.0) {
ModuleBase::WARNING_QUIT("unitcell", "wrong cos12!");
if (cos12 >= 1.0)
{
ModuleBase::WARNING_QUIT("unitcell", "wrong cos12!");
}

double e21 = celldm2 * cos12;
Expand All @@ -239,8 +256,9 @@ void remake_cell(Lattice& lat)
latvec.e31 = celldm1;
latvec.e32 = 0.0;
latvec.e33 = celldm3;
} else if (latName == "triclinic") // ibrav = 14
{
}
else if (latName == "triclinic") // ibrav = 14
{
double celldm1 = std::sqrt(pow(latvec.e11, 2) + pow(latvec.e12, 2)
+ pow(latvec.e13, 2));
double celldm2 = std::sqrt(pow(latvec.e21, 2) + pow(latvec.e22, 2)
Expand All @@ -258,8 +276,9 @@ void remake_cell(Lattice& lat)
double cos23 = celldm23 / celldm2 / celldm3;

double sin12 = std::sqrt(1.0 - cos12 * cos12);
if (cos12 >= 1.0) {
ModuleBase::WARNING_QUIT("unitcell", "wrong cos12!");
if (cos12 >= 1.0)
{
ModuleBase::WARNING_QUIT("unitcell", "wrong cos12!");
}

latvec.e11 = celldm1;
Expand All @@ -278,15 +297,16 @@ void remake_cell(Lattice& lat)
else
{
std::cout << "latname is : " << latName << std::endl;
ModuleBase::WARNING_QUIT("UnitCell::remake_cell",
"latname not supported!");
ModuleBase::WARNING_QUIT("unitcell::remake_cell",
"latname type not supported!");
}
}

// LiuXh add a new function here,
// 20180515
void setup_cell_after_vc(UnitCell& ucell, std::ofstream& log) {
ModuleBase::TITLE("UnitCell", "setup_cell_after_vc");
void setup_cell_after_vc(UnitCell& ucell, std::ofstream& log)
{
ModuleBase::TITLE("unitcell", "setup_cell_after_vc");
assert(ucell.lat0 > 0.0);
ucell.omega = std::abs(ucell.latvec.Det()) *
pow(ucell.lat0, 3);
Expand Down Expand Up @@ -325,9 +345,11 @@ void setup_cell_after_vc(UnitCell& ucell, std::ofstream& log) {
ucell.GGT = ucell.G * ucell.GT;
ucell.invGGT = ucell.GGT.Inverse();

for (int it = 0; it < ucell.ntype; it++) {
Atom* atom = &ucell.atoms[it];
for (int ia = 0; ia < atom->na; ia++) {
for (int it = 0; it < ucell.ntype; it++)
{
Atom* atom = &ucell.atoms[it];
for (int ia = 0; ia < atom->na; ia++)
{
atom->tau[ia] = atom->taud[ia] * ucell.latvec;
}
}
Expand All @@ -354,10 +376,13 @@ void update_pos_tau(const Lattice& lat,
Atom* atoms)
{
int iat = 0;
for (int it = 0; it < ntype; it++) {
Atom* atom = &atoms[it];
for (int ia = 0; ia < atom->na; ia++) {
for (int ik = 0; ik < 3; ++ik) {
for (int it = 0; it < ntype; it++)
{
Atom* atom = &atoms[it];
for (int ia = 0; ia < atom->na; ia++)
{
for (int ik = 0; ik < 3; ++ik)
{
if (atom->mbl[ia][ik])
{
atom->dis[ia][ik] = pos[3 * iat + ik] / lat.lat0 - atom->tau[ia][ik];
Expand Down Expand Up @@ -454,9 +479,11 @@ void periodic_boundary_adjustment(Atom* atoms,
// first adjust direct coordinates,
// then update them into cartesian coordinates,
//----------------------------------------------
for (int it = 0; it < ntype; it++) {
Atom* atom = &atoms[it];
for (int ia = 0; ia < atom->na; ia++) {
for (int it = 0; it < ntype; it++)
{
Atom* atom = &atoms[it];
for (int ia = 0; ia < atom->na; ia++)
{
// mohan update 2011-03-21
for (int ik = 0; ik < 3; ik++)
{
Expand All @@ -476,12 +503,12 @@ void periodic_boundary_adjustment(Atom* atoms,
|| atom->taud[ia].y >= 1.0
|| atom->taud[ia].z >= 1.0)
{
GlobalV::ofs_warning << " it=" << it + 1 << " ia=" << ia + 1 << std::endl;
GlobalV::ofs_warning << "d=" << atom->taud[ia].x << " "
GlobalV::ofs_warning << " atom type=" << it + 1 << " atom index=" << ia + 1 << std::endl;
GlobalV::ofs_warning << " direct coordinate=" << atom->taud[ia].x << " "
<< atom->taud[ia].y << " "
<< atom->taud[ia].z << std::endl;
ModuleBase::WARNING_QUIT("Ions_Move_Basic::move_ions",
"the movement of atom is larger than the length of cell.");
ModuleBase::WARNING_QUIT("unitcell::periodic_boundary_adjustment",
"Movement of atom is larger than the cell length");
}

atom->tau[ia] = atom->taud[ia] * latvec;
Expand Down
22 changes: 12 additions & 10 deletions source/source_io/print_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ void print_wfcfft(const Input_para& inp, ModulePW::PW_Basis_K& pw_wfc, std::ofst

void print_screen(const int& stress_step, const int& force_step, const int& istep)
{
std::cout << " ======================================================================" << std::endl;
GlobalV::ofs_running << " ======================================================================" << std::endl;
std::cout << "\n ================================================================" << std::endl;
GlobalV::ofs_running << " ================================================================" << std::endl;

if(PARAM.inp.calculation=="scf")
{
Expand All @@ -366,20 +366,22 @@ void print_screen(const int& stress_step, const int& force_step, const int& iste
{
if(PARAM.inp.calculation=="relax")
{
std::cout << " STEP OF ION RELAXATION: " << unsigned(istep) << std::endl;
GlobalV::ofs_running << " STEP OF ION RELAXATION : " << unsigned(istep) << std::endl;
std::cout << " RELAX STEP: " << unsigned(istep) << std::endl;
GlobalV::ofs_running << " RELAX STEP: " << unsigned(istep) << std::endl;
}
else if(PARAM.inp.calculation=="cell-relax")
{
std::cout << " RELAX CELL : " << unsigned(stress_step) << std::endl;
std::cout << " RELAX IONS : " << unsigned(force_step) << " (in total: " << unsigned(istep) << ")" << std::endl;
GlobalV::ofs_running << " RELAX CELL : " << unsigned(stress_step) << std::endl;
GlobalV::ofs_running << " RELAX IONS : " << unsigned(force_step) << " (in total: " << unsigned(istep) << ")" << std::endl;
std::cout << " RELAX STEP: " << unsigned(istep);
std::cout << " (CELL_CHANGE# " << unsigned(stress_step);
std::cout << " IONS_CHANGE# " << unsigned(force_step) << ")" << std::endl;
GlobalV::ofs_running << " RELAX STEP: " << unsigned(istep);
GlobalV::ofs_running << " (CELL_CHANGE# " << unsigned(stress_step);
GlobalV::ofs_running << " IONS_CHANGE# " << unsigned(force_step) << ")" << std::endl;
}
}

std::cout << " ======================================================================" << std::endl;
GlobalV::ofs_running << " ======================================================================" << std::endl;
std::cout << " ================================================================" << std::endl;
GlobalV::ofs_running << " ================================================================" << std::endl;
}

} // namespace ModuleIO
Loading
Loading