@@ -136,24 +136,24 @@ std::vector<xc_func_type> XC_Functional_Libxc::init_func(const std::vector<int>
136136 else if ( id == XC_HYB_GGA_XC_PBEH ) // PBE0
137137 {
138138 add_func ( XC_HYB_GGA_XC_PBEH );
139- double parameter_hse[3 ] = { PARAM. inp . exx_hybrid_alpha ,
140- PARAM. inp . exx_hse_omega ,
141- PARAM. inp . exx_hse_omega };
139+ double parameter_hse[3 ] = { GlobalC::exx_info. info_global . hybrid_alpha ,
140+ GlobalC::exx_info. info_global . hse_omega ,
141+ GlobalC::exx_info. info_global . hse_omega };
142142 xc_func_set_ext_params (&funcs.back (), parameter_hse);
143143 }
144144 else if ( id == XC_HYB_GGA_XC_HSE06 ) // HSE06 hybrid functional
145145 {
146146 add_func ( XC_HYB_GGA_XC_HSE06 );
147- double parameter_hse[3 ] = { PARAM. inp . exx_hybrid_alpha ,
148- PARAM. inp . exx_hse_omega ,
149- PARAM. inp . exx_hse_omega };
147+ double parameter_hse[3 ] = { GlobalC::exx_info. info_global . hybrid_alpha ,
148+ GlobalC::exx_info. info_global . hse_omega ,
149+ GlobalC::exx_info. info_global . hse_omega };
150150 xc_func_set_ext_params (&funcs.back (), parameter_hse);
151151 }
152152 // added by jghan, 2024-07-06
153153 else if ( id == XC_GGA_X_ITYH ) // short-range of B88_X
154154 {
155155 add_func ( XC_GGA_X_ITYH );
156- double parameter_omega[1 ] = { PARAM. inp . exx_hse_omega }; // GlobalC::exx_info.info_global.hse_omega
156+ double parameter_omega[1 ] = {GlobalC::exx_info. info_global . hse_omega }; // GlobalC::exx_info.info_global.hse_omega
157157 xc_func_set_ext_params (&funcs.back (), parameter_omega);
158158 }
159159 else if ( id == XC_GGA_C_LYPR ) // short-range of LYP_C
@@ -170,7 +170,7 @@ std::vector<xc_func_type> XC_Functional_Libxc::init_func(const std::vector<int>
170170 // and 0.0% short-range and 100.0% long-range exact exchange,
171171 // using the error function kernel.
172172 add_func ( XC_HYB_GGA_XC_LC_PBEOP );
173- double parameter_lcpbe[3 ] = { PARAM. inp . exx_hse_omega }; // Range separation constant: 0.33
173+ double parameter_lcpbe[3 ] = { GlobalC::exx_info. info_global . hse_omega }; // Range separation constant: 0.33
174174 xc_func_set_ext_params (&funcs.back (), parameter_lcpbe);
175175 }
176176 else if ( id == XC_HYB_GGA_XC_LC_WPBE ) // Long-range corrected PBE (LC-wPBE) by Vydrov and Scuseria
@@ -179,9 +179,9 @@ std::vector<xc_func_type> XC_Functional_Libxc::init_func(const std::vector<int>
179179 // and 0.0% short-range and 100.0% long-range exact exchange,
180180 // using the error function kernel.
181181 add_func ( XC_HYB_GGA_XC_LC_WPBE );
182- double parameter_lcwpbe[3 ] = { PARAM. inp . exx_hybrid_alpha , // Fraction of Hartree-Fock exchange: 1.0
183- PARAM. inp . exx_hybrid_beta , // Fraction of short-range exact exchange: -1.0
184- PARAM. inp . exx_hse_omega }; // Range separation constant: 0.4
182+ double parameter_lcwpbe[3 ] = { GlobalC::exx_info. info_global . hybrid_alpha , // Fraction of Hartree-Fock exchange: 1.0
183+ GlobalC::exx_info. info_global . hybrid_beta , // Fraction of short-range exact exchange: -1.0
184+ GlobalC::exx_info. info_global . hse_omega }; // Range separation constant: 0.4
185185 xc_func_set_ext_params (&funcs.back (), parameter_lcwpbe);
186186 }
187187 else if ( id == XC_HYB_GGA_XC_LRC_WPBE ) // Long-range corrected PBE (LRC-wPBE) by by Rohrdanz, Martins and Herbert
@@ -190,9 +190,9 @@ std::vector<xc_func_type> XC_Functional_Libxc::init_func(const std::vector<int>
190190 // and 0.0% short-range and 100.0% long-range exact exchange,
191191 // using the error function kernel.
192192 add_func ( XC_HYB_GGA_XC_LRC_WPBE );
193- double parameter_lrcwpbe[3 ] = { PARAM. inp . exx_hybrid_alpha , // Fraction of Hartree-Fock exchange: 1.0
194- PARAM. inp . exx_hybrid_beta , // Fraction of short-range exact exchange: -1.0
195- PARAM. inp . exx_hse_omega }; // Range separation constant: 0.3
193+ double parameter_lrcwpbe[3 ] = { GlobalC::exx_info. info_global . hybrid_alpha , // Fraction of Hartree-Fock exchange: 1.0
194+ GlobalC::exx_info. info_global . hybrid_beta , // Fraction of short-range exact exchange: -1.0
195+ GlobalC::exx_info. info_global . hse_omega }; // Range separation constant: 0.3
196196 xc_func_set_ext_params (&funcs.back (), parameter_lrcwpbe);
197197 }
198198 else if ( id == XC_HYB_GGA_XC_LRC_WPBEH ) // Long-range corrected short-range hybrid PBE (LRC-wPBEh) by Rohrdanz, Martins and Herbert
@@ -201,9 +201,9 @@ std::vector<xc_func_type> XC_Functional_Libxc::init_func(const std::vector<int>
201201 // and 20.0% short-range and 100.0% long-range exact exchange,
202202 // using the error function kernel.
203203 add_func ( XC_HYB_GGA_XC_LRC_WPBEH );
204- double parameter_lrcwpbeh[3 ] = { PARAM. inp . exx_hybrid_alpha , // Fraction of Hartree-Fock exchange: 1.0
205- PARAM. inp . exx_hybrid_beta , // Fraction of short-range exact exchange: -0.8
206- PARAM. inp . exx_hse_omega }; // Range separation constant: 0.2
204+ double parameter_lrcwpbeh[3 ] = { GlobalC::exx_info. info_global . hybrid_alpha , // Fraction of Hartree-Fock exchange: 1.0
205+ GlobalC::exx_info. info_global . hybrid_beta , // Fraction of short-range exact exchange: -0.8
206+ GlobalC::exx_info. info_global . hse_omega }; // Range separation constant: 0.2
207207 xc_func_set_ext_params (&funcs.back (), parameter_lrcwpbeh);
208208 }
209209 else if ( id == XC_HYB_GGA_XC_CAM_PBEH ) // CAM hybrid screened exchange PBE version
@@ -212,9 +212,9 @@ std::vector<xc_func_type> XC_Functional_Libxc::init_func(const std::vector<int>
212212 // and 100.0% short-range and 20.0% long-range exact exchange,
213213 // using the error function kernel.
214214 add_func ( XC_HYB_GGA_XC_CAM_PBEH);
215- double parameter_campbeh[3 ] = { PARAM. inp . exx_hybrid_alpha , // Fraction of Hartree-Fock exchange: 0.2
216- PARAM. inp . exx_hybrid_beta , // Fraction of short-range exact exchange: 0.8
217- PARAM. inp . exx_hse_omega }; // Range separation constant: 0.7
215+ double parameter_campbeh[3 ] = { GlobalC::exx_info. info_global . hybrid_alpha , // Fraction of Hartree-Fock exchange: 0.2
216+ GlobalC::exx_info. info_global . hybrid_beta , // Fraction of short-range exact exchange: 0.8
217+ GlobalC::exx_info. info_global . hse_omega }; // Range separation constant: 0.7
218218 xc_func_set_ext_params (&funcs.back (), parameter_campbeh);
219219 }
220220#endif
0 commit comments