Commits November 2013

commits@lists.einsteintoolkit.org

10 participants
131 discussions

[svn:einsteintoolkit] NullConstr/branches/tapir/src/ (Rev. 12)
by bela＠caltech.edu 08 Nov '13

08 Nov '13

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)

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/src/ (Rev. 21)
by bela＠caltech.edu 07 Nov '13

07 Nov '13

User: szilagyi Date: 2013/11/07 03:56 PM Modified: /branches/tapir/src/ NullSHRE_modRadius.F90 Log: work on debugging code File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullSHRE_modRadius.F90 Delta lines: +26 -1 =================================================================== --- branches/tapir/src/NullSHRE_modRadius.F90 2013-11-07 17:52:13 UTC (rev 20) +++ branches/tapir/src/NullSHRE_modRadius.F90 2013-11-07 21:56:12 UTC (rev 21) @@ -25,10 +25,35 @@ end do end do - r0%d = cr * sqrt(sqrt(detg%d*temp%d)) + r0%d = cr * (detg%d*temp%d)**0.25d0 end subroutine wt_r_long + ! This is debugging code. given the metric and derivatives, + ! will compute drBondi/d(cartesian R) + subroutine wt_dr(g3, detg3, g3inv, dg3_dR, j0inv, r0, dr_dR) + use NullSHRE_modGFdef + implicit none + + type (gf2d), dimension (3,3),intent (in) :: g3, g3inv ! g_ij, g^ij + type (gf2d), intent (in) :: detg3 ! det(g_ij) + type (gf2d), dimension (3,3),intent (in) :: dg3_dR ! g_ij{,r}(cart) + ! x,y,z derivatives of (r, q, p) coordinates : + type (gf2d), dimension (3,3),intent (in) :: j0inv + type (gf2d), intent (in) :: r0 + type (gf2d), intent (inout) :: dr_dR + + + ! radial deriv of j0inv: + ! dj0inv(a,:)/dr = 0 for a=1 + ! dj0inv(a,:)/dr = -j0inv(a,:)/cr for a=2,3 + + ! rB = R ( detg g^rr)^(1/4) + + + + end subroutine wt_dr + subroutine wt_r(nn1, nn2, pp, eta0, r0) ! the bondi radius eq. (53) use NullSHRE_modGFdef

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1049)
by knarf＠cct.lsu.edu 07 Nov '13

07 Nov '13

User: knarf Date: 2013/11/07 01:20 PM Modified: /release-info/ spine-gcc4.7__1_16.log, spine-gcc4.7__2_8.log, spine-intel13.163__1_16.log, spine-intel13.163__2_8.log Log: spine results File Changes: Directory: /release-info/ ========================= File [modified]: spine-gcc4.7__1_16.log Delta lines: <Unavailable> File [modified]: spine-gcc4.7__2_8.log Delta lines: <Unavailable> File [modified]: spine-intel13.163__1_16.log Delta lines: <Unavailable> File [modified]: spine-intel13.163__2_8.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/ (Rev. 20)
by bela＠caltech.edu 07 Nov '13

07 Nov '13

