From 53da11c874e0711f14fa3f219398e80bb6620268 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 13 Sep 2020 17:19:44 -0700
Subject: [PATCH] Assorted minor aesthetic touchups

---
 examples/ferromagnet.rs | 6 +++---
 src/driver.rs           | 4 +++-
 src/meas.rs             | 2 +-
 src/render.rs           | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/examples/ferromagnet.rs b/examples/ferromagnet.rs
index 05b2d95..509cf61 100644
--- a/examples/ferromagnet.rs
+++ b/examples/ferromagnet.rs
@@ -5,11 +5,11 @@ fn main() {
     let width = 500;
     let height = 500;
     let feat_size = 1e-5; // feature size
-    let peak_current = 2.5e5;
+    let peak_current = 2.5e10;
     let conductivity = 1.0e6;
     let mut driver = Driver::new(width, height, feat_size);
-    //driver.set_steps_per_frame(8);
-    driver.set_steps_per_frame(40);
+    driver.set_steps_per_frame(8);
+    //driver.set_steps_per_frame(40);
     driver.add_y4m_renderer("ferromagnet.y4m");
     // driver.add_term_renderer();
     driver.add_measurement(meas::Current(225, 250));
diff --git a/src/driver.rs b/src/driver.rs
index 9be5091..cd14d7b 100644
--- a/src/driver.rs
+++ b/src/driver.rs
@@ -75,7 +75,9 @@ impl Driver {
         }
         self.state.step();
         self.time_spent_stepping += start_time.elapsed().unwrap();
-        info!("fps: {}", (self.state.step_no() as f64) / self.time_spent_stepping.as_secs_f64());
+        if self.state.step_no() % (10*self.steps_per_frame) == 0 {
+            info!("fps: {:6.2}", (self.state.step_no() as f64) / self.time_spent_stepping.as_secs_f64());
+        }
     }
 }
 
diff --git a/src/meas.rs b/src/meas.rs
index 7259e10..8ce6154 100644
--- a/src/meas.rs
+++ b/src/meas.rs
@@ -62,7 +62,7 @@ impl AbstractMeasurement for Energy {
         let e = state.map_sum(|cell| {
             0.5 * cell.hz() * cell.bz() * dV
         });
-        format!("U = {:.2e}", e)
+        format!("U: {:.2e}", e)
     }
 }
 
diff --git a/src/render.rs b/src/render.rs
index 0e1a425..a609b70 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -222,7 +222,7 @@ impl Renderer for ColorTermRenderer {
             })
             .collect();
 
-        println!("{}time: {:.3e} (fr {})", buf, state.time(), state.step_no());
+        println!("{}", buf);
     }
 }