GRHydro: work around Intel 11 failures when using Fortran pointers

this rewrites the Reconstruction driver routines since Intel 11 miscompiles the
code using Fortran pointers and generates segfault errors at runtime.

Nested subroutines (another solution to make intel 11 work) do not work with
intel 13.



git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@587 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

1 files changed, 129 insertions, 73 deletions

diff --git a/src/GRHydro_ENOReconstruct_drv.F90 b/src/GRHydro_ENOReconstruct_drv.F90
index 582d29a..7ad118d 100644
--- a/src/GRHydro_ENOReconstruct_drv.F90
+++ b/src/GRHydro_ENOReconstruct_drv.F90
@@ -14,15 +14,9 @@
 
 #include "SpaceMask.h"
 
-#define velx(i,j,k) vup(i,j,k,1)
-#define vely(i,j,k) vup(i,j,k,2)
-#define velz(i,j,k) vup(i,j,k,3)
 #define sx(i,j,k) scon(i,j,k,1)
 #define sy(i,j,k) scon(i,j,k,2)
 #define sz(i,j,k) scon(i,j,k,3)
-#define Bvecx(i,j,k) Bprim(i,j,k,1)
-#define Bvecy(i,j,k) Bprim(i,j,k,2)
-#define Bvecz(i,j,k) Bprim(i,j,k,3)
 #define Bconsx(i,j,k) Bcons(i,j,k,1)
 #define Bconsy(i,j,k) Bcons(i,j,k,2)
 #define Bconsz(i,j,k) Bcons(i,j,k,3)
@@ -51,6 +45,9 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
   DECLARE_CCTK_PARAMETERS
   DECLARE_CCTK_FUNCTIONS
 
+  ! save memory when MP is not used
+  CCTK_INT :: GRHydro_UseGeneralCoordinates
+
   integer :: nx, ny, nz, i, j, k, itracer
 
   logical, dimension(:,:,:), allocatable :: trivial_rp
@@ -64,19 +61,6 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
 
   CCTK_INT :: ierr
 
-  ! save memory when MP is not used
-  CCTK_INT :: GRHydro_UseGeneralCoordinates
-  CCTK_REAL, DIMENSION(cctk_ash1,cctk_ash2,cctk_ash3,3) :: vup, Bprim
-  pointer (pvup,vup), (pBprim,Bprim)
-
-  if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then
-    pvup = loc(lvel)
-    pBprim = loc(lBvec)
-  else
-    pvup = loc(vel)
-    pBprim = loc(Bvec)
-  end if
-
   allocate(trivial_rp(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),STAT=ierr)
   if (ierr .ne. 0) then
     call CCTK_WARN(0, "Allocation problems with trivial_rp")
@@ -144,28 +128,52 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
             call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  rho(:,j,k),rhominus(:,j,k),rhoplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
-                 velx(:,j,k),velxminus(:,j,k),velxplus(:,j,k),&
-                 trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
-                 vely(:,j,k),velyminus(:,j,k),velyplus(:,j,k),&
-                 trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
-                 velz(:,j,k),velzminus(:,j,k),velzplus(:,j,k),&
-                 trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+            if (GRHydro_UseGeneralCoordinates(cctkGH).eq.0) then
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                   vel(:,j,k,1),velxminus(:,j,k),velxplus(:,j,k),&
+                   trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                   vel(:,j,k,2),velyminus(:,j,k),velyplus(:,j,k),&
+                   trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                   vel(:,j,k,3),velzminus(:,j,k),velzplus(:,j,k),&
+                   trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+            else
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                   lvel(:,j,k,1),velxminus(:,j,k),velxplus(:,j,k),&
+                   trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                   lvel(:,j,k,2),velyminus(:,j,k),velyplus(:,j,k),&
+                   trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                   lvel(:,j,k,3),velzminus(:,j,k),velzplus(:,j,k),&
+                   trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+            end if
             call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  eps(:,j,k),epsminus(:,j,k),epsplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
             if(evolve_mhd.ne.0) then
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
-                    Bvecx(:,j,k),Bvecxminus(:,j,k),Bvecxplus(:,j,k),&
-                    trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
-                    Bvecy(:,j,k),Bvecyminus(:,j,k),Bvecyplus(:,j,k),&
-                    trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
-                    Bvecz(:,j,k),Bveczminus(:,j,k),Bveczplus(:,j,k),&
-                    trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+               if (GRHydro_UseGeneralCoordinates(cctkGH).eq.0) then
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                      Bvec(:,j,k,1),Bvecxminus(:,j,k),Bvecxplus(:,j,k),&
+                      trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                      Bvec(:,j,k,2),Bvecyminus(:,j,k),Bvecyplus(:,j,k),&
+                      trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                      Bvec(:,j,k,3),Bveczminus(:,j,k),Bveczplus(:,j,k),&
+                      trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+               else
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                      lBvec(:,j,k,1),Bvecxminus(:,j,k),Bvecxplus(:,j,k),&
+                      trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                      lBvec(:,j,k,2),Bvecyminus(:,j,k),Bvecyplus(:,j,k),&
+                      trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+                      lBvec(:,j,k,3),Bveczminus(:,j,k),Bveczplus(:,j,k),&
+                      trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
+               end if
             endif
             if (evolve_entropy .ne. 0) then
                call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
