User: szilagyi Date: 2013/11/18 04:58 PM

Modified: /branches/tapir/src/ NullSHRE_ExtractWT.F90, NullSHRE_modRadius.F90

Log: work on generic time-step

File Changes:

Directory: /branches/tapir/src/ ===============================

File [modified]: NullSHRE_ExtractWT.F90 Delta lines: +2 -3 =================================================================== --- branches/tapir/src/NullSHRE_ExtractWT.F90 2013-11-18 22:58:19 UTC (rev 37) +++ branches/tapir/src/NullSHRE_ExtractWT.F90 2013-11-18 22:58:35 UTC (rev 38) @@ -39,7 +39,6 @@ character(len=500) :: message

#define dt cctk_delta_time -#define dd null_delta(1)

!--------------------------------------------------------------------------- ! world-tube, and analytic part of the coordinate transformation @@ -170,8 +169,8 @@ ! r_lu, r_lA by finite differences !---------------------------------------------------------------------------

- call wt_rlu (dt, dr0_n, rl_old_n, dr1_n) - call wt_rlu (dt, dr0_s, rl_old_s, dr1_s) + call wt_rlu (null_time,null_time_p,null_time_p_p, dr0_n, rl_old_n, dr1_n) + call wt_rlu (null_time,null_time_p,null_time_p_p, dr0_s, rl_old_s, dr1_s)

call NullInterp_wt_da_ethr(cctkGH, tmp_cgfn, tmp_cgfs,& dr0_n(1)%d, dr0_s(1)%d, dr1_n(2)%d, dr1_s(2)%d, dr1_n(3)%d, dr1_s(3)%d)

File [modified]: NullSHRE_modRadius.F90 Delta lines: +10 -3 =================================================================== --- branches/tapir/src/NullSHRE_modRadius.F90 2013-11-18 22:58:19 UTC (rev 37) +++ branches/tapir/src/NullSHRE_modRadius.F90 2013-11-18 22:58:35 UTC (rev 38) @@ -200,19 +200,26 @@ end subroutine wt_rll

- subroutine wt_rlu (dt, dr0, rl_old, dr1) + subroutine wt_rlu (t0,t1,t2, dr0, rl_old, dr1)

use NullSHRE_modGFdef implicit none

- CCTK_REAL, intent (in) :: dt + CCTK_REAL, intent (in) :: t0,t1,t2 type (gf2d), dimension (4), intent (in) :: dr0 type (gf2d), dimension (2), intent (inout) :: rl_old type (gf2d), dimension (4), intent (inout) :: dr1

+ CCTK_REAL :: c0,c1,c2,cd

- dr1(4)%d = (3.d0 * dr0(1)%d - 4.d0 * rl_old(1)%d + rl_old(2)%d) / (2.d0 * dt) + cd = 1.0d0/(t0-t1)/(t0*t1-t0*t2-t1*t2+t2**2) + c0 = (2*t0*t1-2*t0*t2-t1**2+t2**2)*cd + c1 = (-t0**2+2*t0*t2-t2**2)*cd + c2 = (t0**2-2*t0*t1+t1**2)*cd

+ dr1(4)%d = c0 * dr0(1)%d + c1 * rl_old(1)%d + c2 * rl_old(2)%d +! dr1(4)%d = (3.d0 * dr0(1)%d - 4.d0 * rl_old(1)%d + rl_old(2)%d) / (2.d0 * dt) + end subroutine wt_rlu

end module NullSHRE_modRadius