Next,

I'd like to try array.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/DistortedBHIVP/trunk@12 971fb155-194f-0410-9daf-e2eca44e59f5

3 files changed, 29 insertions, 23 deletions

diff --git a/interface.ccl b/interface.ccl
index dd29b48..06ae487 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -4,6 +4,29 @@
 implements: distortedbhivp
 inherits: einstein
 
-public:
+private:
+
+real sph_to_car_coord TYPE=GF
+{
+eta,
+abseta,
+sign_eta,
+q,
+phi
+} "coordinate"
+
+real sph_to_car_psi TYPE=GF
+{
+psi3d,
+detapsi3d,
+dqpsi3d,
+dphipsi3d,
+detaetapsi3d,
+detaqpsi3d,
+detaphipsi3d,
+dqqpsi3d,
+dqphipsi3d,
+dphiphipsi3d
+}"psi"
 
 
diff --git a/schedule.ccl b/schedule.ccl
index c679a46..2cb6371 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -2,7 +2,8 @@
 # $Header$
 
 if (CCTK_Equals(initial_data,"distortedbh"))
-{
+{ 
+  STORAGE: sph_to_car_coord, sph_to_car_psi 
   schedule DistortedBHIVP at CCTK_INITIAL
   {
     LANG: Fortran
diff --git a/src/DistortedBHIVP.F b/src/DistortedBHIVP.F
index 1e80ea5..c690437 100644
--- a/src/DistortedBHIVP.F
+++ b/src/DistortedBHIVP.F
@@ -46,14 +46,8 @@ c     Perhaps this and others should go into cctk.h
      $     psisph(:,:,:),psiprim(:,:,:),detapsisph(:,:,:),
      $     dqpsisph(:,:,:),dphipsisph(:,:,:),detaetapsisph(:,:,:),
      $     detaqpsisph(:,:,:),detaphipsisph(:,:,:),dqqpsisph(:,:,:),
-     $     dqphipsisph(:,:,:),dphiphipsisph(:,:,:),
-     $     psi3d(:,:,:),detapsi3d(:,:,:),dqpsi3d(:,:,:),
-     $     dphipsi3d(:,:,:),detaetapsi3d(:,:,:),detaqpsi3d(:,:,:),
-     $     detaphipsi3d(:,:,:),dqqpsi3d(:,:,:),dqphipsi3d(:,:,:),
-     $     dphiphipsi3d(:,:,:)
+     $     dqphipsisph(:,:,:),dphiphipsisph(:,:,:)
       real*8, allocatable :: etagrd(:),qgrd(:),phigrd(:)
-      real*8, allocatable :: eta(:,:,:),abseta(:,:,:),sign_eta(:,:,:),
-     $     q(:,:,:),phi(:,:,:)
       real*8 o1,o2,o3,o4,o5,o6,o7,o8,o9,o10,o11,o12,o13,o14,o15,o16,o17,
      $     o18,o19,o20,o21,o22,o23,o24,o25,o26,o27,o28,o29,o30,o31,o32,
      $     o33,o34,o35,o36,o37,o38,o39,o40,o41,o42,o43,o44,o45,o46,o47,
@@ -104,15 +98,8 @@ c
      $     dqpsisph(ne,nq,np),dphipsisph(ne,nq,np),
      $     detaetapsisph(ne,nq,np),detaqpsisph(ne,nq,np),
      $     detaphipsisph(ne,nq,np),dqqpsisph(ne,nq,np),
-     $     dqphipsisph(ne,nq,np),dphiphipsisph(ne,nq,np),
-     $     psi3d(nx,ny,nz),detapsi3d(nx,ny,nz),dqpsi3d(nx,ny,nz),
-     $     dphipsi3d(nx,ny,nz),detaetapsi3d(nx,ny,nz),
-     $     detaqpsi3d(nx,ny,nz),detaphipsi3d(nx,ny,nz),
-     $     dqqpsi3d(nx,ny,nz),dqphipsi3d(nx,ny,nz),
-     $     dphiphipsi3d(nx,ny,nz))
+     $     dqphipsisph(ne,nq,np),dphiphipsisph(ne,nq,np))
       allocate(etagrd(ne),qgrd(nq),phigrd(np))
-      allocate(eta(nx,ny,nz),abseta(nx,ny,nz),sign_eta(nx,ny,nz),
-     $     q(nx,ny,nz),phi(nx,ny,nz))
 c     
 c     Initialize some array
 c     
@@ -659,13 +646,8 @@ c     Set ADM mass
      $     qf,qfetaeta,qfqq,qfphi,qfphiphi,
      $     psisph,psiprim,detapsisph,dqpsisph,dphipsisph,detaetapsisph,
      $     detaqpsisph,detaphipsisph,dqqpsisph,dqphipsisph,
-     $     dphiphipsisph,
-     $     psi3d,detapsi3d,dqpsi3d,
-     $     dphipsi3d,detaetapsi3d,detaqpsi3d,
-     $     detaphipsi3d,dqqpsi3d,dqphipsi3d,
-     $     dphiphipsi3d)
+     $     dphiphipsisph)
       deallocate(etagrd,qgrd,phigrd)
-      deallocate(eta,abseta,sign_eta,q,phi)
       
       return
       end