[Commits] [svn:einsteintoolkit] www/about/gallery/gw150914/ (Rev. 1536)

[barry.wardell at gmail.com]

User: barry.wardell
Date: 2016/06/05 05:05 PM

Modified:
 /about/gallery/gw150914/
  index.php, stats.m

Log:
 gw150914: Get more stats from the simulation

File Changes:

Directory: /about/gallery/gw150914/
===================================

File [modified]: index.php
Delta lines: +7 -6
===================================================================
--- about/gallery/gw150914/index.php	2016-06-05 22:05:41 UTC (rev 1535)
+++ about/gallery/gw150914/index.php	2016-06-05 22:05:46 UTC (rev 1536)
@@ -2,6 +2,10 @@
 include_once($_SERVER['DOCUMENT_ROOT'].'/global/header.php');?>
 <script type="text/javascript" src="/global/jwplayer/jwplayer.js"></script>
 
+  <?php
+     $sim_stats = json_decode(file_get_contents("stats.json"), true);
+  ?>
+
 <p>As observed by LIGO; the first detection of gravitational waves</p>
 
   <p>This simulation shows how to evolve a binary black hole system for the last 6 orbits through to merger. </p>
@@ -20,16 +24,13 @@
   <h4>Physical properties</h4>
   <table>
    <tr><th>Number of orbits</th><td>6</td></tr>
-   <tr><th>Time to merger</th><td>900 M</td></tr>
-   <tr><th>Mass of final BH</th><td></td></tr>
-   <tr><th>Spin of final BH</th><td></td></tr>
+   <tr><th>Time to merger</th><td><?php echo $sim_stats['MergerTime']?> M</td></tr>
+   <tr><th>Mass of final BH</th><td><?php echo $sim_stats['FinalMass']?> M</td></tr>
+   <tr><th>Spin of final BH (dimensionless)</th><td><?php echo $sim_stats['FinalSpin']?></td></tr>
   </table>
   </div>
   
   <h4>Computational details</h4>
-  <?php
-     $sim_stats = json_decode(file_get_contents("stats.json"), true);
-  ?></p>
   <table>
    <tr><th>Parameter file</th><td><a href="GW150914.rpar">GW150914.rpar</a></td></tr>
    <tr><th>Thornlist</th><td><a href="GW150914.th">GW150914.th</a> (Llama multi-block code added to ET release version)</td></tr>

File [modified]: stats.m
Delta lines: +7 -1
===================================================================
--- about/gallery/gw150914/stats.m	2016-06-05 22:05:41 UTC (rev 1535)
+++ about/gallery/gw150914/stats.m	2016-06-05 22:05:46 UTC (rev 1536)
@@ -16,11 +16,17 @@
 cost = cores walltimeHours;
 processes = cores/8;
 totalMemory = processes*Max[ReadSimulationAverageMemoryUsage[sim]];
+finalMass = Last[ReadBlackHoleMass[sim, 3]];
+finalSpin = Last[ReadBlackHoleSpin[sim, 3][[3]]] / finalMass^2;
+tCAH = MinCoordinate[ReadBlackHoleMass[sim, 3]];
 
 stats =
   {"CostInCoreHours" -> Round[cost],
     "Runtime" -> ToString at NumberForm[walltimeDays,{Infinity,1}],
     "Cores" -> cores,
-    "TotalMemory" -> Round[totalMemory/1024]};
+    "TotalMemory" -> Round[totalMemory/1024],
+    "MergerTime" -> Round[tCAH],
+    "FinalMass" -> ToString at NumberForm[finalMass,{Infinity,2}],
+    "FinalSpin" -> ToString at NumberForm[finalSpin,{Infinity,2}]};
 
 Export["stats.json", stats];