User: rhaas
Date: 2012/08/01 12:45 PM
Modified:
/trunk/
interface.ccl
/trunk/src/
NullEvol_Diag.F90, NullEvol_Evol.F90
Log:
NullEvolve: respect Cactus' IO::truncate parameter
File Changes:
Directory: /trunk/src/
======================
File [modified]: NullEvol_Diag.F90
Delta lines: +5 -5
===================================================================
--- trunk/src/NullEvol_Diag.F90 2012-07-31 20:04:45 UTC (rev 10)
+++ trunk/src/NullEvol_Diag.F90 2012-08-01 17:45:05 UTC (rev 11)
@@ -18,9 +18,11 @@
DECLARE_CCTK_PARAMETERS
DECLARE_CCTK_FUNCTIONS
- logical, save :: truncate = .TRUE.
- !truncate = cctk_iteration.eq.0
+ logical, save :: first_time = .TRUE.
+ logical :: truncate
+ 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)
@@ -42,8 +44,6 @@
call NullEvol_DiagReArray(cctkGH, 'B_ev', truncate, bcn, bcs, diagtmp, null_xb, cctk_time)
- if (truncate) then
- truncate = .FALSE.
- endif
+ first_time = .FALSE.
end subroutine NullEvol_Diag
File [modified]: NullEvol_Evol.F90
Delta lines: +0 -14
===================================================================
--- trunk/src/NullEvol_Evol.F90 2012-07-31 20:04:45 UTC (rev 10)
+++ trunk/src/NullEvol_Evol.F90 2012-08-01 17:45:05 UTC (rev 11)
@@ -348,14 +348,11 @@
CCTK_REAL :: r_0o, r_1o, A, x_0o, x_1o, x_1n, r_1n, r_wt, r_1h, x_1h, eta
CCTK_COMPLEX :: j_0o, j_1o, j_1n
- character(len=500) :: message
integer i1, i2, B
B = i-1
- ! write (message,*) "min. x_wt = ",minval(x_wt),"max. x_wt = ",maxval(x_wt),", xb(B+1) = ",xb(B+1),", dx = ",dx
- ! call CCTK_INFO(trim(message))
do i2 = 1, lsh(2)
do i1 = 1, lsh(1)
@@ -394,18 +391,7 @@
+ 0.5 * dt * (r_1n-r_wt) * (P_u(i1,i2)+h_c(i1,i2)) ) / r_1n
j_Bp1(i1,i2) = j_1n + (j_1n-j_wt(i1,i2)) * eta
-! if(abs(xb(B+1)-x_wt(i1,i2)).lt.min_dx) then
-! write(message,*)" this is it!: x_wt-xb=",xb(B+1)-x_wt(i1,i2),"x1n=",x_1n,"x_wt=",x_wt(i1,i2),"xBp1=",xb(B+1)
-! call CCTK_WARN(0,trim(message))
-! j_Bp1(i1,i2) = j_wt(i1,i2)
-! else
-! j_Bp1(i1,i2) = j_wt(i1,i2) + (xb(B+1)-x_wt(i1,i2)) * ( j_1n-j_wt(i1,i2) ) / ( x_1n-x_wt(i1,i2) )
-! end if
-
-! if(abs(xb(B+1)-x_wt(i1,i2)).lt.1.e-5*dx) then
-! j_Bp1(i1,i2) = j_wt(i1,i2)
-! end if
end do
end do
Directory: /trunk/
==================
File [modified]: interface.ccl
Delta lines: +5 -0
===================================================================
--- trunk/interface.ccl 2012-07-31 20:04:45 UTC (rev 10)
+++ trunk/interface.ccl 2012-08-01 17:45:05 UTC (rev 11)
@@ -5,6 +5,11 @@
inherits: NullInterp NullGrid NullVars Time
friend: NullSHRExtract
+CCTK_INT FUNCTION IO_TruncateOutputFiles \
+ (CCTK_POINTER_TO_CONST IN GH)
+
+USES FUNCTION IO_TruncateOutputFiles
+
cctk_complex distmp[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)) \
