[Commits] [svn:einsteintoolkit] NullConstr/branches/tapir/src/ (Rev. 12)
bela at caltech.edu
bela at caltech.edu
Fri Nov 8 12:56:17 CST 2013
User: szilagyi
Date: 2013/11/08 12:56 PM
Modified:
/branches/tapir/src/
NullConstr_Driver.F90, NullConstr_R00.F90, NullConstr_R01.F90, NullConstr_R0A.F90, NullConstr_Util.F90
Log:
remove unused vars
File Changes:
Directory: /branches/tapir/src/
===============================
File [modified]: NullConstr_Driver.F90
Delta lines: +56 -88
===================================================================
--- branches/tapir/src/NullConstr_Driver.F90 2013-10-28 20:12:37 UTC (rev 11)
+++ branches/tapir/src/NullConstr_Driver.F90 2013-11-08 18:56:17 UTC (rev 12)
@@ -173,53 +173,37 @@
!calculate R00n,R01n,R0An
call NullConstr_R00_calc (Null_R00(:,:,i),nq,np,null_rb(i), &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
- b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
- b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
- j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
- j_22,j_23,j_24,j_33,j_34, &
- jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
- jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
+ w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_22,w_23,w_33, &
+ b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
+ b_22,b_23,b_24,b_33,b_34, &
+ k_00,k_01,k_02,k_03,k_04, &
+ j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
+ j_22,j_23,j_24,j_33,j_34, &
+ jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
+ jb_22,jb_23,jb_24,jb_33,jb_34, &
+ u_00,u_01,u_02,u_03,u_11,u_12,u_13,u_14, &
+ u_22,u_23,u_33,u_34, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12,ub_13,ub_14, &
+ ub_22,ub_23,ub_24,ub_33)
call NullConstr_R0A_calc (Null_R0A(:,:,i),nq,np,null_rb(i), &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
- b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
- b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
- j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
- j_22,j_23,j_24,j_33,j_34, &
- jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
- jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
-
+ w_00,w_01,w_02,w_03,w_12,b_00,b_01,b_02,b_03,b_04, &
+ b_22,b_23,b_24,k_00,k_01,k_02,k_03,k_04, &
+ j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
+ j_22,j_23,j_24,j_33,j_34, &
+ jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
+ jb_22,jb_23,jb_24,jb_33,jb_34, &
+ u_00,u_01,u_02,u_03,u_11,u_12,u_13,u_14,u_22,u_23,u_33, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12,ub_13,ub_14, &
+ ub_22,ub_23,ub_33)
+
call NullConstr_R01_calc (Null_R01(:,:,i),nq,np,null_rb(i), &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
- b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
- b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
- j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
- j_22,j_23,j_24,j_33,j_34, &
- jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
- jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
-! ub_22,ub_23,ub_24,ub_33,ub_34,omm,cctk_time,Ylm_0,1)
+ w_00,w_01,w_11,b_00,b_01,b_02,b_03,b_11,b_12,b_13,b_14, &
+ b_22,b_23,b_33,k_00,k_01,k_02,k_03,k_04, &
+ j_00,j_01,j_02,j_03,j_04,j_12,j_13, &
+ jb_00,jb_01,jb_02,jb_03,jb_04,jb_12,jb_13, &
+ u_00,u_01,u_02,u_03,u_11,u_13, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12)
call NullEvol_remask (i, boundary_maskn, evolution_maskn)
@@ -266,53 +250,37 @@
!calculate R00s,R01s,R0As
call NullConstr_R00_calc (Null_R00_south(:,:,i),nq,np,null_rb(i), &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
- b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
- b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
- j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
- j_22,j_23,j_24,j_33,j_34, &
- jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
- jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
+ w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_22,w_23,w_33, &
+ b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
+ b_22,b_23,b_24,b_33,b_34, &
+ k_00,k_01,k_02,k_03,k_04, &
+ j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
+ j_22,j_23,j_24,j_33,j_34, &
+ jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
+ jb_22,jb_23,jb_24,jb_33,jb_34, &
+ u_00,u_01,u_02,u_03,u_11,u_12,u_13,u_14, &
+ u_22,u_23,u_33,u_34, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12,ub_13,ub_14, &
+ ub_22,ub_23,ub_24,ub_33)
call NullConstr_R0A_calc (Null_R0A_south(:,:,i),nq,np,null_rb(i), &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
- b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
- b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
- j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
- j_22,j_23,j_24,j_33,j_34, &
- jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
- jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
-
+ w_00,w_01,w_02,w_03,w_12,b_00,b_01,b_02,b_03,b_04, &
+ b_22,b_23,b_24,k_00,k_01,k_02,k_03,k_04, &
+ j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
+ j_22,j_23,j_24,j_33,j_34, &
+ jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
+ jb_22,jb_23,jb_24,jb_33,jb_34, &
+ u_00,u_01,u_02,u_03,u_11,u_12,u_13,u_14,u_22,u_23,u_33, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12,ub_13,ub_14, &
+ ub_22,ub_23,ub_33)
+
call NullConstr_R01_calc (Null_R01_south(:,:,i),nq,np,null_rb(i), &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
- b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
- b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
- j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
- j_22,j_23,j_24,j_33,j_34, &
- jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
- jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
-! ub_22,ub_23,ub_24,ub_33,ub_34,omm,cctk_time,Ylm_0,2)
+ w_00,w_01,w_11,b_00,b_01,b_02,b_03,b_11,b_12,b_13,b_14, &
+ b_22,b_23,b_33,k_00,k_01,k_02,k_03,k_04, &
+ j_00,j_01,j_02,j_03,j_04,j_12,j_13, &
+ jb_00,jb_01,jb_02,jb_03,jb_04,jb_12,jb_13, &
+ u_00,u_01,u_02,u_03,u_11,u_13, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12)
call NullEvol_remask (i, boundary_masks, evolution_masks)
File [modified]: NullConstr_R00.F90
Delta lines: +21 -26
===================================================================
--- branches/tapir/src/NullConstr_R00.F90 2013-10-28 20:12:37 UTC (rev 11)
+++ branches/tapir/src/NullConstr_R00.F90 2013-11-08 18:56:17 UTC (rev 12)
@@ -7,47 +7,44 @@
contains
subroutine NullConstr_R00_calc (R00,nq,np,r, &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
+ w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_22,w_23,w_33, &
b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
+ k_00,k_01,k_02,k_03,k_04, &
j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
j_22,j_23,j_24,j_33,j_34, &
jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
+ u_00,u_01,u_02,u_03,u_11,u_12,u_13,u_14, &
+ u_22,u_23,u_33,u_34, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12,ub_13,ub_14, &
+ ub_22,ub_23,ub_24,ub_33)
implicit none
CCTK_INT, intent(in) :: nq,np
CCTK_REAL, intent(in) :: r
CCTK_REAL, dimension(nq,np), intent(out) :: R00
- CCTK_REAL, dimension(nq,np), intent(in) :: w_00,w_01,w_04,w_11,w_14
+ CCTK_REAL, dimension(nq,np), intent(in) :: w_00,w_01,w_04,w_11
CCTK_COMPLEX, dimension(nq,np), intent(in) :: w_02,w_03,w_12,w_13,w_22, &
- w_23,w_24,w_33,w_34
+ w_23,w_33
CCTK_REAL, dimension(nq,np), intent(in) :: b_00,b_01,b_04,b_11,b_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: b_02,b_03,b_12,b_13,b_22, &
b_23,b_24,b_33,b_34
- CCTK_REAL, dimension(nq,np), intent(in) :: k_00,k_01,k_04,k_11,k_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: k_02,k_03,k_12,k_13,k_22, &
- k_23,k_24,k_33,k_34
+ CCTK_REAL, dimension(nq,np), intent(in) :: k_00,k_01,k_04
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: k_02,k_03
CCTK_COMPLEX, dimension(nq,np), intent(in) :: j_00,j_01,j_04,j_11,j_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: j_02,j_03,j_12,j_13,j_22, &
j_23,j_24,j_33,j_34
CCTK_COMPLEX, dimension(nq,np), intent(in) :: jb_00,jb_01,jb_04,jb_11,jb_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: jb_02,jb_03,jb_12,jb_13,jb_22, &
jb_23,jb_24,jb_33,jb_34
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_00,u_01,u_04,u_11,u_14
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_00,u_01,u_11,u_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_02,u_03,u_12,u_13,u_22, &
- u_23,u_24,u_33,u_34
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_00,ub_01,ub_04,ub_11,ub_14
+ u_23,u_33,u_34
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_00,ub_01,ub_11,ub_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_02,ub_03,ub_12,ub_13,ub_22, &
- ub_23,ub_24,ub_33,ub_34
+ ub_23,ub_24,ub_33
CCTK_COMPLEX, dimension(nq,np) :: s2,s4,s5,s6,s7,s8,s9,s10
CCTK_REAL, dimension(nq,np) :: s3,e2bi,e2b
CCTK_REAL :: s1
@@ -459,26 +456,24 @@
write (*,*) 'big: input:', maxval(abs(w_11))
write (*,*) 'input1:', maxval(abs(w_00)),maxval(abs(w_01)),maxval(abs(w_02)),maxval(abs(w_03)),maxval(abs(w_04)),&
- maxval(abs(w_11)),maxval(abs(w_12)),maxval(abs(w_13)),maxval(abs(w_14))
- write (*,*) 'input2:',maxval(abs(w_22)),maxval(abs(w_23)),maxval(abs(w_24)),maxval(abs(w_33)),maxval(abs(w_34))
+ maxval(abs(w_11)),maxval(abs(w_12)),maxval(abs(w_13))
+ write (*,*) 'input2:',maxval(abs(w_22)),maxval(abs(w_23)),maxval(abs(w_33))
write (*,*) 'input3:',maxval(abs(b_00)),maxval(abs(b_01)),maxval(abs(b_02)),maxval(abs(b_03)),maxval(abs(b_04)),&
maxval(abs(b_11)),maxval(abs(b_12)),maxval(abs(b_13)),maxval(abs(b_14))
write (*,*) 'input4:',maxval(abs(b_22)),maxval(abs(b_23)),maxval(abs(b_24)),maxval(abs(b_33)),maxval(abs(b_34))
- write (*,*) 'input5:',maxval(abs(k_00)),maxval(abs(k_01)),maxval(abs(k_02)),maxval(abs(k_03)),maxval(abs(k_04)),&
- maxval(abs(k_11)),maxval(abs(k_12)),maxval(abs(k_13)),maxval(abs(k_14))
- write (*,*) 'input6:',maxval(abs(k_22)),maxval(abs(k_23)),maxval(abs(k_24)),maxval(abs(k_33)),maxval(abs(k_34))
+ write (*,*) 'input5:',maxval(abs(k_00)),maxval(abs(k_01)),maxval(abs(k_02)),maxval(abs(k_03)),maxval(abs(k_04))
write (*,*) 'input7:',maxval(abs(j_00)),maxval(abs(j_01)),maxval(abs(j_02)),maxval(abs(j_03)),maxval(abs(j_04)),&
maxval(abs(j_11)),maxval(abs(j_12)),maxval(abs(j_13)),maxval(abs(j_14))
write (*,*) 'input8:',maxval(abs(j_22)),maxval(abs(j_23)),maxval(abs(j_24)),maxval(abs(j_33)),maxval(abs(j_34))
write (*,*) 'input9:',maxval(abs(jb_00)),maxval(abs(jb_01)),maxval(abs(jb_02)),maxval(abs(jb_03)),maxval(abs(jb_04)),&
maxval(abs(jb_11)),maxval(abs(jb_12)),maxval(abs(jb_13)),maxval(abs(jb_14))
write (*,*) 'input10:',maxval(abs(jb_22)),maxval(abs(jb_23)),maxval(abs(jb_24)),maxval(abs(jb_33)),maxval(abs(jb_34))
- write (*,*) 'input11:',maxval(abs(u_00)),maxval(abs(u_01)),maxval(abs(u_02)),maxval(abs(u_03)),maxval(abs(u_04)),&
+ write (*,*) 'input11:',maxval(abs(u_00)),maxval(abs(u_01)),maxval(abs(u_02)),maxval(abs(u_03)),&
maxval(abs(u_11)),maxval(abs(u_12)),maxval(abs(u_13)),maxval(abs(u_14))
- write (*,*) 'input12:',maxval(abs(u_22)),maxval(abs(u_23)),maxval(abs(u_24)),maxval(abs(u_33)),maxval(abs(u_34))
- write (*,*) 'input13:',maxval(abs(ub_00)),maxval(abs(ub_01)),maxval(abs(ub_02)),maxval(abs(ub_03)),maxval(abs(ub_04)),&
+ write (*,*) 'input12:',maxval(abs(u_22)),maxval(abs(u_23)),maxval(abs(u_33)),maxval(abs(u_34))
+ write (*,*) 'input13:',maxval(abs(ub_00)),maxval(abs(ub_01)),maxval(abs(ub_02)),maxval(abs(ub_03)),&
maxval(abs(ub_11)),maxval(abs(ub_12)),maxval(abs(ub_13)),maxval(abs(ub_14))
- write (*,*) 'input14:',maxval(abs(ub_22)),maxval(abs(ub_23)),maxval(abs(ub_24)),maxval(abs(ub_33)),maxval(abs(ub_34))
+ write (*,*) 'input14:',maxval(abs(ub_22)),maxval(abs(ub_23)),maxval(abs(ub_24)),maxval(abs(ub_33))
stop
end if
#endif
File [modified]: NullConstr_R01.F90
Delta lines: +20 -36
===================================================================
--- branches/tapir/src/NullConstr_R01.F90 2013-10-28 20:12:37 UTC (rev 11)
+++ branches/tapir/src/NullConstr_R01.F90 2013-11-08 18:56:17 UTC (rev 12)
@@ -7,48 +7,32 @@
contains
subroutine NullConstr_R01_calc (R01,nq,np,r, &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
- b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
- b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
- j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
- j_22,j_23,j_24,j_33,j_34, &
- jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
- jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
-! ub_22,ub_23,ub_24,ub_33,ub_34,omm,cctk_time,Ylm_0,patchID)
+ w_00,w_01,w_11,b_00,b_01,b_02,b_03,b_11,b_12,b_13,b_14, &
+ b_22,b_23,b_33,k_00,k_01,k_02,k_03,k_04, &
+ j_00,j_01,j_02,j_03,j_04,j_12,j_13, &
+ jb_00,jb_01,jb_02,jb_03,jb_04,jb_12,jb_13, &
+ u_00,u_01,u_02,u_03,u_11,u_13, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12)
implicit none
CCTK_INT, intent(in) :: nq,np
CCTK_REAL, intent(in) :: r
CCTK_REAL, dimension(nq,np), intent(out) :: R01
- CCTK_REAL, dimension(nq,np), intent(in) :: w_00,w_01,w_04,w_11,w_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: w_02,w_03,w_12,w_13,w_22, &
- w_23,w_24,w_33,w_34
- CCTK_REAL, dimension(nq,np), intent(in) :: b_00,b_01,b_04,b_11,b_14
+ CCTK_REAL, dimension(nq,np), intent(in) :: w_00,w_01,w_11
+ CCTK_REAL, dimension(nq,np), intent(in) :: b_00,b_01,b_11,b_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: b_02,b_03,b_12,b_13,b_22, &
- b_23,b_24,b_33,b_34
- CCTK_REAL, dimension(nq,np), intent(in) :: k_00,k_01,k_04,k_11,k_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: k_02,k_03,k_12,k_13,k_22, &
- k_23,k_24,k_33,k_34
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: j_00,j_01,j_04,j_11,j_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: j_02,j_03,j_12,j_13,j_22, &
- j_23,j_24,j_33,j_34
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: jb_00,jb_01,jb_04,jb_11,jb_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: jb_02,jb_03,jb_12,jb_13,jb_22, &
- jb_23,jb_24,jb_33,jb_34
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_00,u_01,u_04,u_11,u_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_02,u_03,u_12,u_13,u_22, &
- u_23,u_24,u_33,u_34
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_00,ub_01,ub_04,ub_11,ub_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_02,ub_03,ub_12,ub_13,ub_22, &
- ub_23,ub_24,ub_33,ub_34
+ b_23,b_33
+ CCTK_REAL, dimension(nq,np), intent(in) :: k_00,k_01,k_04
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: k_02,k_03
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: j_00,j_01,j_04
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: j_02,j_03,j_12,j_13
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: jb_00,jb_01,jb_04
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: jb_02,jb_03,jb_12,jb_13
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_00,u_01,u_11
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_02,u_03,u_13
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_00,ub_01,ub_11
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_02,ub_03,ub_12
CCTK_COMPLEX, dimension(nq,np) :: s2,s4,s5,s6,s7
CCTK_REAL, dimension(nq,np) :: s3,e2bi,e2b
CCTK_REAL :: s1
@@ -115,7 +99,7 @@
k_00*e2bi+4.0*r*r*r*r*j_01*ub_00*ub_01*k_00*k_00*k_00*e2bi-8.0*j_00*b_01*r*r*r &
*r*ub_00*ub_01*k_00*k_00*k_00*e2bi
s2 = s3*s4
- R01 = s1*s2
+ R01 = real(s1*s2)
!s4=(4*b_23-4*r*u_03-2*r**2*u_13+4*r*w_00+8*r**2*w_01+2*r**3*w_11)/(4*r**2)
!R01=real(s4)
File [modified]: NullConstr_R0A.F90
Delta lines: +16 -23
===================================================================
--- branches/tapir/src/NullConstr_R0A.F90 2013-10-28 20:12:37 UTC (rev 11)
+++ branches/tapir/src/NullConstr_R0A.F90 2013-11-08 18:56:17 UTC (rev 12)
@@ -7,47 +7,40 @@
contains
subroutine NullConstr_R0A_calc (R0A,nq,np,r, &
- w_00,w_01,w_02,w_03,w_04,w_11,w_12,w_13,w_14, &
- w_22,w_23,w_24,w_33,w_34, &
- b_00,b_01,b_02,b_03,b_04,b_11,b_12,b_13,b_14, &
- b_22,b_23,b_24,b_33,b_34, &
- k_00,k_01,k_02,k_03,k_04,k_11,k_12,k_13,k_14, &
- k_22,k_23,k_24,k_33,k_34, &
+ w_00,w_01,w_02,w_03,w_12,b_00,b_01,b_02,b_03,b_04, &
+ b_22,b_23,b_24,k_00,k_01,k_02,k_03,k_04, &
j_00,j_01,j_02,j_03,j_04,j_11,j_12,j_13,j_14, &
j_22,j_23,j_24,j_33,j_34, &
jb_00,jb_01,jb_02,jb_03,jb_04,jb_11,jb_12,jb_13,jb_14, &
jb_22,jb_23,jb_24,jb_33,jb_34, &
- u_00,u_01,u_02,u_03,u_04,u_11,u_12,u_13,u_14, &
- u_22,u_23,u_24,u_33,u_34, &
- ub_00,ub_01,ub_02,ub_03,ub_04,ub_11,ub_12,ub_13,ub_14, &
- ub_22,ub_23,ub_24,ub_33,ub_34)
+ u_00,u_01,u_02,u_03,u_11,u_12,u_13,u_14,u_22,u_23,u_33, &
+ ub_00,ub_01,ub_02,ub_03,ub_11,ub_12,ub_13,ub_14, &
+ ub_22,ub_23,ub_33)
implicit none
CCTK_INT, intent(in) :: nq,np
CCTK_REAL, intent(in) :: r
CCTK_COMPLEX, dimension(nq,np), intent(out) :: R0A
- CCTK_REAL, dimension(nq,np), intent(in) :: w_00,w_01,w_04,w_11,w_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: w_02,w_03,w_12,w_13,w_22, &
- w_23,w_24,w_33,w_34
- CCTK_REAL, dimension(nq,np), intent(in) :: b_00,b_01,b_04,b_11,b_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: b_02,b_03,b_12,b_13,b_22, &
- b_23,b_24,b_33,b_34
- CCTK_REAL, dimension(nq,np), intent(in) :: k_00,k_01,k_04,k_11,k_14
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: k_02,k_03,k_12,k_13,k_22, &
- k_23,k_24,k_33,k_34
+ CCTK_REAL, dimension(nq,np), intent(in) :: w_00,w_01
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: w_02,w_03,w_12
+ CCTK_REAL, dimension(nq,np), intent(in) :: b_00,b_01,b_04
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: b_02,b_03,b_22, &
+ b_23,b_24
+ CCTK_REAL, dimension(nq,np), intent(in) :: k_00,k_01,k_04
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: k_02,k_03
CCTK_COMPLEX, dimension(nq,np), intent(in) :: j_00,j_01,j_04,j_11,j_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: j_02,j_03,j_12,j_13,j_22, &
j_23,j_24,j_33,j_34
CCTK_COMPLEX, dimension(nq,np), intent(in) :: jb_00,jb_01,jb_04,jb_11,jb_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: jb_02,jb_03,jb_12,jb_13,jb_22, &
jb_23,jb_24,jb_33,jb_34
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_00,u_01,u_04,u_11,u_14
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_00,u_01,u_11,u_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: u_02,u_03,u_12,u_13,u_22, &
- u_23,u_24,u_33,u_34
- CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_00,ub_01,ub_04,ub_11,ub_14
+ u_23,u_33
+ CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_00,ub_01,ub_11,ub_14
CCTK_COMPLEX, dimension(nq,np), intent(in) :: ub_02,ub_03,ub_12,ub_13,ub_22, &
- ub_23,ub_24,ub_33,ub_34
+ ub_23,ub_33
CCTK_COMPLEX, dimension(nq,np) :: s2,s4,s5,s6,s7,s8
CCTK_REAL, dimension(nq,np) :: s3,e2bi,e2b
CCTK_REAL :: s1
File [modified]: NullConstr_Util.F90
Delta lines: +0 -1
===================================================================
--- branches/tapir/src/NullConstr_Util.F90 2013-10-28 20:12:37 UTC (rev 11)
+++ branches/tapir/src/NullConstr_Util.F90 2013-11-08 18:56:17 UTC (rev 12)
@@ -14,7 +14,6 @@
CCTK_INT, intent(in) :: null_nx
CCTK_REAL, dimension(null_nx), intent(in) :: xb, xbh
CCTK_REAL, dimension(null_nx), intent(out) :: dr_dx,d2r_dx2,dr_dxh,d2r_dx2h
- CCTK_INT :: i
! For r=rwt*x/(1-x)
More information about the Commits
mailing list