pyctramer 0.2.4__tar.gz → 0.2.6__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.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pyctramer
3
- Version: 0.2.4
3
+ Version: 0.2.6
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
@@ -240,14 +240,14 @@ def check_job_status(job_control, dict_of_simulation, job_info):
240
240
 
241
241
  if curr_step == 1 and job_control[i]['status'][curr_step] == 'finished':
242
242
  print("==> Finished current step # ", curr_step, '\n')
243
- print(' ')
244
- print("==> Start current step # ", curr_step+1,": AnalyzeQC")
243
+
244
+ print("\n==> Start current step # ", curr_step+1,": AnalyzeQC")
245
245
  job_control = run_step2(i,job_control,dict_of_simulation)
246
246
  curr_step = 2
247
247
  job_control[i]['status'][curr_step] = 'finished'
248
248
 
249
249
  if curr_step == 2 and job_control[i]['status'][curr_step] == 'finished':
250
- print("==> Finished current step # ", curr_step, '\n')
250
+ print("\n==> Finished current step # ", curr_step, '\n')
251
251
  print(' ')
252
252
  print("==> Start current step # ", curr_step+1, ": ConstructFF")
253
253
  job_control = run_step3(i,job_control,dict_of_simulation, job_info)
@@ -255,7 +255,7 @@ def check_job_status(job_control, dict_of_simulation, job_info):
255
255
  job_control[i]['status'][curr_step] = 'finished'
256
256
 
257
257
  if curr_step == 3 and job_control[i]['status'][curr_step] == 'finished':
258
- print("==> Finished current step # ", curr_step, '\n')
258
+ print("\n==> Finished current step # ", curr_step, '\n')
259
259
  print(' ')
260
260
  print("==> Start current step # ", curr_step+1, ": RunMD")
261
261
  job_control = run_step4(i,job_control,dict_of_simulation)
@@ -267,8 +267,8 @@ def check_job_status(job_control, dict_of_simulation, job_info):
267
267
  if check_slurm_status(job_control[i]['MD_jobids']):
268
268
  print("job_control[i]['MD_jobids']",job_control[i]['MD_jobids'])
269
269
  job_control[i]['status'][curr_step] = 'finished'
270
- print("==> Finished current step # ", curr_step, '\n')
271
- print(' ')
270
+ print("\n==> Finished current step # ", curr_step, '\n')
271
+
272
272
  else:
273
273
  # print("MD_jobids",job_control[i]['MD_jobids'] )
274
274
  pass
@@ -278,24 +278,24 @@ def check_job_status(job_control, dict_of_simulation, job_info):
278
278
  job_control = run_step5(i,job_control,dict_of_simulation,job_info)
279
279
  curr_step = 5
280
280
  job_control[i]['status'][curr_step] = 'finished'
281
- print("==> Finished current step # ", curr_step, '\n')
282
- print(' ', end='\n\n')
281
+ print("\n==> Finished current step # ", curr_step, '\n')
282
+
283
283
 
284
284
  if curr_step == 5 and job_control[i]['status'][curr_step] == 'finished':
285
285
  print("==> Start current step # ", curr_step+1, ": SpinBoson")
286
286
  job_control = run_step6(i,job_control,dict_of_simulation,job_info)
287
287
  curr_step = 6
288
288
  job_control[i]['status'][curr_step] = 'finished'
289
- print("==> Finished current step # ", curr_step, '\n')
290
- print(' ', end='\n\n')
289
+ print("\n==> Finished current step # ", curr_step, '\n')
290
+
291
291
 
292
292
  if curr_step == 6 and job_control[i]['status'][curr_step] == 'finished':
293
293
  print("==> Start current step # ", curr_step+1, ": FGR")
294
294
  job_control = run_step7(i,job_control,dict_of_simulation,job_info)
295
295
  curr_step = 7
296
296
  job_control[i]['status'][curr_step] = 'finished'
297
- print("==> Finished current step # ", curr_step, '\n')
298
- print(' ', end='\n\n')
297
+ print("\n==> Finished current step # ", curr_step, '\n')
298
+
299
299
  job_control[i]['status'][0] = curr_step
300
300
 
301
301
  return job_control
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pyctramer
3
- Version: 0.2.4
3
+ Version: 0.2.6
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
@@ -4,7 +4,7 @@ setuptools.setup(
4
4
 
5
5
  name="pyctramer", # The file name of the package after packaging
6
6
 
7
- version="0.2.4", # version number
7
+ version="0.2.6", # version number
8
8
 
9
9
  author="Zengkui Liu, Dominikus Brian, and Xiang Sun", # author name
10
10
 
File without changes
File without changes
@@ -103,9 +103,9 @@ def submitQC(template_dir,running_dir,QCmethod,basis_set,testing_str,D_range,B_r
103
103
  os.chdir(running_dir)
104
104
 
105
105
  if QCmethod == "BNL":
106
- submitQC_file = shell_copy_template(template_dir,running_dir, filename='submitQC_preset')
107
- else :
108
106
  submitQC_file = shell_copy_template(template_dir,running_dir, filename='submitQC_general')
107
+ else :
108
+ submitQC_file = shell_copy_template(template_dir,running_dir, filename='submitQC_preset')
109
109
 
110
110
  if TD_approx == "TDA":
111
111
  TD_token = "false"
File without changes