Commits January 2014

commits@lists.einsteintoolkit.org

8 participants
73 discussions

[svn:einsteintoolkit] NullEvolve/branches/tapir/ (Rev. 22)
by bela＠caltech.edu 03 Jan '14

03 Jan '14

User: szilagyi Date: 2014/01/03 02:14 AM Modified: /branches/tapir/ param.ccl /branches/tapir/src/ NullEvol_InitialData.F90 Log: implement J=const (radially) as an option for initial data File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullEvol_InitialData.F90 Delta lines: +7 -0 =================================================================== --- branches/tapir/src/NullEvol_InitialData.F90 2014-01-03 07:20:33 UTC (rev 21) +++ branches/tapir/src/NullEvol_InitialData.F90 2014-01-03 08:14:54 UTC (rev 22) @@ -39,6 +39,13 @@ jcn = (0.,0.) jcs = (0.,0.) + else if (CCTK_EQUALS(initial_J_data,"constant_J")) then + + do i = 1, N_radial_pts + jcn(:,:,i) = j_wt(:,:,1) + jcs(:,:,i) = j_wt(:,:,2) + end do + else if (CCTK_EQUALS(initial_J_data,"smooth_J")) then do i = 1, N_radial_pts Directory: /branches/tapir/ =========================== File [modified]: param.ccl Delta lines: +1 -0 =================================================================== --- branches/tapir/param.ccl 2014-01-03 07:20:33 UTC (rev 21) +++ branches/tapir/param.ccl 2014-01-03 08:14:54 UTC (rev 22) @@ -43,6 +43,7 @@ "extracted_J" :: "J as given by extraction" "polynomial_J" :: "J as third power polynomial to vanish J_xx at scri" "fitted_linearized_J" :: "linearized fitted J based on some previous run" + "constant_J" :: "J=const in the radial direction: J_ev=J_wt for all radial points" } "vanishing_J_scri" private:

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/ (Rev. 44)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/03 01:32 AM Modified: /branches/tapir/ schedule.ccl Log: the Cauchy metric vars needs a single level of storage during evolution, three during initialization File Changes: Directory: /branches/tapir/ =========================== File [modified]: schedule.ccl Delta lines: +4 -8 =================================================================== --- branches/tapir/schedule.ccl 2014-01-03 07:24:34 UTC (rev 43) +++ branches/tapir/schedule.ccl 2014-01-03 07:32:01 UTC (rev 44) @@ -3,8 +3,8 @@ if (CCTK_EQUALS(boundary_data,"SHRE")) { - STORAGE: SHRE_gij[3], SHRE_git[3] SHRE_beta[3], SHRE_alpha[3] - STORAGE: SHRE_dgij[3], SHRE_dgit[3] SHRE_dbeta[3], SHRE_dalpha[3] + STORAGE: SHRE_gij[1], SHRE_git[1] SHRE_beta[1], SHRE_alpha[1] + STORAGE: SHRE_dgij[1], SHRE_dgit[1] SHRE_dbeta[1], SHRE_dalpha[1] STORAGE: WT_r0, WT_r1[3], WT_dj0_vect STORAGE: NullVars::realcharfuncs[2] @@ -65,12 +65,8 @@ schedule GROUP NullSHRExtractInitial in NullEvol_BoundaryInit { - STORAGE: WT_CmpxCoord - STORAGE: WT_scalars, WT_3vectors, WT_4vectors, WT_d4vectors - 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] + STORAGE: SHRE_gij[3], SHRE_git[3] SHRE_beta[3], SHRE_alpha[3] + STORAGE: SHRE_dgij[3], SHRE_dgit[3] SHRE_dbeta[3], SHRE_dalpha[3] }"Group of the waveform extraction initialization" if (CCTK_EQUALS(WT_metric, "Full")) {

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/ (Rev. 43)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/03 01:24 AM Modified: /branches/tapir/ interface.ccl Log: fix typo File Changes: Directory: /branches/tapir/ =========================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- branches/tapir/interface.ccl 2014-01-03 03:40:06 UTC (rev 42) +++ branches/tapir/interface.ccl 2014-01-03 07:24:34 UTC (rev 43) @@ -416,7 +416,7 @@ GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts { SHRE_drgit_e, SHRE_dqgit_e, SHRE_dpgit_e, SHRE_dtgit_e -}"Derivatives of the mixt metric components on the extraction worldtube" +}"Derivatives of the mixed metric components on the extraction worldtube" CCTK_REAL SHRE_dbeta_e[6] TYPE = ARRAY dim=2 size=\ (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\

1 0

[svn:einsteintoolkit] NullGrid/branches/tapir/ (Rev. 16)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/03 01:23 AM Modified: /branches/tapir/ interface.ccl, schedule.ccl Log: minor change File Changes: Directory: /branches/tapir/ =========================== File [modified]: interface.ccl Delta lines: +2 -4 =================================================================== --- branches/tapir/interface.ccl 2013-12-28 04:57:25 UTC (rev 15) +++ branches/tapir/interface.ccl 2014-01-03 07:23:01 UTC (rev 16) @@ -23,10 +23,8 @@ null_dx, qsize } "scalars" -CCTK_REAL NullTime TYPE=SCALAR TIMELEVELS=3 -{ - null_time -} "histor of last 3 time-levels" +CCTK_REAL null_time TYPE=SCALAR TIMELEVELS=3 \ +"history of last 3 time-levels" ################################################################## # INTEGER CONSTANTS DESCRIBING THE GRID File [modified]: schedule.ccl Delta lines: +1 -1 =================================================================== --- branches/tapir/schedule.ccl 2013-12-28 04:57:25 UTC (rev 15) +++ branches/tapir/schedule.ccl 2014-01-03 07:23:01 UTC (rev 16) @@ -2,7 +2,7 @@ # $Header$ storage: RadCrd NullSclr StCrd StCmCrd NullGrParArrI NullGrParArrR -storage: EG_mask, guard_mask, EQ_mask, EV_mask, NullTime[3] +storage: EG_mask, guard_mask, EQ_mask, EV_mask, null_time[3] schedule NullGrid_RegisterCoords at STARTUP {