User: szilagyi Date: 2013/11/07 11:52 AM Modified: /branches/tapir/ interface.ccl, schedule.ccl /branches/tapir/src/ NullSHRE_ExtractWT.F90, NullSHRE_InitialWT.F90, NullSHRE_Pointing.F90, NullSHRE_modInverse.F90, NullSHRE_modNullDir.F90, NullSHRE_modRadius.F90, NullSHRE_modVars.F90 /branches/tapir/src/include/ NullSHRE_PointingNull.h Log: work on an alterantive way of computing the bondi r File Changes: Directory: /branches/tapir/src/include/ ======================================= File [modified]: NullSHRE_PointingNull.h Delta lines: +5 -2 =================================================================== --- branches/tapir/src/include/NullSHRE_PointingNull.h 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/src/include/NullSHRE_PointingNull.h 2013-11-07 17:52:13 UTC (rev 20) @@ -77,9 +77,12 @@ call my_nullify2(1,4,1,4, g1_n) call my_nullify2(1,4,1,4, g1_s) - call my_nullify2(1,4,1,4, gup_n) - call my_nullify2(1,4,1,4, gup_s) + call my_nullify2(1,3,1,3, g3up_n) + call my_nullify2(1,3,1,3, g3up_s) + call my_nullify2(1,4,1,4, g4up_n) + call my_nullify2(1,4,1,4, g4up_s) + call my_nullify2(1,4,1,4, j0_n) call my_nullify2(1,4,1,4, j0_s) Directory: /branches/tapir/src/ =============================== File [modified]: NullSHRE_ExtractWT.F90 Delta lines: +10 -10 =================================================================== --- branches/tapir/src/NullSHRE_ExtractWT.F90 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/src/NullSHRE_ExtractWT.F90 2013-11-07 17:52:13 UTC (rev 20) @@ -68,8 +68,8 @@ !--------------------------------------------------------------------------- ! upstairs 3-metric !--------------------------------------------------------------------------- - call wt_gup3 (g_n, detg_n, gup_n) - call wt_gup3 (g_s, detg_s, gup_s) + call wt_gup3 (g_n(1:3,1:3), detg_n, g3up_n) + call wt_gup3 (g_s(1:3,1:3), detg_s, g3up_s) !--------------------------------------------------------------------------- ! normals, null direction, geodesic expansion @@ -78,8 +78,8 @@ call wt_na (alpha_n, beta_n, na_n) call wt_na (alpha_s, beta_s, na_s) - call wt_sa (gup_n, sigma_n, sigma2_n, sa_n) - call wt_sa (gup_s, sigma_s, sigma2_s, sa_s) + call wt_sa (g3up_n, sigma_n, sigma2_n, sa_n) + call wt_sa (g3up_s, sigma_s, sigma2_s, sa_s) elld_min = elld_min_coef * cctk_delta_time**elld_min_pow @@ -102,11 +102,11 @@ call wt_dna (alpha_n, beta_n, dalpha_n, dbeta_n, dna_n) call wt_dna (alpha_s, beta_s, dalpha_s, dbeta_s, dna_s) - call wt_dsa (sigma2_n, dsigma_n, sa_n, gup_n, dg_n, dsa_n) - call wt_dsa (sigma2_s, dsigma_s, sa_s, gup_s, dg_s, dsa_s) + call wt_dsa (sigma2_n, dsigma_n, sa_n, g3up_n, dg_n, dsa_n) + call wt_dsa (sigma2_s, dsigma_s, sa_s, g3up_s, dg_s, dsa_s) - call wt_gup4 (alpha_n, na_n, gup_n) - call wt_gup4 (alpha_s, na_s, gup_s) + call wt_gup4 (alpha_n, na_n, g3up_n, g4up_n) + call wt_gup4 (alpha_s, na_s, g3up_s, g4up_s) !------------------------------------------------------------------------- ! derivatives with respect to the affine parameter lambda @@ -115,9 +115,9 @@ call wt_g1 (dg_n, ell_n, j0inv_n, g1_n) call wt_g1 (dg_s, ell_s, j0inv_s, g1_s) - call wt_j1 (g_n, gup_n, dg_n, dalpha_n, beta_n, dbeta_n, na_n,& + call wt_j1 (g_n, g4up_n, dg_n, dalpha_n, beta_n, dbeta_n, na_n,& sa_n, ell_n, dsa_n, dna_n, j0inv_n, elld_n, delld_n, j1_n) - call wt_j1 (g_s, gup_s, dg_s, dalpha_s, beta_s, dbeta_s, na_s,& + call wt_j1 (g_s, g4up_s, dg_s, dalpha_s, beta_s, dbeta_s, na_s,& sa_s, ell_s, dsa_s, dna_s, j0inv_s, elld_s, delld_s, j1_s) !--------------------------------------------------------------------------- File [modified]: NullSHRE_InitialWT.F90 Delta lines: +10 -10 =================================================================== --- branches/tapir/src/NullSHRE_InitialWT.F90 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/src/NullSHRE_InitialWT.F90 2013-11-07 17:52:13 UTC (rev 20) @@ -68,8 +68,8 @@ !--------------------------------------------------------------------------- ! upstairs 3-metric !--------------------------------------------------------------------------- - call wt_gup3 (g_n, detg_n, gup_n) - call wt_gup3 (g_s, detg_s, gup_s) + call wt_gup3 (g_n(1:3,1:3), detg_n, g3up_n) + call wt_gup3 (g_s(1:3,1:3), detg_s, g3up_s) !--------------------------------------------------------------------------- ! normals, null direction, geodesic expansion @@ -78,8 +78,8 @@ call wt_na (alpha_n, beta_n, na_n) call wt_na (alpha_s, beta_s, na_s) - call wt_sa (gup_n, sigma_n, sigma2_n, sa_n) - call wt_sa (gup_s, sigma_s, sigma2_s, sa_s) + call wt_sa (g3up_n, sigma_n, sigma2_n, sa_n) + call wt_sa (g3up_s, sigma_s, sigma2_s, sa_s) elld_min = elld_min_coef * cctk_delta_time**elld_min_pow @@ -102,11 +102,11 @@ call wt_dna (alpha_n, beta_n, dalpha_n, dbeta_n, dna_n) call wt_dna (alpha_s, beta_s, dalpha_s, dbeta_s, dna_s) - call wt_dsa (sigma2_n, dsigma_n, sa_n, gup_n, dg_n, dsa_n) - call wt_dsa (sigma2_s, dsigma_s, sa_s, gup_s, dg_s, dsa_s) + call wt_dsa (sigma2_n, dsigma_n, sa_n, g3up_n, dg_n, dsa_n) + call wt_dsa (sigma2_s, dsigma_s, sa_s, g3up_s, dg_s, dsa_s) - call wt_gup4 (alpha_n, na_n, gup_n) - call wt_gup4 (alpha_s, na_s, gup_s) + call wt_gup4 (alpha_n, na_n, g3up_n, g4up_n) + call wt_gup4 (alpha_s, na_s, g3up_s, g4up_s) !------------------------------------------------------------------------- ! derivatives with respect to the affine parameter lambda @@ -115,9 +115,9 @@ call wt_g1 (dg_n, ell_n, j0inv_n, g1_n) call wt_g1 (dg_s, ell_s, j0inv_s, g1_s) - call wt_j1 (g_n, gup_n, dg_n, dalpha_n, beta_n, dbeta_n, na_n,& + call wt_j1 (g_n, g4up_n, dg_n, dalpha_n, beta_n, dbeta_n, na_n,& sa_n, ell_n, dsa_n, dna_n, j0inv_n, elld_n, delld_n, j1_n) - call wt_j1 (g_s, gup_s, dg_s, dalpha_s, beta_s, dbeta_s, na_s,& + call wt_j1 (g_s, g4up_s, dg_s, dalpha_s, beta_s, dbeta_s, na_s,& sa_s, ell_s, dsa_s, dna_s, j0inv_s, elld_s, delld_s, j1_s) !--------------------------------------------------------------------------- File [modified]: NullSHRE_Pointing.F90 Delta lines: +3 -2 =================================================================== --- branches/tapir/src/NullSHRE_Pointing.F90 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/src/NullSHRE_Pointing.F90 2013-11-07 17:52:13 UTC (rev 20) @@ -18,7 +18,7 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - CCTK_INT :: i, j +! CCTK_INT :: i, j logical, save :: first_call = .true. if (first_call) call nullify_all @@ -81,7 +81,8 @@ call point_v2(null_lsh, 12, 1, 3, 2, 3, dsigma_n, dsigma_s, WT_dsigma_vect) - call point_v2sym(null_lsh, 20, 1, 4, gup_n, gup_s, WT_gup_vect) + call point_v2sym(null_lsh, 12, 1, 3, g3up_n, g3up_s, WT_g3up_vect) + call point_v2sym(null_lsh, 20, 1, 4, g4up_n, g4up_s, WT_g4up_vect) call point_v2sym(null_lsh, 20, 1, 4, g1_n, g1_s, WT_g1_vect) call point_v2(null_lsh, 24, 1, 4, 2, 4, dsa_n, dsa_s, WT_DSnorm_vect) File [modified]: NullSHRE_modInverse.F90 Delta lines: +20 -19 =================================================================== --- branches/tapir/src/NullSHRE_modInverse.F90 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/src/NullSHRE_modInverse.F90 2013-11-07 17:52:13 UTC (rev 20) @@ -5,51 +5,52 @@ contains - subroutine wt_gup3(g, detg, gup) + subroutine wt_gup3(g3, detg, g3up) use NullSHRE_modGFdef implicit none - type (gf2d), dimension (4,4), intent (in) :: g + type (gf2d), dimension (3,3), intent (in) :: g3 type (gf2d), intent (inout) :: detg - type (gf2d), dimension (4,4), intent (inout) :: gup + type (gf2d), dimension (3,3), intent (inout) :: g3up - detg%d = g(1,1)%d * g(2,2)%d * g(3,3)%d & - - g(1,1)%d * g(2,3)%d * g(2,3)%d & - - g(1,2)%d * g(1,2)%d * g(3,3)%d & - + g(1,2)%d * g(1,3)%d * g(2,3)%d & - + g(1,3)%d * g(1,2)%d * g(2,3)%d & - - g(1,3)%d * g(1,3)%d * g(2,2)%d + detg%d = g3(1,1)%d * g3(2,2)%d * g3(3,3)%d & + - g3(1,1)%d * g3(2,3)%d * g3(2,3)%d & + - g3(1,2)%d * g3(1,2)%d * g3(3,3)%d & + + g3(1,2)%d * g3(1,3)%d * g3(2,3)%d & + + g3(1,3)%d * g3(1,2)%d * g3(2,3)%d & + - g3(1,3)%d * g3(1,3)%d * g3(2,2)%d - gup(1,1)%d = ( g(2,2)%d * g(3,3)%d - g(2,3)%d * g(2,3)%d ) / detg%d - gup(1,2)%d = (- g(1,2)%d * g(3,3)%d + g(1,3)%d * g(2,3)%d ) / detg%d - gup(1,3)%d = ( g(1,2)%d * g(2,3)%d - g(1,3)%d * g(2,2)%d ) / detg%d - gup(2,2)%d = ( g(1,1)%d * g(3,3)%d - g(1,3)%d * g(1,3)%d ) / detg%d - gup(2,3)%d = (- g(1,1)%d * g(2,3)%d + g(1,3)%d * g(1,2)%d ) / detg%d - gup(3,3)%d = ( g(1,1)%d * g(2,2)%d - g(1,2)%d * g(1,2)%d ) / detg%d + g3up(1,1)%d = ( g3(2,2)%d * g3(3,3)%d - g3(2,3)%d * g3(2,3)%d ) / detg%d + g3up(1,2)%d = (- g3(1,2)%d * g3(3,3)%d + g3(1,3)%d * g3(2,3)%d ) / detg%d + g3up(1,3)%d = ( g3(1,2)%d * g3(2,3)%d - g3(1,3)%d * g3(2,2)%d ) / detg%d + g3up(2,2)%d = ( g3(1,1)%d * g3(3,3)%d - g3(1,3)%d * g3(1,3)%d ) / detg%d + g3up(2,3)%d = (- g3(1,1)%d * g3(2,3)%d + g3(1,3)%d * g3(1,2)%d ) / detg%d + g3up(3,3)%d = ( g3(1,1)%d * g3(2,2)%d - g3(1,2)%d * g3(1,2)%d ) / detg%d end subroutine wt_gup3 - subroutine wt_gup4(alpha, na, gup) + subroutine wt_gup4(alpha, na, g3up, g4up) use NullSHRE_modGFdef implicit none type (gf2d), intent (in) :: alpha type (gf2d), dimension (4), intent (in) :: na - type (gf2d), dimension (4,4), intent (inout) :: gup + type (gf2d), dimension (3,3), intent (in) :: g3up + type (gf2d), dimension (4,4), intent (inout) :: g4up integer :: i, j do i = 1, 3 do j = i, 3 - gup(i,j)%d = gup(i,j)%d - na(i)%d * na(j)%d + g4up(i,j)%d = g3up(i,j)%d - na(i)%d * na(j)%d end do end do do i = 1, 4 - gup(i,4)%d = - na(i)%d / alpha%d + g4up(i,4)%d = - na(i)%d / alpha%d end do end subroutine wt_gup4 File [modified]: NullSHRE_modNullDir.F90 Delta lines: +8 -8 =================================================================== --- branches/tapir/src/NullSHRE_modNullDir.F90 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/src/NullSHRE_modNullDir.F90 2013-11-07 17:52:13 UTC (rev 20) @@ -26,12 +26,12 @@ end subroutine wt_na - subroutine wt_sa(gup, sigma, sigma2, sa) ! eq. (25) + subroutine wt_sa(g3up, sigma, sigma2, sa) ! eq. (25) use NullSHRE_modGFdef implicit none - type (gf2d), dimension (4,4), intent (in) :: gup + type (gf2d), dimension (3,3), intent (in) :: g3up type (gf2d), dimension (3), intent (in) :: sigma type (gf2d), intent (inout) :: sigma2 type (gf2d), dimension (4), intent (inout) :: sa @@ -43,7 +43,7 @@ do i = 1, 3 sa(i)%d = 0.d0 do j = 1, 3 - sa(i)%d = sa(i)%d + gup(i,j)%d * sigma(j)%d + sa(i)%d = sa(i)%d + g3up(i,j)%d * sigma(j)%d end do end do @@ -176,7 +176,7 @@ end subroutine wt_dna - subroutine wt_dsa (sigma2, dsigma, sa, gup, dg, dsa) ! eq (41..43) + subroutine wt_dsa (sigma2, dsigma, sa, g3up, dg, dsa) ! eq (41..43) use NullSHRE_modGFdef implicit none @@ -184,7 +184,7 @@ type (gf2d), intent (in) :: sigma2 type (gf2d), dimension (3,2:3), intent (in) :: dsigma type (gf2d), dimension (4), intent (in) :: sa - type (gf2d), dimension (4,4), intent (in) :: gup + type (gf2d), dimension (3,3), intent (in) :: g3up type (gf2d), dimension (4,4,4), intent (in) :: dg type (gf2d), dimension (4,2:4), intent (inout) :: dsa @@ -197,12 +197,12 @@ dsa(i,a)%d = 0.d0 do k = 1, 3 do l = 1, 3 - dsa(i,a)%d = dsa(i,a)%d + (- gup(i,k)%d + 0.5d0 *& + dsa(i,a)%d = dsa(i,a)%d + (- g3up(i,k)%d + 0.5d0 *& & sa(i)%d * sa(k)%d) * sa(l)%d * dg(k,l,a)%d end do end do do k = 1, 3 - dsa(i,a)%d = dsa(i,a)%d + (gup(i,k)%d - sa(i)%d * sa(k)& + dsa(i,a)%d = dsa(i,a)%d + (g3up(i,k)%d - sa(i)%d * sa(k)& & %d) * dsigma(k,a)%d / sqrt(sigma2%d) end do end do @@ -215,7 +215,7 @@ do k = 1, 3 do l = 1, 3 dsa(i,4)%d = dsa(i,4)%d + dg(k,l,4)%d * sa(l)%d * (& - & -gup(i,k)%d + 0.5d0 * sa(i)%d * sa(k)%d) + & -g3up(i,k)%d + 0.5d0 * sa(i)%d * sa(k)%d) end do end do end do File [modified]: NullSHRE_modRadius.F90 Delta lines: +24 -0 =================================================================== --- branches/tapir/src/NullSHRE_modRadius.F90 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/src/NullSHRE_modRadius.F90 2013-11-07 17:52:13 UTC (rev 20) @@ -5,6 +5,30 @@ contains + subroutine wt_r_long(cr, temp, detg, g3up, j0inv, r0) + use NullSHRE_modGFdef + implicit none + CCTK_REAL, intent (in) :: cr + type (gf2d), intent (in) :: detg + type (gf2d), intent (inout) :: temp + type (gf2d), dimension (3,3), intent (in) :: g3up + type (gf2d), dimension (4,4), intent (in) :: j0inv + type (gf2d), intent (inout) :: r0 + + integer :: i, j + ! temp stands for g^rr = j0inv^r_i j0inv^r_j g^ij + + temp%d = 0 + do i = 1, 3 + do j = 1, 3 + temp%d = temp%d + j0inv(1,i)%d * j0inv(1,j)%d * g3up(i,j)%d + end do + end do + + r0%d = cr * sqrt(sqrt(detg%d*temp%d)) + + end subroutine wt_r_long + subroutine wt_r(nn1, nn2, pp, eta0, r0) ! the bondi radius eq. (53) use NullSHRE_modGFdef File [modified]: NullSHRE_modVars.F90 Delta lines: +2 -1 =================================================================== --- branches/tapir/src/NullSHRE_modVars.F90 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/src/NullSHRE_modVars.F90 2013-11-07 17:52:13 UTC (rev 20) @@ -23,7 +23,8 @@ type (gf2d), save, dimension (3) :: sigma_n, sigma_s type (gf2d), save, dimension (4,4) :: g1_n, g1_s - type (gf2d), save, dimension (4,4) :: gup_n, gup_s + type (gf2d), save, dimension (4,4) :: g4up_n, g4up_s + type (gf2d), save, dimension (3,3) :: g3up_n, g3up_s type (gf2d), save, dimension (4,4) :: j0_n, j0_s type (gf2d), save, dimension (4,4) :: j0inv_n, j0inv_s type (gf2d), save, dimension (4,4) :: j1_n, j1_s Directory: /branches/tapir/ =========================== File [modified]: interface.ccl Delta lines: +7 -1 =================================================================== --- branches/tapir/interface.ccl 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/interface.ccl 2013-11-07 17:52:13 UTC (rev 20) @@ -244,12 +244,18 @@ GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts \ "lambda deriv. of covariant metric" -CCTK_REAL WT_gup_vect[20] TYPE=ARRAY dim=2 size=\ +CCTK_REAL WT_g4up_vect[20] TYPE=ARRAY dim=2 size=\ (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts \ "contravariant metric" +CCTK_REAL WT_g3up_vect[12] TYPE=ARRAY dim=2 size=\ +(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ +(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ + GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts \ +"contravariant metric" + CCTK_REAL WT_jac[32] TYPE=ARRAY dim=2 size=\ (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ File [modified]: schedule.ccl Delta lines: +2 -2 =================================================================== --- branches/tapir/schedule.ccl 2013-11-07 01:02:36 UTC (rev 19) +++ branches/tapir/schedule.ccl 2013-11-07 17:52:13 UTC (rev 20) @@ -17,7 +17,7 @@ STORAGE: WT_CmpxCoord STORAGE: WT_scalars, WT_3vectors, WT_4vectors, WT_d4vectors - STORAGE: WT_dsigma_vect, WT_g1_vect, WT_gup_vect + STORAGE: WT_dsigma_vect, WT_g1_vect, WT_g4up_vect, WT_g3up_vect STORAGE: WT_jac, WT_affine_metric, WT_deta0_vect STORAGE: x_wt[2], j_wt[2], j_l, beta_wt[2], beta_l STORAGE: q_wt[2], u_wt[2], u_l, u_x_wt, w_wt[2], w_l @@ -67,7 +67,7 @@ { STORAGE: WT_CmpxCoord STORAGE: WT_scalars, WT_3vectors, WT_4vectors, WT_d4vectors - STORAGE: WT_dsigma_vect, WT_g1_vect, WT_gup_vect + STORAGE: WT_dsigma_vect, WT_g1_vect, WT_g4up_vect, WT_g3up_vect STORAGE: WT_jac, WT_affine_metric, WT_deta0_vect STORAGE: x_wt[2], j_wt[2], j_l, beta_wt[2], beta_l STORAGE: u_wt[2], u_l, u_x_wt, w_wt[2], w_l, q_wt[2]

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/src/ (Rev. 19)
by bela＠caltech.edu 06 Nov '13

06 Nov '13

User: szilagyi Date: 2013/11/06 07:02 PM Modified: /branches/tapir/src/ NullSHRE_WTSphHarm.F90 Log: added more diagnostic output File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullSHRE_WTSphHarm.F90 Delta lines: +271 -0 =================================================================== --- branches/tapir/src/NullSHRE_WTSphHarm.F90 2013-10-31 21:25:34 UTC (rev 18) +++ branches/tapir/src/NullSHRE_WTSphHarm.F90 2013-11-07 01:02:36 UTC (rev 19) @@ -4,6 +4,21 @@ #include "cctk_Parameters.h" #include "cctk_Functions.h" +subroutine NullSHRE_ConvertDerivs(null_lsh, fr, fq, fp, fx, fy, fz, j0inv) + use NullSHRE_modGFdef + implicit none + CCTK_INT, dimension(2), intent(in) :: null_lsh + CCTK_REAL, dimension(null_lsh(1), null_lsh(2)), intent(in) :: fr, fq, fp + CCTK_REAL, dimension(null_lsh(1), null_lsh(2)), intent(out) :: fx, fy, fz + + type (gf2d), dimension (4,4), intent(in) :: j0inv + + fx = j0inv(1,1)%d*fr + j0inv(2,1)%d*fq + j0inv(3,1)%d*fp + fy = j0inv(1,2)%d*fr + j0inv(2,2)%d*fq + j0inv(3,2)%d*fp + fz = j0inv(1,3)%d*fr + j0inv(2,3)%d*fq + j0inv(3,3)%d*fp + +end subroutine NullSHRE_ConvertDerivs + subroutine NullSHRE_WTSphHarm(CCTK_ARGUMENTS) use NullInterp @@ -21,6 +36,9 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + CCTK_REAL, dimension(null_lsh(1), null_lsh(2)) :: fx_n,fy_n,fz_n + CCTK_REAL, dimension(null_lsh(1), null_lsh(2)) :: fx_s,fy_s,fz_s + truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. first_time first_time = .FALSE. @@ -65,7 +83,260 @@ call NullDecomp_WriteCoefsForRealFunc('alpha_wt', cctkGH, truncate, & null_lsh, zeta, alpha_n%d, alpha_s%d, cctk_time) + ! g_ab{,c} + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(1,1,1)%d, dg_n(1,1,2)%d, dg_n(1,1,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(1,1,1)%d, dg_s(1,1,2)%d, dg_s(1,1,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_xx_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xx_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xx_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xx_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(1,1,4)%d, dg_s(1,1,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xx_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(1,1)%d, g1_s(1,1)%d, cctk_time) + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(1,2,1)%d, dg_n(1,2,2)%d, dg_n(1,2,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(1,2,1)%d, dg_s(1,2,2)%d, dg_s(1,2,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_xy_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xy_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xy_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xy_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(1,2,4)%d, dg_s(1,2,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xy_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(1,2)%d, g1_s(1,2)%d, cctk_time) + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(1,3,1)%d, dg_n(1,3,2)%d, dg_n(1,3,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(1,3,1)%d, dg_s(1,3,2)%d, dg_s(1,3,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_xz_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xz_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xz_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xz_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(1,3,4)%d, dg_s(1,3,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xz_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(1,3)%d, g1_s(1,3)%d, cctk_time) + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(1,4,1)%d, dg_n(1,4,2)%d, dg_n(1,4,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(1,4,1)%d, dg_s(1,4,2)%d, dg_s(1,4,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_xt_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xt_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xt_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xt_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(1,4,4)%d, dg_s(1,4,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_xt_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(1,4)%d, g1_s(1,4)%d, cctk_time) + + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(2,2,1)%d, dg_n(2,2,2)%d, dg_n(2,2,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(2,2,1)%d, dg_s(2,2,2)%d, dg_s(2,2,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_yy_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yy_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yy_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yy_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(2,2,4)%d, dg_s(2,2,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yy_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(2,2)%d, g1_s(2,2)%d, cctk_time) + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(2,3,1)%d, dg_n(2,3,2)%d, dg_n(2,3,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(2,3,1)%d, dg_s(2,3,2)%d, dg_s(2,3,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_yz_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yz_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yz_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yz_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(2,3,4)%d, dg_s(2,3,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yz_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(2,3)%d, g1_s(2,3)%d, cctk_time) + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(2,4,1)%d, dg_n(2,4,2)%d, dg_n(2,4,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(2,4,1)%d, dg_s(2,4,2)%d, dg_s(2,4,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_yt_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yt_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yt_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yt_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(2,4,4)%d, dg_s(2,4,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_yt_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(2,4)%d, g1_s(2,4)%d, cctk_time) + + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(3,3,1)%d, dg_n(3,3,2)%d, dg_n(3,3,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(3,3,1)%d, dg_s(3,3,2)%d, dg_s(3,3,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_zz_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_zz_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_zz_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_zz_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(3,3,4)%d, dg_s(3,3,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_zz_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(3,3)%d, g1_s(3,3)%d, cctk_time) + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(3,4,1)%d, dg_n(3,4,2)%d, dg_n(3,4,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(3,4,1)%d, dg_s(3,4,2)%d, dg_s(3,4,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_zt_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_zt_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_zt_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_zt_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(3,4,4)%d, dg_s(3,4,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_zt_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(3,4)%d, g1_s(3,4)%d, cctk_time) + + + + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_n(4,4,1)%d, dg_n(4,4,2)%d, dg_n(4,4,3)%d, & + fx_n, fy_n, fz_n, j0inv_n) + + call NullSHRE_ConvertDerivs(null_lsh, & + dg_s(4,4,1)%d, dg_s(4,4,2)%d, dg_s(4,4,3)%d, & + fx_s, fy_s, fz_s, j0inv_s) + + call NullDecomp_WriteCoefsForRealFunc('dg_tt_x_wt', cctkGH, truncate, & + null_lsh, zeta, fx_n, fx_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_tt_y_wt', cctkGH, truncate, & + null_lsh, zeta, fy_n, fy_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_tt_z_wt', cctkGH, truncate, & + null_lsh, zeta, fz_n, fz_s, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_tt_t_wt', cctkGH, truncate, & + null_lsh, zeta, dg_n(4,4,4)%d, dg_s(4,4,4)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('dg_tt_l_wt', cctkGH, truncate, & + null_lsh, zeta, g1_n(4,4)%d, g1_s(4,4)%d, cctk_time) + + ! null vector and parts of it call NullDecomp_WriteCoefsForRealFunc('ell_x_wt', cctkGH, truncate, & null_lsh, zeta, ell_n(1)%d, ell_s(1)%d, cctk_time)

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1048)
by ian.hinder＠aei.mpg.de 06 Nov '13

06 Nov '13

User: hinder Date: 2013/11/06 08:39 AM Added: /release-info/ datura__1_12.log Modified: /release-info/ datura__2_6.log Log: Add new datura results Using the entire node now File Changes: Directory: /release-info/ ========================= File [added]: datura__1_12.log Delta lines: <Unavailable> File [modified]: datura__2_6.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1047)
by ian.hinder＠aei.mpg.de 06 Nov '13

06 Nov '13

User: hinder Date: 2013/11/06 08:39 AM Removed: /release-info/ datura__1_6.log Log: Remove datura__1_6.log File Changes: Directory: /release-info/ ========================= File [removed]: datura__1_6.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1046)
by ian.hinder＠aei.mpg.de 06 Nov '13

06 Nov '13

User: hinder Date: 2013/11/06 05:23 AM Added: /release-info/ datura__1_6.log, datura__2_6.log Log: Add updated datura results (11 failures) File Changes: Directory: /release-info/ ========================= File [added]: datura__1_6.log Delta lines: <Unavailable> File [added]: datura__2_6.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1045)
by ian.hinder＠aei.mpg.de 06 Nov '13

06 Nov '13

User: hinder Date: 2013/11/06 05:23 AM Removed: /release-info/ datura__1_16.log, datura__2_8.log Log: Remove old datura results For some reason the filenames indicate 8 and 16 threads, which is not correct for datura. File Changes: Directory: /release-info/ ========================= File [removed]: datura__1_16.log Delta lines: <Unavailable> File [removed]: datura__2_8.log Delta lines: <Unavailable>

1 0

[Carpet] branch, master, updated. carpet-6-init-400-g390fe95
by Carpet git repositories 05 Nov '13

05 Nov '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 390fe95c7756d5102226ccb48eadbcee62e1a52d (commit) via 52d01b54ee0a65c04eab2961a96c4c446b323b68 (commit) from 15fc3538a066846c30b0525103af56c3d87a4d95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 390fe95c7756d5102226ccb48eadbcee62e1a52d Author: Anton Khirnov <anton(a)khirnov.net> Date: Tue Nov 5 12:08:28 2013 +0100 CarpetIOHDF5: avoid variable shadowing. commit 52d01b54ee0a65c04eab2961a96c4c446b323b68 Author: Anton Khirnov <anton(a)khirnov.net> Date: Tue Nov 5 12:01:40 2013 +0100 CarpetIOHDF5: remove a superfluous H5Pclose call. ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetIOHDF5/src/Output.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits November 2013