Skip to content

Commit 0dac83c

Browse files
[pre-commit.ci lite] apply automatic fixes
1 parent d18fc5c commit 0dac83c

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

source/module_esolver/esolver_ks_lcao.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,8 @@ void ESolver_KS_LCAO<TK, TR>::after_scf(const int istep)
13451345
ModuleBase::matrix occ_number_ks(this->pelec->wg);
13461346
for(int ik=0; ik < occ_number_ks.nr; ++ik)
13471347
{
1348-
for(int inb=0; inb < occ_number_ks.nc; ++inb) occ_number_ks(ik, inb) /= this->kv.wk[ik];
1348+
for(int inb=0; inb < occ_number_ks.nc; ++inb) { occ_number_ks(ik, inb) /= this->kv.wk[ik];
1349+
}
13491350
}
13501351
this->update_elec_rdmft(occ_number_ks, *(this->psi));
13511352

source/module_hamilt_general/module_xc/xc_functional.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class XC_Functional
168168
ModulePW::PW_Basis* rhopw,
169169
const UnitCell* ucell,
170170
std::vector<double>& stress_gga,
171-
const bool is_stress = 0);
171+
const bool is_stress = false);
172172
template <typename T, typename Device,
173173
typename Real = typename GetTypeReal<T>::type>
174174
static void grad_wfc(

source/module_rdmft/rdmft_tools.cpp

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ void occNum_Mul_wfcHwfc(const ModuleBase::matrix& occ_number, const ModuleBase::
111111
{
112112
for(int ir=0; ir<occ_number.nr; ++ ir)
113113
{
114-
for(int ic=0; ic<occ_number.nc; ++ic) occNum_wfcHwfc(ir, ic) += occNum_func(occ_number(ir, ic), symbol, XC_func_rdmft, alpha) * wfcHwfc(ir, ic);
114+
for(int ic=0; ic<occ_number.nc; ++ic) { occNum_wfcHwfc(ir, ic) += occNum_func(occ_number(ir, ic), symbol, XC_func_rdmft, alpha) * wfcHwfc(ir, ic);
115+
}
115116
}
116117
}
117118

@@ -129,7 +130,8 @@ void add_occNum(const K_Vectors& kv, const ModuleBase::matrix& occ_number, const
129130
// consider W_k for dE/d_occNum
130131
for(int ik=0; ik<occ_number.nr; ++ik)
131132
{
132-
for(int inb=0; inb<occ_number.nc; ++inb) occNum_wfcHwfc(ik, inb) *= kv.wk[ik];
133+
for(int inb=0; inb<occ_number.nc; ++inb) { occNum_wfcHwfc(ik, inb) *= kv.wk[ik];
134+
}
133135
}
134136
}
135137

@@ -151,7 +153,8 @@ double getEnergy(const ModuleBase::matrix& occNum_wfcHwfc)
151153
double energy = 0.0;
152154
for(int ir=0; ir<occNum_wfcHwfc.nr; ++ ir)
153155
{
154-
for(int ic=0; ic<occNum_wfcHwfc.nc; ++ic) energy += occNum_wfcHwfc(ir, ic);
156+
for(int ic=0; ic<occNum_wfcHwfc.nc; ++ic) { energy += occNum_wfcHwfc(ir, ic);
157+
}
155158
}
156159
return energy;
157160
}
@@ -166,17 +169,18 @@ double occNum_func(double eta, int symbol, const std::string XC_func_rdmft, doub
166169
// else if( XC_func_rdmft == "muller" ) alpha = 0.5;
167170
// else if( XC_func_rdmft == "power" || XC_func_rdmft == "wp22" || XC_func_rdmft == "cwp22" ) ;
168171
// else alpha = 1.0;
169-
if( XC_func_rdmft == "power" || XC_func_rdmft == "wp22" || XC_func_rdmft == "cwp22" ) ;
170-
else if( XC_func_rdmft == "muller" ) alpha = 0.5;
171-
else alpha = 1.0;
172-
173-
if( symbol==0 ) return eta;
174-
else if ( symbol==1 ) return 0.5*eta;
175-
else if ( symbol==2 ) return std::pow(eta, alpha);
176-
else if ( symbol==3 ) return 0.5*std::pow(eta, alpha);
177-
else if ( symbol==4 ) return alpha*std::pow(eta, alpha-1.0);
178-
else if ( symbol==5 ) return 1.0;
179-
else
172+
if( XC_func_rdmft == "power" || XC_func_rdmft == "wp22" || XC_func_rdmft == "cwp22" ) { ;
173+
} else if( XC_func_rdmft == "muller" ) { alpha = 0.5;
174+
} else { alpha = 1.0;
175+
}
176+
177+
if( symbol==0 ) { return eta;
178+
} else if ( symbol==1 ) { return 0.5*eta;
179+
} else if ( symbol==2 ) { return std::pow(eta, alpha);
180+
} else if ( symbol==3 ) { return 0.5*std::pow(eta, alpha);
181+
} else if ( symbol==4 ) { return alpha*std::pow(eta, alpha-1.0);
182+
} else if ( symbol==5 ) { return 1.0;
183+
} else
180184
{
181185
std::cout << "\n!!!!!!\nThere may be some errors when calling wg_fun()\n!!!!!!\n";
182186
return eta ;

0 commit comments

Comments
 (0)