Skip to content

Commit 90fadcd

Browse files
committed
optimize LR log
1 parent 33f5bad commit 90fadcd

File tree

2 files changed

+12
-26
lines changed

2 files changed

+12
-26
lines changed

source/module_base/global_file.cpp

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -153,28 +153,18 @@ void ModuleBase::Global_File::make_dir_out(
153153
#endif
154154
}
155155

156-
std::stringstream ss,ss1;
157-
158-
// mohan add 2010-09-12
159-
if(out_alllog)
160-
{
161-
ss << "running_" << calculation << "_" << rank + 1;
162-
open_log(GlobalV::ofs_running, ss.str(), calculation, restart);
163-
#if defined(__CUDA) || defined(__ROCM)
164-
open_log(GlobalV::ofs_device, "device" + std::to_string(rank), calculation, restart);
165-
#endif
166-
}
167-
else
168-
{
169-
if(rank==0)
170-
{
171-
ss << "running_" << calculation;
172-
open_log(GlobalV::ofs_running, ss.str(), calculation, restart);
173-
#if defined(__CUDA) || defined(__ROCM)
174-
open_log(GlobalV::ofs_device, "device", calculation, restart);
175-
#endif
176-
}
177-
}
156+
auto open_running_log = [&](const std::string& keyword)
157+
{
158+
std::stringstream ss;
159+
ss << "running_" << keyword;
160+
if (out_alllog) ss << "_" << rank + 1;
161+
open_log(GlobalV::ofs_running, ss.str(), keyword, restart);
162+
#if defined(__CUDA) || defined(__ROCM)
163+
open_log(GlobalV::ofs_device, "device" + std::to_string(rank), calculation, restart);
164+
#endif
165+
};
166+
// if linear response solver only, open running_lr.log. else, open running_calculation.log
167+
if (out_alllog || rank == 0) { open_running_log(PARAM.inp.esolver_type == "lr" ? "lr" : calculation); }
178168

179169
if(rank==0)
180170
{

source/module_lr/esolver_lrtd_lcao.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ void LR::ESolver_LR<double>::move_exx_lri(std::shared_ptr<Exx_LRI<std::complex<d
4646
template<>void LR::ESolver_LR<double>::set_gint() { this->gint_ = &this->gint_g_;this->gint_g_.gridt = &this->gt_; }
4747
template<>void LR::ESolver_LR<std::complex<double>>::set_gint() { this->gint_ = &this->gint_k_; this->gint_k_.gridt = &this->gt_; }
4848

49-
inline double getreal(std::complex<double> x) { return x.real(); }
50-
inline double getreal(double x) { return x; }
51-
5249
inline void redirect_log(const bool& out_alllog)
5350
{
5451
GlobalV::ofs_running.close();
@@ -259,7 +256,6 @@ LR::ESolver_LR<T, TR>::ESolver_LR(const Input_para& inp, UnitCell& ucell) : inpu
259256
, exx_info(GlobalC::exx_info)
260257
#endif
261258
{
262-
redirect_log(inp.out_alllog);
263259
ModuleBase::TITLE("ESolver_LR", "ESolver_LR(from scratch)");
264260
// xc kernel
265261
this->xc_kernel = inp.xc_kernel;

0 commit comments

Comments
 (0)