[svn:einsteintoolkit] NullEvolve/branches/tapir/ (Rev. 21) - Commits

3 Jan 2014

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"

    