@@ -42,24 +42,22 @@ def energy_elec_nc(mf, mo_coeff=None, h1e=None, vhf=None, **_):
4242
4343
4444def energy_elec_pt2 (mf , params = None , eng_bi = None , ** kwargs ):
45- cc , c_os , c_ss = params if params else mf .cc , mf .c_os , mf .c_ss
46- if not mf .eval_pt2 :
47- return 0 , 0 , 0
45+ c_os , c_ss = params if params else mf .c_os , mf .c_ss
4846 emp2_0 , eng_bi1 , eng_bi2 = eng_bi if eng_bi else mf .energy_elec_mp2 (eval_ss = mf .eval_ss , ** kwargs )
4947 if getattr (mf , 'mp2_backend' , None ) == "dfmp2_native" :
50- return cc * emp2_0 , None , None
48+ return emp2_0 , None , None
5149 if getattr (mf , 'mp2_backend' , None ) == "dfmp2" :
52- return cc * ( c_os * eng_bi1 + c_ss * eng_bi2 ) , eng_bi1 , eng_bi2
50+ return c_os * eng_bi1 + c_ss * eng_bi2 , eng_bi1 , eng_bi2
5351 eng_os = eng_bi1 [αβ ]
5452 eng_ss = 0.5 * (eng_bi1 [αα ] + eng_bi1 [ββ ] - eng_bi2 [αα ] - eng_bi2 [ββ ])
55- eng_pt2 = cc * ( c_os * eng_os + c_ss * eng_ss )
53+ eng_pt2 = c_os * eng_os + c_ss * eng_ss
5654 return eng_pt2 , eng_os , eng_ss
5755
5856
5957def energy_elec (mf , params = None , ** kwargs ):
6058 eng_nc = mf .energy_elec_nc (** kwargs )[0 ]
6159 nocc , nvir = mf .nocc , mf .nvir
62- _ , _ , c_ss = params if params else mf . cc , mf .c_os , mf .c_ss
60+ _ , c_ss = params if params else mf .c_os , mf .c_ss
6361 eval_ss = True if abs (c_ss ) > 1e-7 else False
6462 t_ijab_blk = None
6563 if mf .with_t_ijab :
@@ -337,7 +335,7 @@ def prepare_pt2(self, dump_t_ijab=True, fast_trans=True):
337335 eo , ev = self .eo , self .ev
338336 naux = self .df_ri .get_naoaux ()
339337 so , sv = self .so , self .sv
340- cc , c_os , c_ss = self . cc , self .c_os , self .c_ss
338+ c_os , c_ss = self .c_os , self .c_ss
341339 eval_ss = True if abs (c_ss ) > 1e-7 else False
342340
343341 D_rdm1 = np .zeros ((2 , nmo , nmo ))
@@ -377,12 +375,12 @@ def prepare_pt2(self, dump_t_ijab=True, fast_trans=True):
377375 t_ijab = tensors ["t_ijab" + str (σς )][sI ]
378376 if σς in (αα , ββ ):
379377 # T_ijab = cc * 0.5 * c_ss * (t_ijab - t_ijab.swapaxes(-1, -2))
380- T_ijab = cc * 0.5 * c_ss * hermi_sum_last2dim (t_ijab , hermi = ANTIHERMI , inplace = False )
378+ T_ijab = 0.5 * c_ss * hermi_sum_last2dim (t_ijab , hermi = ANTIHERMI , inplace = False )
381379 D_rdm1 [σ , so [σ ], so [σ ]] -= 2 * einsum ("kiab, kjab -> ij" , T_ijab , t_ijab )
382380 D_rdm1 [σ , sv [σ ], sv [σ ]] += 2 * einsum ("ijac, ijbc -> ab" , T_ijab , t_ijab )
383381 G_ia_ri [σ ][:, sI ] += 4 * einsum ("ijab, Pjb -> Pia" , T_ijab , Y_ia_ri [σ ])
384382 else : # σς == αβ
385- T_ijab = cc * c_os * t_ijab
383+ T_ijab = c_os * t_ijab
386384 # D_rdm1[α, so[α], so[α]] -= einsum("ikab, jkab -> ij", T_ijab, t_ijab)
387385 # D_rdm1[β, so[β], so[β]] -= einsum("kiba, kjba -> ij", T_ijab, t_ijab)
388386 # D_rdm1[α, sv[α], sv[α]] += einsum("ijac, ijbc -> ab", T_ijab, t_ijab)
0 commit comments