User: szilagyi Date: 2013/11/18 04:58 PM
Modified: /branches/tapir/src/ NullConstr_Driver.F90
Log: make constraint code compatible with generic t-steps
File Changes:
Directory: /branches/tapir/src/ ===============================
File [modified]: NullConstr_Driver.F90 Delta lines: +13 -10 =================================================================== --- branches/tapir/src/NullConstr_Driver.F90 2013-11-08 18:57:34 UTC (rev 13) +++ branches/tapir/src/NullConstr_Driver.F90 2013-11-18 22:58:59 UTC (rev 14) @@ -54,7 +54,10 @@
LOGICAL, save :: FirstTime = .true. CCTK_INT :: l1, l2, reduce_handle, mn, reval, global_mn + CCTK_REAL :: delta_time
+ delta_time = null_time - null_time_p + call CCTK_ReductionHandle(reduce_handle, "minimum"); if (reduce_handle .lt. 0 ) then call CCTK_WARN(0,"Could not get reduction handle") @@ -148,23 +151,23 @@
do i = global_mn+1, N_radial_pts
- call real_derivs (wcn,wcn_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & + call real_derivs (wcn,wcn_p,delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(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) - call real_derivs (bcn,bcn_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & + call real_derivs (bcn,bcn_p,delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & 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) - call real_derivs (kc,kc_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & + call real_derivs (kc,kc_p,delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & 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) call cmplx_derivs & - (jcn,jcn_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,2,dr_dx(i),d2r_dx2(i),.FALSE., & + (jcn,jcn_p,delta_time,dx,N_radial_pts,null_lsh,i,2,dr_dx(i),d2r_dx2(i),.FALSE., & 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) call cmplx_derivs & - (ucn,ucn_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,1,dr_dx(i),d2r_dx2(i),.TRUE., & + (ucn,ucn_p,delta_time,dx,N_radial_pts,null_lsh,i,1,dr_dx(i),d2r_dx2(i),.TRUE., & 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, & @@ -226,23 +229,23 @@
do i = global_mn+1, N_radial_pts
- call real_derivs (wcs,wcs_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & + call real_derivs (wcs,wcs_p,delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(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) - call real_derivs (bcs,bcs_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & + call real_derivs (bcs,bcs_p,delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & 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) - call real_derivs (kc,kc_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & + call real_derivs (kc,kc_p,delta_time,dx,N_radial_pts,null_lsh,i,dr_dx(i),d2r_dx2(i), & 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) call cmplx_derivs & - (jcs,jcs_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,2,dr_dx(i),d2r_dx2(i),.FALSE., & + (jcs,jcs_p,delta_time,dx,N_radial_pts,null_lsh,i,2,dr_dx(i),d2r_dx2(i),.FALSE., & 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) call cmplx_derivs & - (ucs,ucs_p,cctk_delta_time,dx,N_radial_pts,null_lsh,i,1,dr_dx(i),d2r_dx2(i),.TRUE., & + (ucs,ucs_p,delta_time,dx,N_radial_pts,null_lsh,i,1,dr_dx(i),d2r_dx2(i),.TRUE., & 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, &