1 0

[svn:einsteintoolkit] NullVars/branches/tapir/ (Rev. 18)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/03 01:20 AM Modified: /branches/tapir/ interface.ccl Log: remove a debugging variable File Changes: Directory: /branches/tapir/ =========================== File [modified]: interface.ccl Delta lines: +2 -3 =================================================================== --- branches/tapir/interface.ccl 2014-01-03 07:05:28 UTC (rev 17) +++ branches/tapir/interface.ccl 2014-01-03 07:20:53 UTC (rev 18) @@ -21,9 +21,8 @@ (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 { - # eth2jcn, eth2jcs, - jcn, jcs, dxjcn, dxjcs, - ucn, ucs, qcn, qcs + # eth2jcn, eth2jcs, dxjcn, dxjcs, + jcn, jcs, ucn, ucs, qcn, qcs } "Evolved complex-valued Characteristic Fields (basic set)"

1 0

[svn:einsteintoolkit] NullEvolve/branches/tapir/ (Rev. 21)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/03 01:20 AM Modified: /branches/tapir/ param.ccl /branches/tapir/src/ NullEvol_Diag.F90, NullEvol_Evol.F90, NullEvol_InitialData.F90, NullEvol_InitialSlice.F90, NullEvol_Step.F90 Log: remove references to a debugging variable File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullEvol_Diag.F90 Delta lines: +8 -6 =================================================================== --- branches/tapir/src/NullEvol_Diag.F90 2014-01-03 07:03:44 UTC (rev 20) +++ branches/tapir/src/NullEvol_Diag.F90 2014-01-03 07:20:33 UTC (rev 21) @@ -11,6 +11,7 @@ use NullDecomp_Vars, only: lmax use NullDecomp_SpinDecomp, only: SpinDecompCoefs use NullEvol_DiagMod + use NullGrid_Vars, only: nx implicit none @@ -20,23 +21,24 @@ logical, save :: first_time = .TRUE. logical :: truncate + CCTK_COMPLEX, dimension(null_lsh(1),null_lsh(2),nx) :: tmpn, tmps truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. first_time call NullEvol_DiagImArray(cctkGH, 'J_ev', truncate, 2, jcn, jcs, diagtmp, null_xb, cctk_time) - call NullEvol_DiagImArray(cctkGH, 'dxJ_ev', truncate, 2, dxjcn, dxjcs, diagtmp, null_xb, cctk_time) + call NullEvol_DiagImArray(cctkGH, 'dxJ_ev', truncate, 2, tmpn, tmps, diagtmp, null_xb, cctk_time) if(.not. first_time) then - dxjcn = (jcn-jcn_p)/cctk_delta_time - dxjcs = (jcs-jcs_p)/cctk_delta_time + tmpn = (jcn-jcn_p)/cctk_delta_time + tmps = (jcs-jcs_p)/cctk_delta_time call NullEvol_DiagImArray(cctkGH, 'dtJ_ev', truncate, 2, & - dxjcn, dxjcs, diagtmp, null_xb, cctk_time-0.5*cctk_delta_time) + tmpn, tmps, diagtmp, null_xb, cctk_time-0.5*cctk_delta_time) - dxjcn = 1.e16 - dxjcs = 1.e16 + tmpn = 1.e16 + tmps = 1.e16 end if File [modified]: NullEvol_Evol.F90 Delta lines: +4 -3 =================================================================== --- branches/tapir/src/NullEvol_Evol.F90 2014-01-03 07:03:44 UTC (rev 20) +++ branches/tapir/src/NullEvol_Evol.F90 2014-01-03 07:20:33 UTC (rev 21) @@ -448,7 +448,8 @@ end subroutine NullEvol_j_Bp2 - subroutine NullEvol_j (i, jns, dxjos, nuns, ckns, bns, cbns, qns, uns, wns,& + subroutine NullEvol_j (i, jns, & ! dxjos, + nuns, ckns, bns, cbns, qns, uns, wns,& jos, nuos, ckos, bos, cbos, qos, uos, wos, & x_wt, j_wt, beta_wt, q_wt, u_wt, w_wt,& x_wt_o, j_wt_o, beta_wt_o, q_wt_o, u_wt_o, w_wt_o,& @@ -457,7 +458,7 @@ CCTK_REAL, intent(in) :: dt CCTK_INT, intent (in) :: i, dissip_fudge, first_order_scheme - CCTK_COMPLEX, dimension (lsh(1), lsh(2), nx), intent (inout) :: jns, dxjos + CCTK_COMPLEX, dimension (lsh(1), lsh(2), nx), intent (inout) :: jns !, dxjos CCTK_COMPLEX, dimension (lsh(1), lsh(2), nx), intent (in) :: jos, nuos, ckos, cbos, uos, qos CCTK_COMPLEX, dimension (lsh(1), lsh(2), nx), intent (in) :: nuns, ckns, cbns, uns, qns CCTK_REAL, dimension (lsh(1), lsh(2), nx), intent (in) :: bns, bos, wns, wos @@ -665,7 +666,7 @@ end do !fill the radial derivative - dxjos(:,:,i) = dx_Jo +! dxjos(:,:,i) = dx_Jo end subroutine NullEvol_j File [modified]: NullEvol_InitialData.F90 Delta lines: +25 -14 =================================================================== --- branches/tapir/src/NullEvol_InitialData.F90 2014-01-03 07:03:44 UTC (rev 20) +++ branches/tapir/src/NullEvol_InitialData.F90 2014-01-03 07:20:33 UTC (rev 21) @@ -31,8 +31,8 @@ ! eth2jcn = (0.,0.) ! eth2jcs = (0.,0.) - dxjcn = (0.,0.) - dxjcs = (0.,0.) + ! dxjcn = (0.,0.) + ! dxjcs = (0.,0.) if (CCTK_EQUALS(initial_J_data,"vanishing_J")) then @@ -247,20 +247,20 @@ !initialize dx_J - dxjcn(:,:,1) = -0.5 * (3.*jcn(:,:,1) - 4.*jcn(:,:,2) + jcn(:,:,3)) / null_dx - dxjcs(:,:,1) = -0.5 * (3.*jcs(:,:,1) - 4.*jcs(:,:,2) + jcs(:,:,3)) / null_dx + ! dxjcn(:,:,1) = -0.5 * (3.*jcn(:,:,1) - 4.*jcn(:,:,2) + jcn(:,:,3)) / null_dx + ! dxjcs(:,:,1) = -0.5 * (3.*jcs(:,:,1) - 4.*jcs(:,:,2) + jcs(:,:,3)) / null_dx - do i = 2, N_radial_pts-1 +! do i = 2, N_radial_pts-1 - dxjcn(:,:,i) = 0.5 * (jcn(:,:,i+1) - jcn(:,:,i-1)) / null_dx - dxjcs(:,:,i) = 0.5 * (jcs(:,:,i+1) - jcs(:,:,i-1)) / null_dx +! dxjcn(:,:,i) = 0.5 * (jcn(:,:,i+1) - jcn(:,:,i-1)) / null_dx +! dxjcs(:,:,i) = 0.5 * (jcs(:,:,i+1) - jcs(:,:,i-1)) / null_dx - end do +! end do - dxjcn(:,:,N_radial_pts) = 0.5 * (3.*jcn(:,:,N_radial_pts) & - - 4.*jcn(:,:,N_radial_pts-1) + jcn(:,:,N_radial_pts-2)) / null_dx - dxjcs(:,:,N_radial_pts) = 0.5 * (3.*jcs(:,:,N_radial_pts) & - - 4.*jcs(:,:,N_radial_pts-1) + jcs(:,:,N_radial_pts-2)) / null_dx +! dxjcn(:,:,N_radial_pts) = 0.5 * (3.*jcn(:,:,N_radial_pts) & +! - 4.*jcn(:,:,N_radial_pts-1) + jcn(:,:,N_radial_pts-2)) / null_dx +! dxjcs(:,:,N_radial_pts) = 0.5 * (3.*jcs(:,:,N_radial_pts) & +! - 4.*jcs(:,:,N_radial_pts-1) + jcs(:,:,N_radial_pts-2)) / null_dx !initialize array for the radial profile qp = int((null_lsh(1)-1)/2) + 1 @@ -269,9 +269,20 @@ jcn_rad(:) = jcn(qp,pq,:) jcs_rad(:) = jcs(qp,pq,:) - dxjcn_rad(:) = dxjcn(qp,pq,:) - dxjcs_rad(:) = dxjcs(qp,pq,:) +! dxjcn_rad(:) = dxjcn(qp,pq,:) +! dxjcs_rad(:) = dxjcs(qp,pq,:) + dxjcn_rad(1) = -0.5 * (3.*jcn(qp,pq,1) - 4.*jcn(qp,pq,2) + jcn(qp,pq,3)) / null_dx + dxjcs_rad(1) = -0.5 * (3.*jcs(qp,pq,1) - 4.*jcs(qp,pq,2) + jcs(qp,pq,3)) / null_dx + + do i = 2, N_radial_pts-1 + + dxjcn_rad(i) = 0.5 * (jcn(qp,pq,i+1) - jcn(qp,pq,i-1)) / null_dx + dxjcs_rad(i) = 0.5 * (jcs(qp,pq,i+1) - jcs(qp,pq,i-1)) / null_dx + + end do + + ! write (*,*) 'NULL_INITIALDATA: J_scri N are: ', maxval(abs(jcn(:,:,N_radial_pts))) ! write (*,*) 'NULL_INITIALDATA: J_scri S are: ', maxval(abs(jcs(:,:,N_radial_pts))) File [modified]: NullEvol_InitialSlice.F90 Delta lines: +3 -4 =================================================================== --- branches/tapir/src/NullEvol_InitialSlice.F90 2014-01-03 07:03:44 UTC (rev 20) +++ branches/tapir/src/NullEvol_InitialSlice.F90 2014-01-03 07:20:33 UTC (rev 21) @@ -14,16 +14,15 @@ use NullGrid_Vars implicit none - CCTK_INT :: i, one = 1, two = 2, three = 3 + CCTK_INT :: i, one = 1 CCTK_INT :: mn, global_mn CCTK_INT :: reval - CCTK_REAL :: SMass, tmp_dt + ! CCTK_REAL :: SMass, tmp_dt CCTK_INT, dimension(1) :: Tarr CCTK_INT, save :: reduce_handle ! character(len=500) :: message logical, save :: FirstTime = .true. - logical, save :: ThisProc = .false. CCTK_INT, save :: loc_q, loc_p DECLARE_CCTK_ARGUMENTS @@ -49,7 +48,7 @@ if (reduce_handle .lt. 0 ) then call CCTK_WARN(0,"Could not get reduction handle") endif - SMass = .5d0*null_rwt + ! SMass = .5d0*null_rwt ! tmp_dt = .25d0*null_start_dt/SMass ! dt_fact = (((tmp_dt**3/6.0d0 - tmp_dt**4/24.0d0) - & ! .5d0*tmp_dt**2) + tmp_dt) File [modified]: NullEvol_Step.F90 Delta lines: +26 -16 =================================================================== --- branches/tapir/src/NullEvol_Step.F90 2014-01-03 07:03:44 UTC (rev 20) +++ branches/tapir/src/NullEvol_Step.F90 2014-01-03 07:20:33 UTC (rev 21) @@ -77,7 +77,7 @@ if (DEBUG_skip_J_update.eq.0) then - call NullEvol_j (i, jcn, dxjcn, nucn, ckcn, bcn, cbcn, qcn, ucn, wcn,& + call NullEvol_j (i, jcn, nucn, ckcn, bcn, cbcn, qcn, ucn, wcn,& jcn_p, nucn_p, ckcn_p, bcn_p, cbcn_p, qcn_p, ucn_p, wcn_p,& x_wt(:,:,1), j_wt(:,:,1), beta_wt(:,:,1), q_wt(:,:,1),& u_wt(:,:,1), w_wt(:,:,1), x_wt_p(:,:,1), j_wt_p(:,:,1),& @@ -86,7 +86,7 @@ null_dissip, cctk_delta_time, dissip_fudge, dissip_fudge_maxx,& dissip_eps_J, dissip_eps_Jx, first_order_scheme) - call NullEvol_j (i, jcs, dxjcs, nucs, ckcs, bcs, cbcs, qcs, ucs, wcs,& + call NullEvol_j (i, jcs, nucs, ckcs, bcs, cbcs, qcs, ucs, wcs,& jcs_p, nucs_p, ckcs_p, bcs_p, cbcs_p, qcs_p, ucs_p, wcs_p, & x_wt(:,:,2), j_wt(:,:,2), beta_wt(:,:,2), q_wt(:,:,2),& u_wt(:,:,2), w_wt(:,:,2), x_wt_p(:,:,2), j_wt_p(:,:,2),& @@ -173,25 +173,25 @@ end do - if (old_J_xderiv.eq.0) then +!if (old_J_xderiv.eq.0) then !compute dx_J - dxjcn(:,:,1) = -0.5 * (3.*jcn(:,:,1) - 4.*jcn(:,:,2) + jcn(:,:,3)) / null_dx - dxjcs(:,:,1) = -0.5 * (3.*jcs(:,:,1) - 4.*jcs(:,:,2) + jcs(:,:,3)) / null_dx +! dxjcn(:,:,1) = -0.5 * (3.*jcn(:,:,1) - 4.*jcn(:,:,2) + jcn(:,:,3)) / null_dx +! dxjcs(:,:,1) = -0.5 * (3.*jcs(:,:,1) - 4.*jcs(:,:,2) + jcs(:,:,3)) / null_dx - do i = 2, N_radial_pts-1 +! do i = 2, N_radial_pts-1 - dxjcn(:,:,i) = 0.5 * (jcn(:,:,i+1) - jcn(:,:,i-1)) / null_dx - dxjcs(:,:,i) = 0.5 * (jcs(:,:,i+1) - jcs(:,:,i-1)) / null_dx +! dxjcn(:,:,i) = 0.5 * (jcn(:,:,i+1) - jcn(:,:,i-1)) / null_dx +! dxjcs(:,:,i) = 0.5 * (jcs(:,:,i+1) - jcs(:,:,i-1)) / null_dx - end do +! end do - dxjcn(:,:,N_radial_pts) = 0.5 * (3.*jcn(:,:,N_radial_pts) & - - 4.*jcn(:,:,N_radial_pts-1) + jcn(:,:,N_radial_pts-2)) / null_dx - dxjcs(:,:,N_radial_pts) = 0.5 * (3.*jcs(:,:,N_radial_pts) & - - 4.*jcs(:,:,N_radial_pts-1) + jcs(:,:,N_radial_pts-2)) / null_dx +! dxjcn(:,:,N_radial_pts) = 0.5 * (3.*jcn(:,:,N_radial_pts) & +! - 4.*jcn(:,:,N_radial_pts-1) + jcn(:,:,N_radial_pts-2)) / null_dx +! dxjcs(:,:,N_radial_pts) = 0.5 * (3.*jcs(:,:,N_radial_pts) & +! - 4.*jcs(:,:,N_radial_pts-1) + jcs(:,:,N_radial_pts-2)) / null_dx - end if +!end if !compute array for the radial profile qp = int((null_lsh(1)-1)/2) + 1 @@ -200,9 +200,19 @@ jcn_rad(:) = jcn(qp,pq,:) jcs_rad(:) = jcs(qp,pq,:) - dxjcn_rad(:) = dxjcn(qp,pq,:) - dxjcs_rad(:) = dxjcs(qp,pq,:) +! dxjcn_rad(:) = dxjcn(qp,pq,:) +! dxjcs_rad(:) = dxjcs(qp,pq,:) + dxjcn_rad(1) = -0.5 * (3.*jcn(qp,pq,1) - 4.*jcn(qp,pq,2) + jcn(qp,pq,3)) / null_dx + dxjcs_rad(1) = -0.5 * (3.*jcs(qp,pq,1) - 4.*jcs(qp,pq,2) + jcs(qp,pq,3)) / null_dx + + do i = 2, N_radial_pts-1 + + dxjcn_rad(i) = 0.5 * (jcn(qp,pq,i+1) - jcn(qp,pq,i-1)) / null_dx + dxjcs_rad(i) = 0.5 * (jcs(qp,pq,i+1) - jcs(qp,pq,i-1)) / null_dx + + end do + call NullEvol_ResetInactive(CCTK_PASS_FTOF,1,N_radial_pts) ! write (*,*) 'NULL_EVOLSTEP: J_scri N are: ', maxval(abs(jcn(:,:,N_radial_pts))) Directory: /branches/tapir/ =========================== File [modified]: param.ccl Delta lines: +3 -3 =================================================================== --- branches/tapir/param.ccl 2014-01-03 07:03:44 UTC (rev 20) +++ branches/tapir/param.ccl 2014-01-03 07:20:33 UTC (rev 21) @@ -266,6 +266,6 @@ { } "no" -BOOLEAN old_J_xderiv "should we compute the x derivative of J with the old values?" -{ -} "no" +# BOOLEAN old_J_xderiv "should we compute the x derivative of J with the old values?" +# { +# } "no"

1 0

[svn:einsteintoolkit] NullVars/branches/tapir/ (Rev. 17)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/03 01:05 AM Modified: /branches/tapir/ interface.ccl Log: remove some of the 3d debugging variables File Changes: Directory: /branches/tapir/ =========================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- branches/tapir/interface.ccl 2013-12-28 04:57:51 UTC (rev 16) +++ branches/tapir/interface.ccl 2014-01-03 07:05:28 UTC (rev 17) @@ -21,8 +21,8 @@ (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 { + # eth2jcn, eth2jcs, jcn, jcs, dxjcn, dxjcs, - eth2jcn, eth2jcs, ucn, ucs, qcn, qcs } "Evolved complex-valued Characteristic Fields (basic set)"

1 0

[svn:einsteintoolkit] NullExact/branches/tapir/src/ (Rev. 14)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/03 01:04 AM Modified: /branches/tapir/src/ NullExact_Error.F90 Log: remove references to some of the debugging variables File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullExact_Error.F90 Delta lines: +12 -10 =================================================================== --- branches/tapir/src/NullExact_Error.F90 2013-12-28 04:57:20 UTC (rev 13) +++ branches/tapir/src/NullExact_Error.F90 2014-01-03 07:04:58 UTC (rev 14) @@ -20,7 +20,9 @@ ! local variables, as needed: CCTK_COMPLEX :: ii = (0,1.) CCTK_INT :: k, patch_ID - CCTK_COMPLEX, dimension(lsh(1), lsh(2), N_radial_pts) :: anajcn, anajcs, anaucn, anaucs, anadrucn, anadrucs, anaeth2jcn, anaeth2jcs, anaqcn, anaqcs + CCTK_COMPLEX, dimension(lsh(1), lsh(2), N_radial_pts) :: & + anajcn, anajcs, anaucn, anaucs, anadrucn, anadrucs, anaqcn, anaqcs + ! anaeth2jcn, anaeth2jcs, if (verbose.ne.0) call CCTK_INFO("checking for error in main complex evolution variables") @@ -34,12 +36,12 @@ !Compute analytic values in complex Characteristic Fields call NullExact_Analytic_J_2D(patch_ID+1,null_lsh(1),null_lsh(2),stereo_q,stereo_p,null_xb(k),cctk_time,anajcn(:,:,k), Ylm_2) call NullExact_Analytic_U_2D(patch_ID+1,null_lsh(1),null_lsh(2),stereo_q,stereo_p,null_xbh(k),cctk_time,anaucn(:,:,k), Ylm_1) - call NullInterp_d2 (anaeth2jcn(:,:,k), anajcn(:,:,k), 2, 1, 1) + !call NullInterp_d2 (anaeth2jcn(:,:,k), anajcn(:,:,k), 2, 1, 1) call NullExact_Analytic_drU_2D(patch_ID+1,null_lsh(1),null_lsh(2),stereo_q,stereo_p,null_xb(k),cctk_time,anadrucn(:,:,k), Ylm_1) call NullExact_Analytic_J_2D(ip_s,null_lsh(1),null_lsh(2),stereo_q,stereo_p,null_xb(k),cctk_time,anajcs(:,:,k), Ylm_2) call NullExact_Analytic_U_2D(ip_s,null_lsh(1),null_lsh(2),stereo_q,stereo_p,null_xbh(k),cctk_time,anaucs(:,:,k), Ylm_1) - call NullInterp_d2 (anaeth2jcs(:,:,k), anajcs(:,:,k), 2, 1, 1) + !call NullInterp_d2 (anaeth2jcs(:,:,k), anajcs(:,:,k), 2, 1, 1) call NullExact_Analytic_drU_2D(ip_s,null_lsh(1),null_lsh(2),stereo_q,stereo_p,null_xb(k),cctk_time,anadrucs(:,:,k), Ylm_1) @@ -57,8 +59,8 @@ ucn_e(:,:,k) = EQ_mask * (ucn(:,:,k) - anaucn(:,:,k)) ucs_e(:,:,k) = EQ_mask * (ucs(:,:,k) - anaucs(:,:,k)) - eth2jcn_e(:,:,k) = EQ_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) - eth2jcs_e(:,:,k) = EQ_mask * (eth2jcs(:,:,k) - anaeth2jcs(:,:,k)) + ! eth2jcn_e(:,:,k) = EQ_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) + ! eth2jcs_e(:,:,k) = EQ_mask * (eth2jcs(:,:,k) - anaeth2jcs(:,:,k)) anaqcn(:,:,k) = (rwt*null_xb(k)/(1-null_xb(k)))**2& *exp(-2.d0*bcn(:,:,k))*anadrucn(:,:,k) @@ -74,31 +76,31 @@ Mjcn_e(:,:,k) = (jcn(:,:,k) - anajcn(:,:,k)) Mucn_e(:,:,k) = (ucn(:,:,k) - anaucn(:,:,k)) - Meth2jcn_e(:,:,k) = (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) + ! Meth2jcn_e(:,:,k) = (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) else if (CCTK_EQUALS(error_mask_type, "EG_mask")) then Mjcn_e(:,:,k) = EG_mask * (jcn(:,:,k) - anajcn(:,:,k)) Mucn_e(:,:,k) = EG_mask * (ucn(:,:,k) - anaucn(:,:,k)) - Meth2jcn_e(:,:,k) = EG_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) + ! Meth2jcn_e(:,:,k) = EG_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) else if (CCTK_EQUALS(error_mask_type, "EQ_mask")) then Mjcn_e(:,:,k) = EQ_mask * (jcn(:,:,k) - anajcn(:,:,k)) Mucn_e(:,:,k) = EQ_mask * (ucn(:,:,k) - anaucn(:,:,k)) - Meth2jcn_e(:,:,k) = EQ_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) + ! Meth2jcn_e(:,:,k) = EQ_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) else if (CCTK_EQUALS(error_mask_type, "EV_mask")) then Mjcn_e(:,:,k) = EV_mask * (jcn(:,:,k) - anajcn(:,:,k)) Mucn_e(:,:,k) = EV_mask * (ucn(:,:,k) - anaucn(:,:,k)) - Meth2jcn_e(:,:,k) = EV_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) + ! Meth2jcn_e(:,:,k) = EV_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) else if (CCTK_EQUALS(error_mask_type, "guard_mask")) then Mjcn_e(:,:,k) = guard_mask * (jcn(:,:,k) - anajcn(:,:,k)) Mucn_e(:,:,k) = guard_mask * (ucn(:,:,k) - anaucn(:,:,k)) - Meth2jcn_e(:,:,k) = guard_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) + ! Meth2jcn_e(:,:,k) = guard_mask * (eth2jcn(:,:,k) - anaeth2jcn(:,:,k)) else call CCTK_WARN(0, "unsupported circular mask type")

