[Commits] [svn:einsteintoolkit] ADMConstraints/trunk/ (Rev. 154)

[rhaas at tapir.caltech.edu]

User: rhaas
Date: 2013/01/17 10:59 AM

Modified:
 /trunk/
  interface.ccl
 /trunk/src/
  ADMConstraints.F
 /trunk/test/
  ADMConstraints_Mask.par, ADMConstraints_Physical.par, ADMConstraints_Shift.par, test_ADM.par

Log:
 support "new" interface to TmunuBase
 
 we check at runtime if storage was allocated for Tmunu and use the data stored
 there rather than re-computing it using hte include file.
 
 Note: this requires that we inherit from TmunuBase, hence all runs even vacuum
 runs using ADMConstraints need to activate TmunuBase (but need not allocate
 storage for it).

File Changes:

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

File [modified]: ADMConstraints.F
Delta lines: +20 -7
===================================================================
--- trunk/src/ADMConstraints.F	2012-11-05 14:44:50 UTC (rev 153)
+++ trunk/src/ADMConstraints.F	2013-01-17 16:59:32 UTC (rev 154)
@@ -157,16 +157,29 @@
 
 c                 Initialize stress-energy tensor components.
 
-                  Ttt = 0.0D0
-                  
-                  Ttx = 0.0D0; Tty = 0.0D0; Ttz = 0.0D0
-                  
-                  Txx = 0.0D0; Tyy = 0.0D0; Tzz = 0.0D0
-                  Txy = 0.0D0; Txz = 0.0D0; Tyz = 0.0D0
+                  if (stress_energy_state .ne. 0) then
 
-c                 Include macro for stress energy tensor.
+                     Ttt = eTtt(i,j,k)
 
+                     Ttx = eTtx(i,j,k); Tty = eTty(i,j,k); Ttz = eTtz(i,j,k)
+
+                     Txx = eTxx(i,j,k); Tyy = eTyy(i,j,k); Tzz = eTzz(i,j,k)
+
+
+                  else
+
+                     Ttt = 0.0D0
+
+                     Ttx = 0.0D0; Tty = 0.0D0; Ttz = 0.0D0
+
+                     Txx = 0.0D0; Tyy = 0.0D0; Tzz = 0.0D0
+                     Txy = 0.0D0; Txz = 0.0D0; Tyz = 0.0D0
+
+c                    Include macro for stress energy tensor.
+
 #include "CalcTmunu.inc"
+                  
+                  end if
 
 c                 Calculate the hamiltonian constraint
 c                 ------------------------------------

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

File [modified]: ADMConstraints_Mask.par
Delta lines: +1 -1
===================================================================
--- trunk/test/ADMConstraints_Mask.par	2012-11-05 14:44:50 UTC (rev 153)
+++ trunk/test/ADMConstraints_Mask.par	2013-01-17 16:59:32 UTC (rev 154)
@@ -12,7 +12,7 @@
 # @@*/           
 
 # Required thorns
-ActiveThorns = "ADMCoupling Boundary Time ADMconstraints pugh ADM CoordGauge pughreduce CartGrid3D CoordBase SymBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce"
+ActiveThorns = "ADMCoupling Boundary Time ADMconstraints pugh ADM CoordGauge pughreduce CartGrid3D CoordBase SymBase TmunuBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce"
 
 # GENERAL
 

File [modified]: ADMConstraints_Physical.par
Delta lines: +1 -1
===================================================================
--- trunk/test/ADMConstraints_Physical.par	2012-11-05 14:44:50 UTC (rev 153)
+++ trunk/test/ADMConstraints_Physical.par	2013-01-17 16:59:32 UTC (rev 154)
@@ -12,7 +12,7 @@
 # @@*/           
 
 # Required thorns
-ActiveThorns = "ADMCoupling Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce CartGrid3D CoordBase SymBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce"
+ActiveThorns = "ADMCoupling Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce CartGrid3D CoordBase SymBase TmunuBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce"
 
 # GENERAL
 

File [modified]: ADMConstraints_Shift.par
Delta lines: +1 -1
===================================================================
--- trunk/test/ADMConstraints_Shift.par	2012-11-05 14:44:50 UTC (rev 153)
+++ trunk/test/ADMConstraints_Shift.par	2013-01-17 16:59:32 UTC (rev 154)
@@ -12,7 +12,7 @@
 # @@*/           
 
 # Required thorns
-ActiveThorns = "ADMCoupling Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce CartGrid3D CoordBase SymBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce"
+ActiveThorns = "ADMCoupling Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce CartGrid3D CoordBase SymBase TmunuBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce"
 
 # GENERAL
 

File [modified]: test_ADM.par
Delta lines: +1 -1
===================================================================
--- trunk/test/test_ADM.par	2012-11-05 14:44:50 UTC (rev 153)
+++ trunk/test/test_ADM.par	2013-01-17 16:59:32 UTC (rev 154)
@@ -12,7 +12,7 @@
 # @@*/           
 
 # Required thorns
-ActiveThorns = "ADMCoupling Boundary Time ADMconstraints pugh pughreduce CartGrid3D CoordBase SymBase ADMBase StaticConformal admmacros coordgauge spacemask ADM idanalyticbh ioutil iobasic localreduce"
+ActiveThorns = "ADMCoupling Boundary Time ADMconstraints pugh pughreduce CartGrid3D CoordBase SymBase TmunuBase ADMBase StaticConformal admmacros coordgauge spacemask ADM idanalyticbh ioutil iobasic localreduce"
 
 # GENERAL
 

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

File [modified]: interface.ccl
Delta lines: +1 -1
===================================================================
--- trunk/interface.ccl	2012-11-05 14:44:50 UTC (rev 153)
+++ trunk/interface.ccl	2013-01-17 16:59:32 UTC (rev 154)
@@ -2,7 +2,7 @@
 # $Header$
 
 implements: admconstraints
-inherits: ADMBase, StaticConformal, SpaceMask, grid, ADMMacros
+inherits: ADMBase, StaticConformal, SpaceMask, grid, ADMMacros, TmunuBase
 friend: ADMCoupling
 
 USES INCLUDE: CalcTmunu.inc