[svn:einsteintoolkit] NullSHRExtract/branches/tapir/src/ (Rev. 33) - Commits

15 Nov 2013

User: szilagyi
Date: 2013/11/15 04:46 PM
Modified:
 /branches/tapir/src/
  NullSHRE_WTSphHarm.F90
Log:
 add output for time-deriv of lapse,shift
File Changes:
Directory: /branches/tapir/src/
===============================
File [modified]: NullSHRE_WTSphHarm.F90
Delta lines: +66 -46
===================================================================

--- branches/tapir/src/NullSHRE_WTSphHarm.F90	2013-11-15 20:09:38 UTC (rev 32)
+++ branches/tapir/src/NullSHRE_WTSphHarm.F90	2013-11-15 22:46:10 UTC (rev 33)
@@ -85,12 +85,13 @@
   type (gf2d), dimension(2) :: angular_tensor_1_n, angular_tensor_1_s
logical, parameter :: output_gij = .false.
-  logical, parameter :: output_lapse = .false.
-  logical, parameter :: output_shift = .false.
+  logical, parameter :: output_lapse = .true.
+  logical, parameter :: output_shift = .true.
   logical, parameter :: output_dgij = .false.
-  logical, parameter :: output_ell = .true.
+  logical, parameter :: output_ell = .false.
   logical, parameter :: output_w0parts = .false.
   logical, parameter :: output_u1parts = .false.
+  logical, parameter :: output_bondi = .false.
CCTK_INT :: a, b
   angular_tensor_1_n(1)%d => tmp1(:,:,1)
