Merge branch 'main' of github.com:cmelab/flowerMD into fix-lattice

cmelab · Oct 10, 2023 · 88d4958 · 88d4958
2 parents 113be23 + dbc5b80
commit 88d4958
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/flowermd/utils/actions.py b/flowermd/utils/actions.py
@@ -13,10 +13,16 @@ def act(self, timestep):
             tps = np.round(self.sim.tps, 2)
             current_step = self.sim.timestep - self.starting_step
             eta = np.round((self.n_steps - current_step) / (60 * tps), 1)
-            print(
-                f"Step {current_step} of {self.n_steps}; TPS: {tps}; ETA: "
-                f"{eta} minutes"
-            )
+            if eta <= 60.0:
+                print(
+                    f"Step {current_step} of {self.n_steps}; TPS: {tps}; ETA: "
+                    f"{eta} minutes"
+                )
+            else:
+                print(
+                    f"Step {current_step} of {self.n_steps}; TPS: {tps}; ETA: "
+                    f"{eta // 60} hours, {eta % 60} minutes"
+                )
 
 
 class PullParticles(hoomd.custom.Action):