[Commits] [svn:einsteintoolkit] AHFinderDirect/trunk/ (Rev. 1562)

[roland.haas at physics.gatech.edu]

User: rhaas
Date: 2012/01/24 02:24 PM

Modified:
 /trunk/
  interface.ccl, param.ccl
 /trunk/src/driver/
  announce.cc
 /trunk/test/
  misner1.2-025.par

Log:
 support named spherical surfaces

File Changes:

Directory: /trunk/src/driver/
=============================

File [modified]: announce.cc
Delta lines: +3 -1
===================================================================
--- trunk/src/driver/announce.cc	2011-10-25 18:44:52 UTC (rev 1561)
+++ trunk/src/driver/announce.cc	2012-01-24 20:24:54 UTC (rev 1562)
@@ -13,6 +13,7 @@
 #include "cctk.h"
 #include "cctk_Arguments.h"
 #include "cctk_Parameters.h"
+#include "cctk_Functions.h"
 
 #include "config.h"
 #include "stdc.h"
@@ -124,7 +125,8 @@
   {
 
   // Store in spherical surface
-  const int sn = which_surface_to_store_info[hn];
+  const int sn = sf_IdFromName(which_surface_to_store_info[hn], 
+                               which_surface_to_store_info_by_name[hn]);
   if (sn == -1)
     then continue;
 

Directory: /trunk/test/
=======================

File [modified]: misner1.2-025.par
Delta lines: +3 -1
===================================================================
--- trunk/test/misner1.2-025.par	2011-10-25 18:44:52 UTC (rev 1561)
+++ trunk/test/misner1.2-025.par	2012-01-24 20:24:54 UTC (rev 1562)
@@ -84,8 +84,10 @@
 SphericalSurface::nphi        [0] = 32
 SphericalSurface::nghoststheta[0] = 2
 SphericalSurface::nghostsphi  [0] = 2
+SphericalSurface::name        [0] = "CommonHorizon"
 
 # individual AH
+SphericalSurface::name        [1] = "ApparentHorizon"
 SphericalSurface::ntheta      [1] = 22
 SphericalSurface::nphi        [1] = 22
 SphericalSurface::nghoststheta[1] = 2
@@ -115,7 +117,7 @@
 AHFinderDirect::max_N_zones_per_right_angle = 20
 
 # individual AH
-AHFinderDirect::which_surface_to_store_info[1] = 1
+AHFinderDirect::which_surface_to_store_info_by_name[1] = "ApparentHorizon"
 AHFinderDirect::N_zones_per_right_angle[1] = 20
 AHFinderDirect::origin_x[1] = 0.0
 AHFinderDirect::origin_y[1] = 0.0

Directory: /trunk/
==================

File [modified]: interface.ccl
Delta lines: +7 -0
===================================================================
--- trunk/interface.ccl	2011-10-25 18:44:52 UTC (rev 1561)
+++ trunk/interface.ccl	2012-01-24 20:24:54 UTC (rev 1562)
@@ -138,3 +138,10 @@
 USES FUNCTION IO_TruncateOutputFiles
 
 ################################################################################
+
+# translate SphericalSurface name into ID
+CCTK_INT \
+FUNCTION sf_IdFromName (CCTK_INT IN id, CCTK_POINTER_TO_CONST IN name)
+USES FUNCTION sf_IdFromName
+
+################################################################################

File [modified]: param.ccl
Delta lines: +8 -0
===================================================================
--- trunk/param.ccl	2011-10-25 18:44:52 UTC (rev 1561)
+++ trunk/param.ccl	2012-01-24 20:24:54 UTC (rev 1562)
@@ -189,6 +189,14 @@
 0:* :: "store info into the corresponding surface"
 } -1
 
+string which_surface_to_store_info_by_name[101] \
+  "into which surface should we store the info?" \
+  STEERABLE=recover
+{
+""   :: "use which_surface_to_store_info"
+".*" :: "any string"
+} ""
+
 #
 # This parameter controls how verbose this thorn is in printing
 # informational (non-error) messages describing what it's doing.