1 0

[svn:einsteintoolkit] NullEvolve/branches/tapir/src/ (Rev. 20)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/03 01:03 AM Modified: /branches/tapir/src/ NullEvol_Bdry.F90, NullEvol_Evol.F90, NullEvol_InitialData.F90, NullEvol_Step.F90 Log: remove references to some of the debugging variables File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullEvol_Bdry.F90 Delta lines: +6 -6 =================================================================== --- branches/tapir/src/NullEvol_Bdry.F90 2014-01-03 03:34:36 UTC (rev 19) +++ branches/tapir/src/NullEvol_Bdry.F90 2014-01-03 07:03:44 UTC (rev 20) @@ -30,8 +30,8 @@ jcn(:,:,i) = (0.,0.) jcs(:,:,i) = (0.,0.) - eth2jcn(:,:,i) = (0.,0.) - eth2jcs(:,:,i) = (0.,0.) + ! eth2jcn(:,:,i) = (0.,0.) + ! eth2jcs(:,:,i) = (0.,0.) ucn(:,:,i) = (0.,0.) ucs(:,:,i) = (0.,0.) @@ -85,8 +85,8 @@ jcn(:,:,i) = (0.,0.) jcs(:,:,i) = (0.,0.) - eth2jcn(:,:,i) = (0.,0.) - eth2jcs(:,:,i) = (0.,0.) + ! eth2jcn(:,:,i) = (0.,0.) + ! eth2jcs(:,:,i) = (0.,0.) ucn(:,:,i) = (0.,0.) ucs(:,:,i) = (0.,0.) @@ -142,8 +142,8 @@ write(*,*)"RANDOM_J", i, max(maxval(abs(jcn(:,:,:i))), maxval(abs(jcs(:,:,:i)))) - eth2jcn(:,:,i) = (0.,0.) - eth2jcs(:,:,i) = (0.,0.) + ! eth2jcn(:,:,i) = (0.,0.) + ! eth2jcs(:,:,i) = (0.,0.) ucn(:,:,i) = (0.,0.) ucs(:,:,i) = (0.,0.) File [modified]: NullEvol_Evol.F90 Delta lines: +1 -2 =================================================================== --- branches/tapir/src/NullEvol_Evol.F90 2014-01-03 03:34:36 UTC (rev 19) +++ branches/tapir/src/NullEvol_Evol.F90 2014-01-03 07:03:44 UTC (rev 20) @@ -52,8 +52,7 @@ CCTK_REAL :: rh CCTK_COMPLEX :: ii = (0. , 1.) - CCTK_INT cran, B - CCTK_INT, parameter :: cran_max = 2 + CCTK_INT B if (FirstTime) then FirstTime = .false. File [modified]: NullEvol_InitialData.F90 Delta lines: +5 -5 =================================================================== --- branches/tapir/src/NullEvol_InitialData.F90 2014-01-03 03:34:36 UTC (rev 19) +++ branches/tapir/src/NullEvol_InitialData.F90 2014-01-03 07:03:44 UTC (rev 20) @@ -28,8 +28,8 @@ ! cctk_delta_time set by null step (called below) - eth2jcn = (0.,0.) - eth2jcs = (0.,0.) + ! eth2jcn = (0.,0.) + ! eth2jcs = (0.,0.) dxjcn = (0.,0.) dxjcs = (0.,0.) @@ -240,8 +240,8 @@ jcn(:,:,i) = EG_mask * jcn(:,:,i) jcs(:,:,i) = EG_mask * jcs(:,:,i) - eth2jcn(:,:,i) = EQ_mask * eth2jcn(:,:,i) - eth2jcs(:,:,i) = EQ_mask * eth2jcs(:,:,i) + ! eth2jcn(:,:,i) = EQ_mask * eth2jcn(:,:,i) + ! eth2jcs(:,:,i) = EQ_mask * eth2jcs(:,:,i) end do @@ -288,7 +288,7 @@ DECLARE_CCTK_PARAMETERS jcs = ii*1.d+50; jcs_p = ii*1.d+50; jcn = ii*1.d+50; jcn_p = ii*1.d+50 - eth2jcs = ii*1.d+50; eth2jcs_p = ii*1.d+50; eth2jcn = ii*1.d+50; eth2jcn_p = ii*1.d+50 + ! eth2jcs = ii*1.d+50; eth2jcs_p = ii*1.d+50; eth2jcn = ii*1.d+50; eth2jcn_p = ii*1.d+50 ucs = ii*1.d+50; ucs_p = ii*1.d+50; ucn = ii*1.d+50; ucn_p = ii*1.d+50 wcs = 1.d+50; wcs_p = 1.d+50; wcn = 1.d+50; wcn_p = 1.d+50 bcs = 1.d+50; bcs_p = 1.d+50; bcn = 1.d+50; bcn_p = 1.d+50 File [modified]: NullEvol_Step.F90 Delta lines: +4 -4 =================================================================== --- branches/tapir/src/NullEvol_Step.F90 2014-01-03 03:34:36 UTC (rev 19) +++ branches/tapir/src/NullEvol_Step.F90 2014-01-03 07:03:44 UTC (rev 20) @@ -161,15 +161,15 @@ end if !Compute eth2_j - call NullInterp_d2 (eth2jcn(:,:,i), jcn(:,:,i), two, one, one) - call NullInterp_d2 (eth2jcs(:,:,i), jcs(:,:,i), two, one, one) + ! call NullInterp_d2 (eth2jcn(:,:,i), jcn(:,:,i), two, one, one) + ! call NullInterp_d2 (eth2jcs(:,:,i), jcs(:,:,i), two, one, one) !Mask J and eth2_J jcn(:,:,i) = EG_mask * jcn(:,:,i) jcs(:,:,i) = EG_mask * jcs(:,:,i) - eth2jcn(:,:,i) = EQ_mask * eth2jcn(:,:,i) - eth2jcs(:,:,i) = EQ_mask * eth2jcs(:,:,i) + ! eth2jcn(:,:,i) = EQ_mask * eth2jcn(:,:,i) + ! eth2jcs(:,:,i) = EQ_mask * eth2jcs(:,:,i) end do

