Skip to content

Commit d505dcd

Browse files
committed
Try to fix
1 parent 3178849 commit d505dcd

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

Modules/Cluster.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,6 +1570,8 @@ def compute_single_jobarray(jobs_id, calc):
15701570
print ("Expected batch ordinary resubmissions:", num_batch_offset)
15711571
raise ValueError("Error, resubmissions exceeded the maximum number of %d" % self.max_recalc)
15721572
break
1573+
1574+
print("CALCULATION ENDED: all properties: {}".format(ensemble.all_properties))
15731575

15741576

15751577

@@ -1585,10 +1587,11 @@ def compute_ensemble(self, ensemble, ase_calc, get_stress = True, timeout=None):
15851587
"""
15861588

15871589
# Check if the compute_ensemble batch must be done
1588-
if self.job_number != 1:
1589-
self.compute_ensemble_batch(ensemble, ase_calc, get_stress, timeout)
1590-
return
1590+
#if self.job_number != 1:
1591+
self.compute_ensemble_batch(ensemble, ase_calc, get_stress, timeout)
1592+
return
15911593

1594+
"""
15921595
# Track the remaining configurations
15931596
success = [False] * ensemble.N
15941597
@@ -1657,4 +1660,5 @@ def compute_single(num, calc):
16571660
print ("Expected batch ordinary resubmissions:", num_batch_offset)
16581661
raise ValueError("Error, resubmissions exceeded the maximum number of %d" % self.max_recalc)
16591662
break
1663+
"""
16601664

Modules/Ensemble.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,6 +2968,7 @@ def compute_ensemble(self, calculator, compute_stress = True, stress_numerical =
29682968
self.remove_noncomputed()
29692969

29702970
if is_cluster:
2971+
print("BEFORE COMPUTING:", self.all_properties)
29712972
cluster.compute_ensemble(computing_ensemble, calculator, compute_stress)
29722973

29732974
print('ENSEMBLE ALL PROPERTIES:', self.all_properties)

0 commit comments

Comments
 (0)