[Commits] [svn:einsteintoolkit] NullEvolve/branches/tapir/src/ (Rev. 23)

[bela at caltech.edu]

User: szilagyi
Date: 2014/01/07 04:34 PM

Modified:
 /branches/tapir/src/
  NullEvol_Diag.F90

Log:
 work on diagnostics code

File Changes:

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

File [modified]: NullEvol_Diag.F90
Delta lines: +11 -6
===================================================================
--- branches/tapir/src/NullEvol_Diag.F90	2014-01-03 08:14:54 UTC (rev 22)
+++ branches/tapir/src/NullEvol_Diag.F90	2014-01-07 22:34:53 UTC (rev 23)
@@ -26,17 +26,22 @@
   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, tmpn, tmps, 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
 
-    tmpn = (jcn-jcn_p)/cctk_delta_time
-    tmps = (jcs-jcs_p)/cctk_delta_time
+    tmpn = (jcn-jcn_p)/(null_time-null_time_p)
+    tmps = (jcs-jcs_p)/(null_time-null_time_p)
 
-    call NullEvol_DiagImArray(cctkGH, 'dtJ_ev', truncate, 2, &
-      tmpn, tmps, diagtmp, null_xb, cctk_time-0.5*cctk_delta_time)
+    call NullEvol_DiagImArray(cctkGH, 'Ju_ev', truncate, 2, &
+      tmpn, tmps, diagtmp, null_xb, 0.5*(null_time+null_time_p))
 
+    tmpn = (ucn-ucn_p)/cctk_delta_time
+    tmps = (ucs-ucs_p)/cctk_delta_time
+
+    call NullEvol_DiagImArray(cctkGH, 'Uu_ev', truncate, 1, &
+      tmpn, tmps, diagtmp, null_xbh, 0.5*(null_time+null_time_p))
+
     tmpn = 1.e16
     tmps = 1.e16