Extract works fully with physical metric ... still some testing to do.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/Extract/trunk@62 5301f0c2-dbc4-4cee-b2f5-8d7afba4d129

6 files changed, 48 insertions, 23 deletions

diff --git a/src/ADMmass_integrand3D.F b/src/ADMmass_integrand3D.F
index a501ef1..566741a 100644
--- a/src/ADMmass_integrand3D.F
+++ b/src/ADMmass_integrand3D.F
@@ -89,7 +89,7 @@ c                 -------------------------------------
 
                  else 
 
-                    p = 1
+                    p = 1.0d0
 
                     dxx = gxx(i,j,k); dxy = gxy(i,j,k)
                     dxz = gxz(i,j,k); dyy = gyy(i,j,k)
diff --git a/src/D3_to_D2.F b/src/D3_to_D2.F
index 2948517..a7d22b2 100644
--- a/src/D3_to_D2.F
+++ b/src/D3_to_D2.F
@@ -288,7 +288,7 @@ c     ---------------------------------
 
          CALL momentum_integrand3D(origin,Dx,Dy,Dz,x,y,z,
      &        gxx,gxy,gxz,gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,
-     &        Extract_temp3d,Psi,Psi_power)
+     &        Extract_temp3d,Psi,Psi_power,conformal_state)
          CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps")
          call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle,
      $                       npoints, 1, 1,
@@ -301,7 +301,7 @@ c     ---------------------------------
 
          CALL momentum_integrand3D(origin,Dx,Dy,Dz,x,y,z,
      &        gxx,gxy,gxz,gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,
-     &        Extract_temp3d,Psi,Psi_power)
+     &        Extract_temp3d,Psi,Psi_power,conformal_state)
          CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps")
          call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle,
      $                       npoints, 1, 1,
@@ -315,7 +315,7 @@ c     ---------------------------------
 
          CALL momentum_integrand3D(origin,Dx,Dy,Dz,x,y,z,
      &        gxx,gxy,gxz,gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,
-     &        Extract_temp3d,Psi,Psi_power)
+     &        Extract_temp3d,Psi,Psi_power,conformal_state)
          CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps")
          call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle,
      $                       npoints, 1, 1,
@@ -334,7 +334,7 @@ c     -----------------------------
 
          CALL spin_integrand3D(origin,x,y,z,
      &        gxx,gxy,gxz,gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,
-     &        Extract_temp3d,Psi,Psi_power)
+     &        Extract_temp3d,Psi,Psi_power,conformal_state)
          CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps")
          call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle,
      $                       npoints, 1, 1,
@@ -347,7 +347,7 @@ c     -----------------------------
 
          CALL spin_integrand3D(origin,x,y,z,
      &        gxx,gxy,gxz,gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,
-     &        Extract_temp3d,Psi,Psi_power)
+     &        Extract_temp3d,Psi,Psi_power,conformal_state)
          CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps")
          call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle,
      $                       npoints, 1, 1,
@@ -361,7 +361,7 @@ c     -----------------------------
 
          CALL spin_integrand3D(origin,x,y,z,
      &        gxx,gxy,gxz,gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,
-     &        Extract_temp3d,Psi,Psi_power)
+     &        Extract_temp3d,Psi,Psi_power,conformal_state)
          CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps")
          call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle,
      $                       npoints, 1, 1,
diff --git a/src/momentum_integrand3D.F b/src/momentum_integrand3D.F
index 011fa68..cc481f9 100644
--- a/src/momentum_integrand3D.F
+++ b/src/momentum_integrand3D.F
@@ -5,7 +5,7 @@ c     ========================================================================
 
       SUBROUTINE momentum_integrand3D(origin,Dx,Dy,Dz,x,y,z,gxx,gxy,gxz,
      &     gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,
-     &     momentum_int,Psi,Psi_power)
+     &     momentum_int,Psi,Psi_power,conformal_state)
 
 c     ------------------------------------------------------------------------
 c
@@ -18,7 +18,7 @@ c     -----------------------------------------------------------------------
 
 c     Input variables
       INTEGER,INTENT(IN) ::
-     &     Psi_power
+     &     Psi_power,conformal_state
       CCTK_REAL,INTENT(IN) :: 
      &     Dx,Dy,Dz,origin(3)
       CCTK_REAL,DIMENSION(:),INTENT(IN) :: 
@@ -81,11 +81,24 @@ c     Because other codes evolve Psi**4
 
 c                 Abbreviations for metric coefficients
 c                 -------------------------------------
