@@ -271,7 +271,8 @@ def run_jobs(self):
271271 self .logger .info ("Starting solid reversible scaling run" )
272272 for i in range (self .soljob .calc .n_iterations ):
273273 try :
274- self .soljob .reversible_scaling (iteration = (i + 1 ))
274+ with self .soljob :
275+ self .soljob .reversible_scaling (iteration = (i + 1 ))
275276 except MeltedError :
276277 self .logger .info ("Solid system melted during reversible scaling run" )
277278 return 2
@@ -290,7 +291,8 @@ def run_jobs(self):
290291 self .logger .info ("Starting liquid reversible scaling calculation" )
291292 for i in range (self .lqdjob .calc .n_iterations ):
292293 try :
293- self .lqdjob .reversible_scaling (iteration = (i + 1 ))
294+ with self .lqdjob :
295+ self .lqdjob .reversible_scaling (iteration = (i + 1 ))
294296 except SolidifiedError :
295297 self .logger .info ("Liquid froze during reversible scaling calculation" )
296298 return 3
@@ -527,14 +529,16 @@ def routine_fe(job):
527529 Perform an FE calculation routine
528530 """
529531 ts = time .time ()
530- job .run_averaging ()
532+ with job :
533+ job .run_averaging ()
531534 te = time .time () - ts
532535 job .logger .info ("Averaging routine finished in %f s" % te )
533536
534537 # now run integration loops
535538 for i in range (job .calc .n_iterations ):
536539 ts = time .time ()
537- job .run_integration (iteration = (i + 1 ))
540+ with job :
541+ job .run_integration (iteration = (i + 1 ))
538542 te = time .time () - ts
539543 job .logger .info ("Integration cycle %d finished in %f s" % (i + 1 , te ))
540544
@@ -556,14 +560,16 @@ def routine_ts(job):
556560 # in the single-phase region. Disabled by default (mode='none').
557561 if job .calc .phase_transition_detection .mode != "none" :
558562 ts = time .time ()
559- job .scan_temperature_range ()
563+ with job :
564+ job .scan_temperature_range ()
560565 te = time .time () - ts
561566 job .logger .info ("Pre-flight temperature-range scan finished in %f s" % te )
562567
563568 # now do rev scale steps
564569 for i in range (job .calc .n_iterations ):
565570 ts = time .time ()
566- job .reversible_scaling (iteration = (i + 1 ))
571+ with job :
572+ job .reversible_scaling (iteration = (i + 1 ))
567573 te = time .time () - ts
568574 job .logger .info ("TS integration cycle %d finished in %f s" % (i + 1 , te ))
569575
@@ -581,7 +587,8 @@ def routine_tscale(job):
581587 # now do rev scale steps
582588 for i in range (job .calc .n_iterations ):
583589 ts = time .time ()
584- job .temperature_scaling (iteration = (i + 1 ))
590+ with job :
591+ job .temperature_scaling (iteration = (i + 1 ))
585592 te = time .time () - ts
586593 job .logger .info ("Temperature scaling cycle %d finished in %f s" % (i + 1 , te ))
587594
@@ -599,7 +606,8 @@ def routine_pscale(job):
599606 # now do rev scale steps
600607 for i in range (job .calc .n_iterations ):
601608 ts = time .time ()
602- job .pressure_scaling (iteration = (i + 1 ))
609+ with job :
610+ job .pressure_scaling (iteration = (i + 1 ))
603611 te = time .time () - ts
604612 job .logger .info ("Pressure scaling cycle %d finished in %f s" % (i + 1 , te ))
605613
@@ -613,14 +621,16 @@ def routine_alchemy(job):
613621 Perform an FE calculation routine
614622 """
615623 ts = time .time ()
616- job .run_averaging ()
624+ with job :
625+ job .run_averaging ()
617626 te = time .time () - ts
618627 job .logger .info ("Averaging routine finished in %f s" % te )
619628
620629 # now run integration loops
621630 for i in range (job .calc .n_iterations ):
622631 ts = time .time ()
623- job .run_integration (iteration = (i + 1 ))
632+ with job :
633+ job .run_integration (iteration = (i + 1 ))
624634 te = time .time () - ts
625635 job .logger .info ("Alchemy integration cycle %d finished in %f s" % (i + 1 , te ))
626636
@@ -742,14 +752,16 @@ def routine_composition_scaling(job):
742752
743753 # now start cycle
744754 ts = time .time ()
745- job .run_averaging ()
755+ with job :
756+ job .run_averaging ()
746757 te = time .time () - ts
747758 job .logger .info ("Averaging routine finished in %f s" % te )
748759
749760 # now run integration loops
750761 for i in range (job .calc .n_iterations ):
751762 ts = time .time ()
752- job .run_integration (iteration = (i + 1 ))
763+ with job :
764+ job .run_integration (iteration = (i + 1 ))
753765 te = time .time () - ts
754766 job .logger .info ("Alchemy integration cycle %d finished in %f s" % (i + 1 , te ))
755767
0 commit comments