[Commits] [svn:einsteintoolkit] incoming/Outflow/ (Rev. 63)

[roland.haas at physics.gatech.edu]

User: rhaas
Date: 2012/05/03 12:45 PM

Added:
 /Outflow/
  configuration.ccl

Modified:
 /Outflow/
  interface.ccl

Log:
 Outflow: REQUIRE THORN HydroBase instead of inheriting from it
 
 otherwise Cactus pushes HydroBase's variables into out context which causes
 compile time errors

File Changes:

Directory: /Outflow/
====================

File [added]: configuration.ccl
Delta lines: +4 -0
===================================================================
--- Outflow/configuration.ccl	                        (rev 0)
+++ Outflow/configuration.ccl	2012-05-03 17:45:36 UTC (rev 63)
@@ -0,0 +1,4 @@
+# Don't use inherit since we do not want to have HydroBase's variables pushed
+# into our context. On the other hand we always access them via the
+# interpolator so having Cactus warn if the thorn is not active is useful.
+REQUIRES THORNS: HydroBase

File [modified]: interface.ccl
Delta lines: +6 -1
===================================================================
--- Outflow/interface.ccl	2012-04-19 23:52:58 UTC (rev 62)
+++ Outflow/interface.ccl	2012-05-03 17:45:36 UTC (rev 63)
@@ -2,8 +2,13 @@
 # $Header:$
 
 implements: outflow
-inherits: ADMBase HydroBase SphericalSurface StaticConformal 
+inherits: ADMBase SphericalSurface StaticConformal 
 
+CCTK_INT FUNCTION IO_TruncateOutputFiles \
+  (CCTK_POINTER_TO_CONST IN GH)
+
+REQUIRES FUNCTION IO_TruncateOutputFiles
+
 REAL outflow_flux[num_detectors] TYPE=scalar tags='checkpoint="no"' "flux of mass through the detectors"
 
 REAL fluxdens_projected[num_detectors] TYPE=ARRAY DIM=2 SIZE=SphericalSurface::maxntheta,SphericalSurface::maxnphi DISTRIB=CONSTANT tags='checkpoint="no"' "2D (theta,phi) grid arrays for flux density"