-                  p = psi(i,j,k)**ip
+                  if (conformal_state > 0) then
+  
+                    p = psi(i,j,k)**ip
+
+                    dxx = p*gxx(i,j,k); dxy = p*gxy(i,j,k)
+                    dxz = p*gxz(i,j,k); dyy = p*gyy(i,j,k)
+                    dyz = p*gyz(i,j,k); dzz = p*gzz(i,j,k)
+
+                 else 
+
+                    p = 1.0d0
+
+                    dxx = gxx(i,j,k); dxy = gxy(i,j,k)
+                    dxz = gxz(i,j,k); dyy = gyy(i,j,k)
+                    dyz = gyz(i,j,k); dzz = gzz(i,j,k)
+
+                 end if
 
-                  dxx = p*gxx(i,j,k); dxy = p*gxy(i,j,k)
-                  dxz = p*gxz(i,j,k); dyy = p*gyy(i,j,k)
-                  dyz = p*gyz(i,j,k); dzz = p*gzz(i,j,k)
 
 c                 Determinant of 3-metric
 c                 -----------------------
diff --git a/src/momentum_integrand3D_int.F b/src/momentum_integrand3D_int.F
index e97174f..31a6f50 100644
--- a/src/momentum_integrand3D_int.F
+++ b/src/momentum_integrand3D_int.F
@@ -9,11 +9,11 @@ c     ------------------------------------------------------------------
 
           SUBROUTINE  momentum_integrand3D(origin,Dx,Dy,Dz,x,y,z,gxx,
      &        gxy,gxz,gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,momentum_int,
-     &        Psi,Psi_power)
+     &        Psi,Psi_power,conformal_state)
 
           IMPLICIT NONE
           INTEGER,INTENT(IN) ::
-     &         Psi_power
+     &         Psi_power,conformal_state
           CCTK_REAL,INTENT(IN) :: 
      &        Dx,Dy,Dz,origin(3)
           CCTK_REAL,DIMENSION(:),INTENT(IN) :: 
diff --git a/src/spin_integrand3D.F b/src/spin_integrand3D.F
index cf617d8..7f93a0d 100644
--- a/src/spin_integrand3D.F
+++ b/src/spin_integrand3D.F
@@ -5,7 +5,7 @@ c     ========================================================================
 
       SUBROUTINE spin_integrand3D(origin,x,y,z,gxx,gxy,gxz,
      &     gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,
-     &     spin_int,Psi,Psi_power)
+     &     spin_int,Psi,Psi_power,conformal_state)
 
 c     ------------------------------------------------------------------------
 c
@@ -19,7 +19,7 @@ c     -----------------------------------------------------------------------
 
 c     Input variables
       INTEGER,INTENT(IN) ::
-     &     Psi_power
+     &     Psi_power,conformal_state
       CCTK_REAL,INTENT(IN) :: 
      &     origin(3)
       CCTK_REAL,DIMENSION(:),INTENT(IN) :: 
@@ -81,11 +81,23 @@ c     ------------------------------------------------------------------------
 
 c                 Abbreviations for metric coefficients
 c                 -------------------------------------
-                  p = psi(i,j,k)**ip
+                  if (conformal_state > 0) then
+  
+                    p = psi(i,j,k)**ip
 
-                  dxx = p*gxx(i,j,k); dxy = p*gxy(i,j,k)
-                  dxz = p*gxz(i,j,k); dyy = p*gyy(i,j,k)
-                  dyz = p*gyz(i,j,k); dzz = p*gzz(i,j,k)
+                    dxx = p*gxx(i,j,k); dxy = p*gxy(i,j,k)
+                    dxz = p*gxz(i,j,k); dyy = p*gyy(i,j,k)
+                    dyz = p*gyz(i,j,k); dzz = p*gzz(i,j,k)
+
+                 else
+
+                    p = 1.0d0
+
+                    dxx = gxx(i,j,k); dxy = gxy(i,j,k)
+                    dxz = gxz(i,j,k); dyy = gyy(i,j,k)
+                    dyz = gyz(i,j,k); dzz = gzz(i,j,k)
+
+                 end if
 
 c                 Determinant of 3-metric
 c                 -----------------------
diff --git a/src/spin_integrand3D_int.F b/src/spin_integrand3D_int.F
index 1a31c78..4f9fc5e 100644
--- a/src/spin_integrand3D_int.F
+++ b/src/spin_integrand3D_int.F
@@ -9,11 +9,11 @@ c     ------------------------------------------------------------------
 
           SUBROUTINE  spin_integrand3D(origin,x,y,z,gxx,
      &        gxy,gxz,gyy,gyz,gzz,hxx,hxy,hxz,hyy,hyz,hzz,spin_int,
-     &        Psi,Psi_power)
+     &        Psi,Psi_power,conformal_state)
 
           IMPLICIT NONE
           INTEGER,INTENT(IN) ::
-     &         Psi_power
+     &         Psi_power,conformal_state
           CCTK_REAL,INTENT(IN) :: 
      &        origin(3)
           CCTK_REAL,DIMENSION(:),INTENT(IN) ::