From bd166008f85032b88ceee7796599f65a804a3a24 Mon Sep 17 00:00:00 2001 From: jthorn Date: Fri, 9 Jul 2004 17:17:08 +0000 Subject: remove all references to the variable 'rama' (Robertson-Walker R(T)) since the Robertson-Walker model doesn't work and is only in ../archive/, and the variable was being used uninitialized, causing valgrind to complain and obscuring other (real) errors... git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Exact/trunk@208 e296648e-0e4f-0410-bd07-d597d9acff87 --- src/Bona_Masso_data.F77 | 83 ++++++++++++++++++++++++++++++++----------------- src/boost.F77 | 11 +++---- src/metric.F77 | 13 +------- src/slice_data.F | 7 ++--- src/slice_evolve.F | 6 ++-- 5 files changed, 65 insertions(+), 55 deletions(-) (limited to 'src') diff --git a/src/Bona_Masso_data.F77 b/src/Bona_Masso_data.F77 index 8318c01..dfd62c1 100644 --- a/src/Bona_Masso_data.F77 +++ b/src/Bona_Masso_data.F77 @@ -88,7 +88,8 @@ C Get the spacetime metric and its inverse at the base point. $ gdtt, gdtx, gdty, gdtz, $ gxx, gyy, gzz, gxy, gyz, gxz, $ gutt, gutx, guty, gutz, - $ guxx, guyy, guzz, guxy, guyz, guxz, psi) + $ guxx, guyy, guzz, guxy, guyz, guxz, + $ psi) C Calculate lapse and shift from the upper metric. @@ -110,14 +111,16 @@ C Calculate x-derivatives. $ gdtt_p, gdtx_p, gdty_p, gdtz_p, $ gdxx_p, gdyy_p, gdzz_p, gdxy_p, gdyz_p, gdxz_p, $ gutt_p, gutx_p, guty_p, gutz_p, - $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, psix_p) + $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, + $ psix_p) call Exact__metric( $ decoded_exact_model, $ x-eps, y, z, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_m) dxgxx = (gdxx_p - gdxx_m) / 4.d0 / eps dxgyy = (gdyy_p - gdyy_m) / 4.d0 / eps @@ -141,14 +144,16 @@ C Calculate y-derivatives. $ gdtt_p, gdtx_p, gdty_p, gdtz_p, $ gdxx_p, gdyy_p, gdzz_p, gdxy_p, gdyz_p, gdxz_p, $ gutt_p, gutx_p, guty_p, gutz_p, - $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, psiy_p) + $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, + $ psiy_p) call Exact__metric( $ decoded_exact_model, $ x, y-eps, z, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiy_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiy_m) dygxx = (gdxx_p - gdxx_m) / 4.d0 / eps dygyy = (gdyy_p - gdyy_m) / 4.d0 / eps @@ -172,14 +177,16 @@ C Calculate z-derivatives. $ gdtt_p, gdtx_p, gdty_p, gdtz_p, $ gdxx_p, gdyy_p, gdzz_p, gdxy_p, gdyz_p, gdxz_p, $ gutt_p, gutx_p, guty_p, gutz_p, - $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, psiz_p) + $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, + $ psiz_p) call Exact__metric( $ decoded_exact_model, $ x, y, z-eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiz_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiz_m) dzgxx = (gdxx_p - gdxx_m) / 4.d0 / eps dzgyy = (gdyy_p - gdyy_m) / 4.d0 / eps @@ -203,14 +210,16 @@ C Calculate t-derivatives, and extrinsic curvature. $ gdtt_p, gdtx_p, gdty_p, gdtz_p, $ gdxx_p, gdyy_p, gdzz_p, gdxy_p, gdyz_p, gdxz_p, $ gutt_p, gutx_p, guty_p, gutz_p, - $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, psi) + $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, + $ psi) call Exact__metric( $ decoded_exact_model, $ x, y, z, t-eps, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psi) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psi) hxx = - (gdxx_p - gdxx_m) / 4.d0 / eps / alp $ + (dxgxx * betax + dygxx * betay + dzgxx * betaz @@ -247,126 +256,144 @@ C Calculate second derivatives of the conformal factor $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_px_p) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_px_p) call Exact__metric( $ decoded_exact_model, $ x, y+eps+eps, z, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiy_py_p) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiy_py_p) call Exact__metric( $ decoded_exact_model, $ x, y, z+eps+eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiz_pz_p) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiz_pz_p) call Exact__metric( $ decoded_exact_model, $ x-eps-eps, y, z, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_mx_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_mx_m) call Exact__metric( $ decoded_exact_model, $ x, y-eps-eps, z, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiy_my_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiy_my_m) call Exact__metric( $ decoded_exact_model, $ x, y, z-eps-eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiz_mz_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiz_mz_m) call Exact__metric( $ decoded_exact_model, $ x+eps, y+eps, z, t, $ gdtt_p, gdtx_p, gdty_p, gdtz_p, $ gdxx_p, gdyy_p, gdzz_p, gdxy_p, gdyz_p, gdxz_p, $ gutt_p, gutx_p, guty_p, gutz_p, - $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, psix_py_p) + $ guxx_p, guyy_p, guzz_p, guxy_p, guyz_p, guxz_p, + $ psix_py_p) call Exact__metric( $ decoded_exact_model, $ x+eps, y, z+eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_pz_p) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_pz_p) call Exact__metric( $ decoded_exact_model, $ x, y+eps, z+eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiy_pz_p) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiy_pz_p) call Exact__metric( $ decoded_exact_model, $ x-eps, y-eps, z, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_my_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_my_m) call Exact__metric( $ decoded_exact_model, $ x-eps, y, z-eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_mz_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_mz_m) call Exact__metric( $ decoded_exact_model, $ x, y-eps, z-eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiy_mz_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiy_mz_m) call Exact__metric( $ decoded_exact_model, $ x+eps, y-eps, z, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_py_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_py_m) call Exact__metric( $ decoded_exact_model, $ x+eps, y, z-eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_pz_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_pz_m) call Exact__metric( $ decoded_exact_model, $ x-eps, y+eps, z, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_my_p) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_my_p) call Exact__metric( $ decoded_exact_model, $ x-eps, y, z+eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psix_mz_p) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psix_mz_p) call Exact__metric( $ decoded_exact_model, $ x, y+eps, z-eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiy_pz_m) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiy_pz_m) call Exact__metric( $ decoded_exact_model, $ x, y-eps, z+eps, t, $ gdtt_m, gdtx_m, gdty_m, gdtz_m, $ gdxx_m, gdyy_m, gdzz_m, gdxy_m, gdyz_m, gdxz_m, $ gutt_m, gutx_m, guty_m, gutz_m, - $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, psiy_mz_p) + $ guxx_m, guyy_m, guzz_m, guxy_m, guyz_m, guxz_m, + $ psiy_mz_p) four_eps2 = 4.0d0 * eps**2 @@ -380,5 +407,3 @@ C Calculate second derivatives of the conformal factor end if return end - - diff --git a/src/boost.F77 b/src/boost.F77 index 4991d2a..d81b100 100644 --- a/src/boost.F77 +++ b/src/boost.F77 @@ -28,7 +28,7 @@ c $ gdxx, gdyy, gdzz, gdxy, gdyz, gdxz, $ gutt, gutx, guty, gutz, $ guxx, guyy, guzz, guxy, guyz, guxz, - $ psi, rama) + $ psi) implicit none DECLARE_CCTK_FUNCTIONS @@ -43,7 +43,7 @@ c output arguments $ gdxx, gdyy, gdzz, gdxy, gdyz, gdxz, $ gutt, gutx, guty, gutz, $ guxx, guyy, guzz, guxy, guyz, guxz, - $ psi, rama + $ psi c intrinsic functions called CCTK_REAL sqrt @@ -103,8 +103,8 @@ c $ gdxx, gdyy, gdzz, gdxy, gdyz, gdxz, $ gutt, gutx, guty, gutz, $ guxx, guyy, guzz, guxy, guyz, guxz, - $ psi, Tmunu_flag, - $ rama) + $ psi, + $ Tmunu_flag) return endif @@ -236,8 +236,7 @@ c $ Mguu(0,0), Mguu(0,1), Mguu(0,2), Mguu(0,3), $ Mguu(1,1), Mguu(2,2), Mguu(3,3), $ Mguu(1,2), Mguu(2,3), Mguu(1,3), - $ psi, Tmunu_flag, - $ rama) + $ psi, Tmunu_flag) if (Tmunu_flag) then write (warn_buffer, '(a,i8,a,a)') diff --git a/src/metric.F77 b/src/metric.F77 index 6f75d7a..1d83dec 100644 --- a/src/metric.F77 +++ b/src/metric.F77 @@ -17,7 +17,7 @@ C $Header$ $ gdxx, gdyy, gdzz, gdxy, gdyz, gdxz, $ gutt, gutx, guty, gutz, $ guxx, guyy, guzz, guxy, guyz, guxz, - $ psi, Tmunu_flag, rama) + $ psi, Tmunu_flag) implicit none DECLARE_CCTK_FUNCTIONS @@ -31,7 +31,6 @@ c arguments $ guxx, guyy, guzz, guxy, guyz, guxz CCTK_REAL psi LOGICAL Tmunu_flag - CCTK_REAL rama c local variables character*100 warn_buffer @@ -192,16 +191,6 @@ c $ guxx, guyy, guzz, guxy, guyz, guxz, $ psi, Tmunu_flag) -CC this metric doesnt work and has been moved to ../archive/ -CC elseif (decoded_exact_model .eq. EXACT__Robertson_Walker) then -CC call Exact__Robertson_Walker( -CC $ x, y, z, t, -CC $ gdtt, gdtx, gdty, gdtz, -CC $ gdxx, gdyy, gdzz, gdxy, gdyz, gdxz, -CC $ gutt, gutx, guty, gutz, -CC $ guxx, guyy, guzz, guxy, guyz, guxz, -CC $ psi, Tmunu_flag, rama) - elseif (decoded_exact_model .eq. EXACT__de_Sitter) then call Exact__de_Sitter( $ x, y, z, t, diff --git a/src/slice_data.F b/src/slice_data.F index 4000917..ccb80e0 100644 --- a/src/slice_data.F +++ b/src/slice_data.F @@ -70,11 +70,10 @@ C Now we need the exact solution metric in the preferred coordinates x^A. $ slicex(i,j,k), slicey(i,j,k), slicez(i,j,k), $ slicet(i,j,k), $ gd(4,4), gd(1,4), gd(2,4), gd(3,4), - $ gd(1,1), gd(2,2), gd(3,3), - $ gd(1,2), gd(2,3), gd(1,3), + $ gd(1,1), gd(2,2), gd(3,3), gd(1,2), gd(2,3), gd(1,3), $ gu(4,4), gu(1,4), gu(2,4), gu(3,4), - $ gu(1,1), gu(2,2), gu(3,3), - $ gu(1,2), gu(2,3), gu(1,3), exact_psi) + $ gu(1,1), gu(2,2), gu(3,3), gu(1,2), gu(2,3), gu(1,3), + $ exact_psi) C Calculate n^A and dx^A/dt diff --git a/src/slice_evolve.F b/src/slice_evolve.F index e17ceba..f20481a 100644 --- a/src/slice_evolve.F +++ b/src/slice_evolve.F @@ -88,11 +88,9 @@ C x^A. $ slicetmp1x(i,j,k), slicetmp1y(i,j,k), slicetmp1z(i,j,k), $ slicetmp1t(i,j,k), $ gd(4,4), gd(1,4), gd(2,4), gd(3,4), - $ gd(1,1), gd(2,2), gd(3,3), - $ gd(1,2), gd(2,3), gd(1,3), + $ gd(1,1), gd(2,2), gd(3,3), gd(1,2), gd(2,3), gd(1,3), $ gu(4,4), gu(1,4), gu(2,4), gu(3,4), - $ gu(1,1), gu(2,2), gu(3,3), - $ gu(1,2), gu(2,3), gu(1,3), + $ gu(1,1), gu(2,2), gu(3,3), gu(1,2), gu(2,3), gu(1,3), $ local_psi) C Calculate n^A and dx^A/dt -- cgit v1.2.3