@@ -140,6 +141,16 @@
      call NullDecomp_WriteCoefsForRealFunc('shiftU_z_wt', cctkGH, truncate, &
           null_lsh, zeta, beta_n(3)%d, beta_s(3)%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('dshiftU_x_dt_wt', cctkGH, truncate, &
+          null_lsh, zeta, dbeta_n(1,4)%d, dbeta_s(1,4)%d, cctk_time)
+
+     call NullDecomp_WriteCoefsForRealFunc('dshiftU_y_dt_wt', cctkGH, truncate, &
+          null_lsh, zeta, dbeta_n(2,4)%d, dbeta_s(2,4)%d, cctk_time)
+
+     call NullDecomp_WriteCoefsForRealFunc('dshiftU_z_dt_wt', cctkGH, truncate, &
+          null_lsh, zeta, dbeta_n(3,4)%d, dbeta_s(3,4)%d, cctk_time)
+
+
   end if
if(output_lapse) then
@@ -149,6 +160,9 @@
      call NullDecomp_WriteCoefsForRealFunc('alpha_wt', cctkGH, truncate, &
           null_lsh, zeta, alpha_n%d, alpha_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('dalpha_dt_wt', cctkGH, truncate, &
+          null_lsh, zeta, dalpha_n(4)%d, dalpha_s(4)%d, cctk_time)
+
   end if
if(output_dgij) then
@@ -490,68 +504,74 @@
end if
-  ! xb, rb, r_l, r_t
-  call NullDecomp_WriteCoefsForRealFunc('X_wt', cctkGH, truncate, &
-       null_lsh, zeta, x_wt_n%d, x_wt_s%d, cctk_time)
+  if(output_bondi) then
-  call NullDecomp_WriteCoefsForRealFunc('r0_wt', cctkGH, truncate, &
-       null_lsh, zeta, r0_n%d, r0_s%d, cctk_time)
+     ! xb, rb, r_l, r_t
+     call NullDecomp_WriteCoefsForRealFunc('X_wt', cctkGH, truncate, &
+          null_lsh, zeta, x_wt_n%d, x_wt_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('r_l_wt', cctkGH, truncate, &
-       null_lsh, zeta, dr0_n(1)%d, dr0_s(1)%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('r0_wt', cctkGH, truncate, &
+          null_lsh, zeta, r0_n%d, r0_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('r_t_wt', cctkGH, truncate, &
-       null_lsh, zeta, dr0_n(4)%d, dr0_s(4)%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('r_l_wt', cctkGH, truncate, &
+          null_lsh, zeta, dr0_n(1)%d, dr0_s(1)%d, cctk_time)
-  call NullSHRE_ConvertAngOneForm(ip_n, dr0_n(2:3), angular_tensor_1_n)
-  call NullSHRE_ConvertAngOneForm(ip_s, dr0_s(2:3), angular_tensor_1_s)
+     call NullDecomp_WriteCoefsForRealFunc('r_t_wt', cctkGH, truncate, &
+          null_lsh, zeta, dr0_n(4)%d, dr0_s(4)%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('r_theta_wt', cctkGH, truncate, &
-       null_lsh, zeta, angular_tensor_1_n(1)%d, angular_tensor_1_s(1)%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('r_phi_wt', cctkGH, truncate, &
-       null_lsh, zeta, angular_tensor_1_n(2)%d, angular_tensor_1_s(2)%d, cctk_time)
+     call NullSHRE_ConvertAngOneForm(ip_n, dr0_n(2:3), angular_tensor_1_n)
+     call NullSHRE_ConvertAngOneForm(ip_s, dr0_s(2:3), angular_tensor_1_s)
-  call NullDecomp_WriteCoefsForRealFunc('AffineInvMetric_lambda_lambda', cctkGH, truncate, &
-       null_lsh, zeta, etaup0_n(1,1)%d, etaup0_s(1,1)%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('r_theta_wt', cctkGH, truncate, &
+          null_lsh, zeta, angular_tensor_1_n(1)%d, angular_tensor_1_s(1)%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('r_phi_wt', cctkGH, truncate, &
+          null_lsh, zeta, angular_tensor_1_n(2)%d, angular_tensor_1_s(2)%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('AffineInvMetric_lambda_u', cctkGH, truncate, &
-       null_lsh, zeta, etaup0_n(1,4)%d, etaup0_s(1,4)%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc(&
+          'AffineInvMetric_lambda_lambda', cctkGH, truncate, &
+          null_lsh, zeta, etaup0_n(1,1)%d, etaup0_s(1,1)%d, cctk_time)
-  call NullDecomp_WriteCoefsForComplexFunc(&
-       'AffineInvMetric_rA_qA', cctkGH, truncate, null_lsh, 1, zeta, &
-       etaup0_n(1,2)%d*qa(2)%d + etaup0_n(1,3)%d*qa(3)%d,&
-       etaup0_s(1,2)%d*qa(2)%d + etaup0_s(1,3)%d*qa(3)%d,&
-       cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc(&
+          'AffineInvMetric_lambda_u', cctkGH, truncate, &
+          null_lsh, zeta, etaup0_n(1,4)%d, etaup0_s(1,4)%d, cctk_time)
-  ! J, beta, U, Q, W
+     call NullDecomp_WriteCoefsForComplexFunc(&
+          'AffineInvMetric_rA_qA', cctkGH, truncate, null_lsh, 1, zeta, &
+          etaup0_n(1,2)%d*qa(2)%d + etaup0_n(1,3)%d*qa(3)%d,&
+          etaup0_s(1,2)%d*qa(2)%d + etaup0_s(1,3)%d*qa(3)%d,&
+          cctk_time)
-  call NullDecomp_WriteCoefsForComplexFunc('J_wt', cctkGH, truncate, &
-       null_lsh, 2, zeta, j_wt_n%d, j_wt_s%d, cctk_time)
+     ! J, beta, U, Q, W
-  call NullDecomp_WriteCoefsForComplexFunc('Jl_wt', cctkGH, truncate, &
-       null_lsh, 2, zeta, j_l_n%d, j_l_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForComplexFunc('J_wt', cctkGH, truncate, &
+          null_lsh, 2, zeta, j_wt_n%d, j_wt_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForComplexFunc('Q_wt', cctkGH, truncate, &
-       null_lsh, 1, zeta, q_wt_n%d, q_wt_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForComplexFunc('Jl_wt', cctkGH, truncate, &
+          null_lsh, 2, zeta, j_l_n%d, j_l_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForComplexFunc('U_wt', cctkGH, truncate, &
-       null_lsh, 1, zeta, u_wt_n%d, u_wt_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForComplexFunc('Q_wt', cctkGH, truncate, &
+          null_lsh, 1, zeta, q_wt_n%d, q_wt_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForComplexFunc('Ul_wt', cctkGH, truncate, &
-       null_lsh, 1, zeta, u_l_n%d, u_l_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForComplexFunc('U_wt', cctkGH, truncate, &
+          null_lsh, 1, zeta, u_wt_n%d, u_wt_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('B_wt', cctkGH, truncate, &
-       null_lsh, zeta, beta_wt_n%d, beta_wt_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForComplexFunc('Ul_wt', cctkGH, truncate, &
+          null_lsh, 1, zeta, u_l_n%d, u_l_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('Bl_wt', cctkGH, truncate, &
-       null_lsh, zeta, beta_l_n%d, beta_l_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('B_wt', cctkGH, truncate, &
+          null_lsh, zeta, beta_wt_n%d, beta_wt_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('W_wt', cctkGH, truncate, &
-       null_lsh, zeta, w_wt_n%d, w_wt_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('Bl_wt', cctkGH, truncate, &
+          null_lsh, zeta, beta_l_n%d, beta_l_s%d, cctk_time)
-  call NullDecomp_WriteCoefsForRealFunc('Wl_wt', cctkGH, truncate, &
-       null_lsh, zeta, w_l_n%d, w_l_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('W_wt', cctkGH, truncate, &
+          null_lsh, zeta, w_wt_n%d, w_wt_s%d, cctk_time)
+     call NullDecomp_WriteCoefsForRealFunc('Wl_wt', cctkGH, truncate, &
+          null_lsh, zeta, w_l_n%d, w_l_s%d, cctk_time)
+
+  end if
+
   ! bits of W
if(output_w0parts) then

    