pyctramer 0.1.102__tar.gz → 0.2.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {pyctramer-0.1.102 → pyctramer-0.2.1}/PKG-INFO +1 -1
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/FGR.py +9 -9
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/MarcusAA.py +2 -2
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/Utilities.py +7 -7
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer.egg-info/PKG-INFO +1 -1
- {pyctramer-0.1.102 → pyctramer-0.2.1}/setup.py +1 -1
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/AnalyzeQC.py +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/ConstructFF.py +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/JobControl.py +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/RunMD.py +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/SpinBoson.py +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/SubmitQC.py +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/__init__.py +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer/pyctramer.py +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer.egg-info/SOURCES.txt +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer.egg-info/dependency_links.txt +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/pyctramer.egg-info/top_level.txt +0 -0
- {pyctramer-0.1.102 → pyctramer-0.2.1}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: pyctramer
|
|
3
|
-
Version: 0.1
|
|
3
|
+
Version: 0.2.1
|
|
4
4
|
Summary: Python package for Charge Transfer Rate from Atomistic Molecular dynamics, Electronic structure, and Rate theory
|
|
5
5
|
Home-page: https://www.github.com/ctramer/PyCTRAMER
|
|
6
6
|
Author: Zengkui Liu, Dominikus Brian, and Xiang Sun
|
|
@@ -42,18 +42,18 @@ def run_step7(i, job_control, dict_of_simulation, job_info):
|
|
|
42
42
|
hw_DA = sbmsym[0,0] - sbmsym[1,1]
|
|
43
43
|
|
|
44
44
|
|
|
45
|
-
print('domega (eV) = ', dw_QM * au2eV )
|
|
46
|
-
print("omega span (eV) = ", dw_QM * au2eV * point2)
|
|
45
|
+
#print('domega (eV) = ', dw_QM * au2eV )
|
|
46
|
+
#print("omega span (eV) = ", dw_QM * au2eV * point2)
|
|
47
47
|
print('-DeltaE = ', hw_DA * au2eV, ' eV\nGamma_DA = ', Gamma_DA*au2eV, ' eV\nEr = ', np.sum(omega**2*req**2)/2.*au2eV, ' eV')
|
|
48
48
|
print("The following 2 rate constants are from direct integral and FFT, respectively. ")
|
|
49
|
-
print('QM ', ApproxRates(Ct_exact,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au, '
|
|
50
|
-
print('W0 ', ApproxRates(Ct_W0,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au, '
|
|
49
|
+
print('QM ', ApproxRates(Ct_exact,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au*1e12, 'Hz' )
|
|
50
|
+
print('W0 ', ApproxRates(Ct_W0,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au*1e12, 'Hz' )
|
|
51
51
|
#print('Marcus-Levitch ', MarcusLevichRate(omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au,'THz')
|
|
52
|
-
print('CAV ', ApproxRates(Ct_CAV,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au, '
|
|
53
|
-
print('CD ', ApproxRates(Ct_CD,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au, '
|
|
54
|
-
print('C0 ', ApproxRates(Ct_C0,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au, '
|
|
55
|
-
print('Marcus-Levitch ', MarcusLevichRate(omega,req,beta,t,hw_DA,Gamma_DA)*ps2au,'
|
|
56
|
-
print('Marcus Theory ', MarcusRate(omega,req,beta,t,hw_DA,Gamma_DA)*ps2au,'
|
|
52
|
+
print('CAV ', ApproxRates(Ct_CAV,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au*1e12, 'Hz' )
|
|
53
|
+
print('CD ', ApproxRates(Ct_CD,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au*1e12, 'Hz' )
|
|
54
|
+
print('C0 ', ApproxRates(Ct_C0,omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*dt_au*1e12, 'Hz' )
|
|
55
|
+
print('Marcus-Levitch ', MarcusLevichRate(omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*1e12,'Hz' )
|
|
56
|
+
print('Marcus Theory ', MarcusRate(omega,req,beta,t,hw_DA,Gamma_DA)*ps2au*1e12,'Hz')
|
|
57
57
|
|
|
58
58
|
|
|
59
59
|
stroutput = ""
|
|
@@ -109,7 +109,7 @@ def run_step5(i, job_control, dict_of_simulation,job_info):
|
|
|
109
109
|
np.savetxt(case_dir+'/H_sys.dat' ,H_sys)
|
|
110
110
|
|
|
111
111
|
# print("Correction ", Correction)
|
|
112
|
-
print(Coupling_list,'Coupling list')
|
|
112
|
+
# print(Coupling_list,'Coupling list')
|
|
113
113
|
|
|
114
114
|
stroutput = "\n" + arrow_str
|
|
115
115
|
stroutput = stroutput + "STEP 5: MarcusAA \n"
|
|
@@ -268,7 +268,7 @@ def returnMarcusRate(traj_dir, MD_traj_state, Coupling_list, correction, state_l
|
|
|
268
268
|
print("sigma_U = ", sigma_U, ' eV')
|
|
269
269
|
# test Ea
|
|
270
270
|
print("Ea = ", 0.5 * U * U / sigma_U / sigma_U * kb * T , (dE+Er)**2/4./Er, ' eV')
|
|
271
|
-
print("Marcus rate = ", rates_list[ind], ' Hz')
|
|
271
|
+
print("Marcus rate = ", rates_list[ind], ' Hz\n')
|
|
272
272
|
#print("DeltaE = ",dE, " eV, Er = ",Er, " eV, diabatic coupling = ", coupling_list[ind], ' eV')
|
|
273
273
|
#print(rates_list[ind], ' Hz is rate of the transition ' + transition_pair[ind])
|
|
274
274
|
return coupling_list, rates_list, transition_pair, Er_list, dE_list
|
|
@@ -239,21 +239,21 @@ def check_job_status(job_control, dict_of_simulation, job_info):
|
|
|
239
239
|
|
|
240
240
|
|
|
241
241
|
if curr_step == 1 and job_control[i]['status'][curr_step] == 'finished':
|
|
242
|
-
print("==> Finished current step # ", curr_step)
|
|
242
|
+
print("==> Finished current step # ", curr_step, '\n')
|
|
243
243
|
print("==> Start current step # ", curr_step+1,": AnalyzeQC")
|
|
244
244
|
job_control = run_step2(i,job_control,dict_of_simulation)
|
|
245
245
|
curr_step = 2
|
|
246
246
|
job_control[i]['status'][curr_step] = 'finished'
|
|
247
247
|
|
|
248
248
|
if curr_step == 2 and job_control[i]['status'][curr_step] == 'finished':
|
|
249
|
-
print("==> Finished current step # ", curr_step)
|
|
249
|
+
print("==> Finished current step # ", curr_step, '\n')
|
|
250
250
|
print("==> Start current step # ", curr_step+1, ": ConstructFF")
|
|
251
251
|
job_control = run_step3(i,job_control,dict_of_simulation, job_info)
|
|
252
252
|
curr_step = 3
|
|
253
253
|
job_control[i]['status'][curr_step] = 'finished'
|
|
254
254
|
|
|
255
255
|
if curr_step == 3 and job_control[i]['status'][curr_step] == 'finished':
|
|
256
|
-
print("==> Finished current step # ", curr_step)
|
|
256
|
+
print("==> Finished current step # ", curr_step, '\n')
|
|
257
257
|
print("==> Start current step # ", curr_step+1, ": RunMD")
|
|
258
258
|
job_control = run_step4(i,job_control,dict_of_simulation)
|
|
259
259
|
curr_step = 4
|
|
@@ -264,7 +264,7 @@ def check_job_status(job_control, dict_of_simulation, job_info):
|
|
|
264
264
|
if check_slurm_status(job_control[i]['MD_jobids']):
|
|
265
265
|
print("job_control[i]['MD_jobids']",job_control[i]['MD_jobids'])
|
|
266
266
|
job_control[i]['status'][curr_step] = 'finished'
|
|
267
|
-
print("==> Finished current step # ", curr_step)
|
|
267
|
+
print("==> Finished current step # ", curr_step, '\n')
|
|
268
268
|
else:
|
|
269
269
|
# print("MD_jobids",job_control[i]['MD_jobids'] )
|
|
270
270
|
pass
|
|
@@ -274,21 +274,21 @@ def check_job_status(job_control, dict_of_simulation, job_info):
|
|
|
274
274
|
job_control = run_step5(i,job_control,dict_of_simulation,job_info)
|
|
275
275
|
curr_step = 5
|
|
276
276
|
job_control[i]['status'][curr_step] = 'finished'
|
|
277
|
-
print("==> Finished current step # ", curr_step)
|
|
277
|
+
print("==> Finished current step # ", curr_step, '\n')
|
|
278
278
|
|
|
279
279
|
if curr_step == 5 and job_control[i]['status'][curr_step] == 'finished':
|
|
280
280
|
print("==> Start current step # ", curr_step+1, ": SpinBoson")
|
|
281
281
|
job_control = run_step6(i,job_control,dict_of_simulation,job_info)
|
|
282
282
|
curr_step = 6
|
|
283
283
|
job_control[i]['status'][curr_step] = 'finished'
|
|
284
|
-
print("==> Finished current step # ", curr_step)
|
|
284
|
+
print("==> Finished current step # ", curr_step, '\n')
|
|
285
285
|
|
|
286
286
|
if curr_step == 6 and job_control[i]['status'][curr_step] == 'finished':
|
|
287
287
|
print("==> Start current step # ", curr_step+1, ": FGR")
|
|
288
288
|
job_control = run_step7(i,job_control,dict_of_simulation,job_info)
|
|
289
289
|
curr_step = 7
|
|
290
290
|
job_control[i]['status'][curr_step] = 'finished'
|
|
291
|
-
print("==> Finished current step # ", curr_step)
|
|
291
|
+
print("==> Finished current step # ", curr_step, '\n')
|
|
292
292
|
job_control[i]['status'][0] = curr_step
|
|
293
293
|
|
|
294
294
|
return job_control
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: pyctramer
|
|
3
|
-
Version: 0.1
|
|
3
|
+
Version: 0.2.1
|
|
4
4
|
Summary: Python package for Charge Transfer Rate from Atomistic Molecular dynamics, Electronic structure, and Rate theory
|
|
5
5
|
Home-page: https://www.github.com/ctramer/PyCTRAMER
|
|
6
6
|
Author: Zengkui Liu, Dominikus Brian, and Xiang Sun
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|