1 0

[svn:einsteintoolkit] NullNews/branches/tapir/ (Rev. 20)
by bela＠caltech.edu 02 Jan '14

02 Jan '14

User: szilagyi Date: 2014/01/02 09:45 PM Modified: /branches/tapir/ interface.ccl Log: make clear which variables do not need timelevels File Changes: Directory: /branches/tapir/ =========================== File [modified]: interface.ccl Delta lines: +9 -9 =================================================================== --- branches/tapir/interface.ccl 2013-12-28 04:57:35 UTC (rev 19) +++ branches/tapir/interface.ccl 2014-01-03 03:45:42 UTC (rev 20) @@ -12,19 +12,19 @@ public: # private: -cctk_complex NewsB[2] Type=ARRAY timelevels=1 dim=2 size=\ +cctk_complex NewsB[2] 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 \ "Bondi News" -cctk_complex News[2] Type=ARRAY timelevels=1 dim=2 size=\ +cctk_complex News[2] 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 \ "News" -cctk_complex Psi4[2] Type=ARRAY timelevels=1 dim=2 size=\ +cctk_complex Psi4[2] 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 \ @@ -63,38 +63,38 @@ -cctk_real uBondi[2] timelevels=1 Type=ARRAY dim=2 size=\ +cctk_real uBondi[2] 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 \ "Bondi time" -cctk_complex NewsB_past[2*max_timelevels] Type=ARRAY timelevels=1 dim=2 size=\ +cctk_complex NewsB_past[2*max_timelevels] 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 \ "past levels of Bondi News" -cctk_complex News_past[2*max_timelevels] Type=ARRAY timelevels=1 dim=2 size=\ +cctk_complex News_past[2*max_timelevels] 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 \ "past levels of News" -cctk_complex Psi4_past[2*max_timelevels] Type=ARRAY timelevels=1 dim=2 size=\ +cctk_complex Psi4_past[2*max_timelevels] 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 \ "past levels of Psi4" -cctk_real uBondi_past[2*max_timelevels] timelevels=1 Type=ARRAY dim=2 size=\ +cctk_real uBondi_past[2*max_timelevels] 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 \ "past levels of Bondi time" -cctk_complex linStrain_past[2*max_timelevels] Type=ARRAY timelevels=1 dim=2 size=\ +cctk_complex linStrain_past[2*max_timelevels] 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 \

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits January 2014