@@ -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 !!!!!!\n There may be some errors when calling wg_fun()\n !!!!!!\n " ;
182186 return eta ;
0 commit comments