@@ -246,28 +254,52 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
             call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  rho(j,:,k),rhominus(j,:,k),rhoplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
-                 velx(j,:,k),velxminus(j,:,k),velxplus(j,:,k),&
-                 trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
-                 vely(j,:,k),velyminus(j,:,k),velyplus(j,:,k),&
-                 trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
-                 velz(j,:,k),velzminus(j,:,k),velzplus(j,:,k),&
-                 trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+            if (GRHydro_UseGeneralCoordinates(cctkGH).eq.0) then
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                   vel(j,:,k,1),velxminus(j,:,k),velxplus(j,:,k),&
+                   trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                   vel(j,:,k,2),velyminus(j,:,k),velyplus(j,:,k),&
+                   trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                   vel(j,:,k,3),velzminus(j,:,k),velzplus(j,:,k),&
+                   trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+            else
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                   lvel(j,:,k,1),velxminus(j,:,k),velxplus(j,:,k),&
+                   trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                   lvel(j,:,k,2),velyminus(j,:,k),velyplus(j,:,k),&
+                   trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                   lvel(j,:,k,3),velzminus(j,:,k),velzplus(j,:,k),&
+                   trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+            end if
             call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  eps(j,:,k),epsminus(j,:,k),epsplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
             if(evolve_mhd.ne.0) then
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
-                    Bvecx(j,:,k),Bvecxminus(j,:,k),Bvecxplus(j,:,k),&
-                    trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
-                    Bvecy(j,:,k),Bvecyminus(j,:,k),Bvecyplus(j,:,k),&
-                    trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
-                    Bvecz(j,:,k),Bveczminus(j,:,k),Bveczplus(j,:,k),&
-                    trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+               if (GRHydro_UseGeneralCoordinates(cctkGH).eq.0) then
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                      Bvec(j,:,k,1),Bvecxminus(j,:,k),Bvecxplus(j,:,k),&
+                      trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                      Bvec(j,:,k,2),Bvecyminus(j,:,k),Bvecyplus(j,:,k),&
+                      trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                      Bvec(j,:,k,3),Bveczminus(j,:,k),Bveczplus(j,:,k),&
+                      trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+               else
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                      lBvec(j,:,k,1),Bvecxminus(j,:,k),Bvecxplus(j,:,k),&
+                      trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                      lBvec(j,:,k,2),Bvecyminus(j,:,k),Bvecyplus(j,:,k),&
+                      trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+                      lBvec(j,:,k,3),Bveczminus(j,:,k),Bveczplus(j,:,k),&
+                      trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
+               end if
             endif
             if (evolve_entropy .ne. 0) then
                call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
@@ -348,28 +380,52 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
             call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  rho(j,k,:),rhominus(j,k,:),rhoplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
-                 velx(j,k,:),velxminus(j,k,:),velxplus(j,k,:),&
-                 trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
-                 vely(j,k,:),velyminus(j,k,:),velyplus(j,k,:),&
-                 trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
-                 velz(j,k,:),velzminus(j,k,:),velzplus(j,k,:),&
-                 trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+            if (GRHydro_UseGeneralCoordinates(cctkGH).eq.0) then
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                   vel(j,k,:,1),velxminus(j,k,:),velxplus(j,k,:),&
+                   trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                   vel(j,k,:,2),velyminus(j,k,:),velyplus(j,k,:),&
+                   trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                   vel(j,k,:,3),velzminus(j,k,:),velzplus(j,k,:),&
+                   trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+            else
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                   lvel(j,k,:,1),velxminus(j,k,:),velxplus(j,k,:),&
+                   trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                   lvel(j,k,:,2),velyminus(j,k,:),velyplus(j,k,:),&
+                   trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+              call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                   lvel(j,k,:,3),velzminus(j,k,:),velzplus(j,k,:),&
+                   trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+            end if
             call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  eps(j,k,:),epsminus(j,k,:),epsplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
             if(evolve_mhd.ne.0) then
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
-                    Bvecx(j,k,:),Bvecxminus(j,k,:),Bvecxplus(j,k,:),&
-                    trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
-                    Bvecy(j,k,:),Bvecyminus(j,k,:),Bvecyplus(j,k,:),&
-                    trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-               call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
-                    Bvecz(j,k,:),Bveczminus(j,k,:),Bveczplus(j,k,:),&
-                    trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+               if (GRHydro_UseGeneralCoordinates(cctkGH).eq.0) then
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                      Bvec(j,k,:,1),Bvecxminus(j,k,:),Bvecxplus(j,k,:),&
+                      trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                      Bvec(j,k,:,2),Bvecyminus(j,k,:),Bvecyplus(j,k,:),&
+                      trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                      Bvec(j,k,:,3),Bveczminus(j,k,:),Bveczplus(j,k,:),&
+                      trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+               else
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                      lBvec(j,k,:,1),Bvecxminus(j,k,:),Bvecxplus(j,k,:),&
+                      trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                      lBvec(j,k,:,2),Bvecyminus(j,k,:),Bvecyplus(j,k,:),&
+                      trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+                 call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+                      lBvec(j,k,:,3),Bveczminus(j,k,:),Bveczplus(j,k,:),&
+                      trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
+               end if
             endif
             if (evolve_entropy .ne. 0) then
                call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&