Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] www/release-info/ (Rev. 614)
by knarf＠cct.lsu.edu 26 Sep '11

26 Sep '11

User: knarf Date: 2011/09/26 02:10 PM Modified: /release-info/ parse_testsuite_results.cgi Log: fix html File Changes: Directory: /release-info/ ========================= File [modified]: parse_testsuite_results.cgi Delta lines: +2 -2 =================================================================== --- release-info/parse_testsuite_results.cgi 2011-09-26 19:09:58 UTC (rev 613) +++ release-info/parse_testsuite_results.cgi 2011-09-26 19:10:44 UTC (rev 614) @@ -320,8 +320,8 @@ } </style> CSS -print "Show information of <a href=\"ET_2011_05/parse_testsuite_results.php". - (defined($ignore)?"?show_all=1":"")."'>ET_2011_05 results.\n"; +print "Show information of <a href='ET_2011_05/parse_testsuite_results.php". + (defined($ignore)?"?show_all=1":"")."'>ET_2011_05 results.</a>\n"; print "<a href='parse_testsuite_results.php". (defined($ignore)?"?show_all=1'>Show all":"'>Hide some"). "</a> information.\n";

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 613)
by knarf＠cct.lsu.edu 26 Sep '11

26 Sep '11

User: knarf Date: 2011/09/26 02:09 PM Modified: /release-info/ parse_testsuite_results.cgi Log: link old results File Changes: Directory: /release-info/ ========================= File [modified]: parse_testsuite_results.cgi Delta lines: +2 -0 =================================================================== --- release-info/parse_testsuite_results.cgi 2011-09-26 19:06:16 UTC (rev 612) +++ release-info/parse_testsuite_results.cgi 2011-09-26 19:09:58 UTC (rev 613) @@ -320,6 +320,8 @@ } </style> CSS +print "Show information of <a href=\"ET_2011_05/parse_testsuite_results.php". + (defined($ignore)?"?show_all=1":"")."'>ET_2011_05 results.\n"; print "<a href='parse_testsuite_results.php". (defined($ignore)?"?show_all=1'>Show all":"'>Hide some"). "</a> information.\n";

1 0

[svn:einsteintoolkit] www/release-info/ET_2011_05/ (Rev. 612)
by knarf＠cct.lsu.edu 26 Sep '11

26 Sep '11

User: knarf Date: 2011/09/26 02:06 PM Modified: /release-info/ET_2011_05/ parse_testsuite_results.php Log: include branch in title File Changes: Directory: /release-info/ET_2011_05/ ==================================== File [modified]: parse_testsuite_results.php Delta lines: +1 -1 =================================================================== --- release-info/ET_2011_05/parse_testsuite_results.php 2011-09-26 19:05:21 UTC (rev 611) +++ release-info/ET_2011_05/parse_testsuite_results.php 2011-09-26 19:06:16 UTC (rev 612) @@ -1,4 +1,4 @@ -<?php $title='Testsuite status of einsteintoolkit.th'; +<?php $title='Testsuite status of ET_2011_05 einsteintoolkit.th'; $hide_path=1; include_once($_SERVER['DOCUMENT_ROOT'].'/global/header.php');

1 0

[svn:einsteintoolkit] www/release-info/ET_2011_05/ (Rev. 611)
by knarf＠cct.lsu.edu 26 Sep '11

26 Sep '11

User: knarf Date: 2011/09/26 02:05 PM Added: /release-info/ET_2011_05/ abe__1.log, abe__2.log, amarok-intel__1_1.log, amarok-intel__2_1.log, amarok-intel__2_2.log, amarok__1.log, amarok__2.log, bluedrop__1.log, bluedrop__1_1.log, bluedrop__2.log, bluedrop__2_1.log, bluedrop__2_2.log, datura__1_1.log, datura__2_1.log, datura__2_2.log, hopper__1_1.log, hopper__2_2.log, kraken__1.log, kraken__1_1.log, kraken__2.log, kraken__2_1.log, kraken__2_2.log, lonestar-intel__1_1.log, lonestar-intel__2_1.log, lonestar-intel__2_2.log, minkowski-gcc45__1_1.log, minkowski-gcc45__2_1.log, minkowski-gcc45__2_2.log, minkowski__1.log, minkowski__2.log, numrel-gcc__1.log, numrel-gcc__1_1.log, numrel-gcc__2.log, numrel-gcc__2_1.log, numrel-gcc__2_2.log, numrel-intel__1_1.log, numrel-intel__2_1.log, numrel-intel__2_2.log, numrel__1.log, numrel__2.log, pandora-xl__1_1.log, pandora-xl__2_1.log, pandora-xl__2_2.log, parse_testsuite_results.cgi, parse_testsuite_results.php, philip-intel__1_1.log, philip-intel__2_1.log, philip-intel__2_2.log, philip__1.log, philip__2.log, queenbee-intel__1_1.log, queenbee-intel__2_1.log, queenbee-intel__2_2.log, queenbee__1.log, queenbee__2.log, ranger-intel__1_1.log, ranger-intel__2_1.log, ranger-intel__2_2.log, ranger__1.log, ranger__2.log, redshift__1_1.log, redshift__2_2.log, topf-gcc__1_1.log, topf-gcc__2_1.log, topf-gcc__2_2.log, topf__1.log, topf__2.log Log: backup ET_2011_05 results File Changes: Directory: /release-info/ET_2011_05/ ==================================== File [added]: abe__1.log Delta lines: <Unavailable> File [added]: abe__2.log Delta lines: <Unavailable> File [added]: amarok-intel__1_1.log Delta lines: <Unavailable> File [added]: amarok-intel__2_1.log Delta lines: <Unavailable> File [added]: amarok-intel__2_2.log Delta lines: <Unavailable> File [added]: amarok__1.log Delta lines: <Unavailable> File [added]: amarok__2.log Delta lines: <Unavailable> File [added]: bluedrop__1.log Delta lines: <Unavailable> File [added]: bluedrop__1_1.log Delta lines: <Unavailable> File [added]: bluedrop__2.log Delta lines: <Unavailable> File [added]: bluedrop__2_1.log Delta lines: <Unavailable> File [added]: bluedrop__2_2.log Delta lines: <Unavailable> File [added]: datura__1_1.log Delta lines: <Unavailable> File [added]: datura__2_1.log Delta lines: <Unavailable> File [added]: datura__2_2.log Delta lines: <Unavailable> File [added]: hopper__1_1.log Delta lines: <Unavailable> File [added]: hopper__2_2.log Delta lines: <Unavailable> File [added]: kraken__1.log Delta lines: <Unavailable> File [added]: kraken__1_1.log Delta lines: <Unavailable> File [added]: kraken__2.log Delta lines: <Unavailable> File [added]: kraken__2_1.log Delta lines: <Unavailable> File [added]: kraken__2_2.log Delta lines: <Unavailable> File [added]: lonestar-intel__1_1.log Delta lines: <Unavailable> File [added]: lonestar-intel__2_1.log Delta lines: <Unavailable> File [added]: lonestar-intel__2_2.log Delta lines: <Unavailable> File [added]: minkowski-gcc45__1_1.log Delta lines: <Unavailable> File [added]: minkowski-gcc45__2_1.log Delta lines: <Unavailable> File [added]: minkowski-gcc45__2_2.log Delta lines: <Unavailable> File [added]: minkowski__1.log Delta lines: <Unavailable> File [added]: minkowski__2.log Delta lines: <Unavailable> File [added]: numrel-gcc__1.log Delta lines: <Unavailable> File [added]: numrel-gcc__1_1.log Delta lines: <Unavailable> File [added]: numrel-gcc__2.log Delta lines: <Unavailable> File [added]: numrel-gcc__2_1.log Delta lines: <Unavailable> File [added]: numrel-gcc__2_2.log Delta lines: <Unavailable> File [added]: numrel-intel__1_1.log Delta lines: <Unavailable> File [added]: numrel-intel__2_1.log Delta lines: <Unavailable> File [added]: numrel-intel__2_2.log Delta lines: <Unavailable> File [added]: numrel__1.log Delta lines: <Unavailable> File [added]: numrel__2.log Delta lines: <Unavailable> File [added]: pandora-xl__1_1.log Delta lines: <Unavailable> File [added]: pandora-xl__2_1.log Delta lines: <Unavailable> File [added]: pandora-xl__2_2.log Delta lines: <Unavailable> File [added]: parse_testsuite_results.cgi Delta lines: <Unavailable> File [added]: parse_testsuite_results.php Delta lines: <Unavailable> File [added]: philip-intel__1_1.log Delta lines: <Unavailable> File [added]: philip-intel__2_1.log Delta lines: <Unavailable> File [added]: philip-intel__2_2.log Delta lines: <Unavailable> File [added]: philip__1.log Delta lines: <Unavailable> File [added]: philip__2.log Delta lines: <Unavailable> File [added]: queenbee-intel__1_1.log Delta lines: <Unavailable> File [added]: queenbee-intel__2_1.log Delta lines: <Unavailable> File [added]: queenbee-intel__2_2.log Delta lines: <Unavailable> File [added]: queenbee__1.log Delta lines: <Unavailable> File [added]: queenbee__2.log Delta lines: <Unavailable> File [added]: ranger-intel__1_1.log Delta lines: <Unavailable> File [added]: ranger-intel__2_1.log Delta lines: <Unavailable> File [added]: ranger-intel__2_2.log Delta lines: <Unavailable> File [added]: ranger__1.log Delta lines: <Unavailable> File [added]: ranger__2.log Delta lines: <Unavailable> File [added]: redshift__1_1.log Delta lines: <Unavailable> File [added]: redshift__2_2.log Delta lines: <Unavailable> File [added]: topf-gcc__1_1.log Delta lines: <Unavailable> File [added]: topf-gcc__2_1.log Delta lines: <Unavailable> File [added]: topf-gcc__2_2.log Delta lines: <Unavailable> File [added]: topf__1.log Delta lines: <Unavailable> File [added]: topf__2.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 280)
by bcmsma＠astro.rit.edu 26 Sep '11

26 Sep '11

User: bmundim Date: 2011/09/26 10:50 AM Modified: /trunk/src/ GRHydro_SourceM.F90 Log: RIT dev: fix source term in divergence cleaning. Thanks Tanja for catching this up too. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_SourceM.F90 Delta lines: +10 -13 =================================================================== --- trunk/src/GRHydro_SourceM.F90 2011-09-25 22:59:03 UTC (rev 279) +++ trunk/src/GRHydro_SourceM.F90 2011-09-26 15:50:04 UTC (rev 280) @@ -457,27 +457,24 @@ bvcx_source = -1.d0 * ( Bconsx(i,j,k)*dx_betax + & Bconsy(i,j,k)*dy_betax + Bconsz(i,j,k)*dz_betax ) + & - psidc(i,j,k)*sqrtdet*( uxx*dx_alp+uxy*dy_alp+uxz*dz_alp ) + & - psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxx*dx_det_bydet + & - uxy*dy_det_bydet + uxz*dz_det_bydet ) - & - psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxx*gdg_x + uxy*gdg_y + & - uxz*gdg_z ) + psidc(i,j,k)*sqrtdet*(( uxx*dx_alp+uxy*dy_alp+uxz*dz_alp ) + & + alp(i,j,k)*(0.5d0*( uxx*dx_det_bydet + & + uxy*dy_det_bydet + uxz*dz_det_bydet) - & + ( uxx*gdg_x + uxy*gdg_y + uxz*gdg_z ))) bvcy_source = -1.d0 * ( Bconsx(i,j,k)*dx_betay + & Bconsy(i,j,k)*dy_betay + Bconsz(i,j,k)*dz_betay ) + & - psidc(i,j,k)*sqrtdet*( uxy*dx_alp+uyy*dy_alp+uyz*dz_alp ) + & - psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxy*dx_det_bydet + & + psidc(i,j,k)*sqrtdet*(( uxy*dx_alp+uyy*dy_alp+uyz*dz_alp ) + & + alp(i,j,k)*(0.5d0*( uxy*dx_det_bydet + & uyy*dy_det_bydet + uyz*dz_det_bydet ) - & - psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxy*gdg_x + uyy*gdg_y + & - uyz*gdg_z ) + ( uxy*gdg_x + uyy*gdg_y + uyz*gdg_z ))) bvcz_source = -1.d0 * ( Bconsx(i,j,k)*dx_betaz + & Bconsy(i,j,k)*dy_betaz + Bconsz(i,j,k)*dz_betaz ) + & - psidc(i,j,k)*sqrtdet*( uxz*dx_alp+uyz*dy_alp+uzz*dz_alp ) + & - psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxz*dx_det_bydet + & + psidc(i,j,k)*sqrtdet*(( uxz*dx_alp+uyz*dy_alp+uzz*dz_alp ) + & + alp(i,j,k)*(0.5d0*( uxz*dx_det_bydet + & uyz*dy_det_bydet + uzz*dz_det_bydet ) - & - psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxz*gdg_x + uyz*gdg_y + & - uzz*gdg_z ) + ( uxz*gdg_x + uyz*gdg_y + uzz*gdg_z ))) Bconsrhsx(i,j,k) = bvcx_source Bconsrhsy(i,j,k) = bvcy_source

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 279)
by roland.haas＠physics.gatech.edu 25 Sep '11

25 Sep '11

User: rhaas Date: 2011/09/25 05:59 PM Modified: /trunk/src/ GRHydro_EoSChangeGamma.F90 Log: fix typo in multipatch version of EoSChangeGamma File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_EoSChangeGamma.F90 2011-09-25 22:38:36 UTC (rev 278) +++ trunk/src/GRHydro_EoSChangeGamma.F90 2011-09-25 22:59:03 UTC (rev 279) @@ -82,7 +82,7 @@ g13 => gac g22 => gbb g23 => gbc - g33 => g33 + g33 => gcc vup => lvel else g11 => gxx

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 278)
by roland.haas＠physics.gatech.edu 25 Sep '11

25 Sep '11

User: rhaas Date: 2011/09/25 05:38 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_ENOReconstruct_drv.F90, GRHydro_EoSChangeGamma.F90, GRHydro_HLLE.F90, GRHydro_PPMMReconstruct_drv.F90, GRHydro_PPMReconstruct_drv.F90, GRHydro_Prim2Con.F90, GRHydro_Source.F90, GRHydro_TVDReconstruct_drv.F90, GRHydro_UpdateMask.F90 Log: move TARGET statements in front of CCTK_DECLARE_ARGUMENTS this is need for gfortran 4.1 which otherwise assumes that the arrays have already been used (in the kind(gaa) initializations inside of CCTK_DECLARE_ARGUMENTS). File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +31 -13 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_Con2Prim.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -46,6 +46,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -63,9 +69,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup @@ -1022,6 +1025,11 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -1040,8 +1048,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 ! begin EOS Omni vars @@ -1260,6 +1266,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -1274,9 +1286,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup @@ -1649,6 +1658,11 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -1663,8 +1677,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then @@ -1768,6 +1780,11 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -1779,8 +1796,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then @@ -1961,6 +1976,10 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET lvel, vel + DECLARE_CCTK_PARAMETERS DECLARE_CCTK_ARGUMENTS @@ -1969,7 +1988,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then File [modified]: GRHydro_ENOReconstruct_drv.F90 Delta lines: +5 -2 =================================================================== --- trunk/src/GRHydro_ENOReconstruct_drv.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_ENOReconstruct_drv.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -47,6 +47,11 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET vel, lvel + TARGET Bvec, lBvec + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS @@ -66,8 +71,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET vel, lvel - TARGET Bvec, lBvec CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup, Bprim if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: +12 -6 =================================================================== --- trunk/src/GRHydro_EoSChangeGamma.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_EoSChangeGamma.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -43,6 +43,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -53,9 +59,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup @@ -228,6 +231,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -242,9 +251,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup File [modified]: GRHydro_HLLE.F90 Delta lines: +14 -8 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_HLLE.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -36,6 +36,13 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET betaa, betab, betac + TARGET betax, betay, betaz + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -52,10 +59,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET betaa, betab, betac - TARGET betax, betay, betaz CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3 @@ -445,6 +448,13 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET betaa, betab, betac + TARGET betax, betay, betaz + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -460,10 +470,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET betaa, betab, betac - TARGET betax, betay, betaz CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3 File [modified]: GRHydro_PPMMReconstruct_drv.F90 Delta lines: +9 -6 =================================================================== --- trunk/src/GRHydro_PPMMReconstruct_drv.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_PPMMReconstruct_drv.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -47,6 +47,15 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET betaa, betab, betac + TARGET betax, betay, betaz + TARGET lvel, vel + TARGET lBvec, Bvec + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS @@ -66,12 +75,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET betaa, betab, betac - TARGET betax, betay, betaz - TARGET lvel, vel - TARGET lBvec, Bvec CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup, Bprim File [modified]: GRHydro_PPMReconstruct_drv.F90 Delta lines: +8 -5 =================================================================== --- trunk/src/GRHydro_PPMReconstruct_drv.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_PPMReconstruct_drv.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -41,6 +41,14 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET betaa, betab, betac + TARGET betax, betay, betaz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS @@ -57,11 +65,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET betaa, betab, betac - TARGET betax, betay, betaz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup File [modified]: GRHydro_Prim2Con.F90 Delta lines: +29 -14 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_Prim2Con.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -40,6 +40,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -50,9 +56,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup @@ -366,6 +369,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -375,9 +384,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup @@ -477,6 +483,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -486,9 +498,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup @@ -653,6 +662,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -661,9 +676,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup @@ -737,6 +749,11 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -746,8 +763,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then File [modified]: GRHydro_Source.F90 Delta lines: +10 -7 =================================================================== --- trunk/src/GRHydro_Source.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_Source.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -49,6 +49,16 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET kaa, kab, kac, kbb, kbc, kcc + TARGET kxx, kxy, kxz, kyy, kyz, kzz + TARGET betaa, betab, betac + TARGET betax, betay, betaz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -78,13 +88,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET kaa, kab, kac, kbb, kbc, kcc - TARGET kxx, kxy, kxz, kyy, kyz, kzz - TARGET betaa, betab, betac - TARGET betax, betay, betaz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:), POINTER :: k11, k12, k13, k22, k23, k33 CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3 File [modified]: GRHydro_TVDReconstruct_drv.F90 Delta lines: +5 -2 =================================================================== --- trunk/src/GRHydro_TVDReconstruct_drv.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_TVDReconstruct_drv.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -48,6 +48,11 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET vel, lvel + TARGET Bvec, lBvec + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS @@ -64,8 +69,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET vel, lvel - TARGET Bvec, lBvec CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup, Bprim if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then File [modified]: GRHydro_UpdateMask.F90 Delta lines: +18 -12 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2011-09-19 23:16:38 UTC (rev 277) +++ trunk/src/GRHydro_UpdateMask.F90 2011-09-25 22:38:36 UTC (rev 278) @@ -213,6 +213,12 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -223,9 +229,6 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup @@ -322,6 +325,18 @@ implicit none + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + TARGET gaa_p, gab_p, gac_p, gbb_p, gbc_p, gcc_p + TARGET gxx_p, gxy_p, gxz_p, gyy_p, gyz_p, gzz_p + TARGET lvel_p, vel_p + TARGET gaa_p_p, gab_p_p, gac_p_p, gbb_p_p, gbc_p_p, gcc_p_p + TARGET gxx_p_p, gxy_p_p, gxz_p_p, gyy_p_p, gyz_p_p, gzz_p_p + TARGET lvel_p_p, vel_p_p + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -335,21 +350,12 @@ ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates - TARGET gaa, gab, gac, gbb, gbc, gcc - TARGET gxx, gxy, gxz, gyy, gyz, gzz - TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup - TARGET gaa_p, gab_p, gac_p, gbb_p, gbc_p, gcc_p - TARGET gxx_p, gxy_p, gxz_p, gyy_p, gyz_p, gzz_p - TARGET lvel_p, vel_p CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11_p => Null(), g12_p => Null(), & g13_p => Null(), g22_p => Null(), & g23_p => Null(), g33_p => Null() CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup_p => Null() - TARGET gaa_p_p, gab_p_p, gac_p_p, gbb_p_p, gbc_p_p, gcc_p_p - TARGET gxx_p_p, gxy_p_p, gxz_p_p, gyy_p_p, gyz_p_p, gzz_p_p - TARGET lvel_p_p, vel_p_p CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11_p_p => Null(), g12_p_p => Null(), & g13_p_p => Null(), g22_p_p => Null(), & g23_p_p => Null(), g33_p_p => Null()

1 0

[svn:einsteintoolkit] TwoPunctures/trunk/ (Rev. 124)
by ian.hinder＠aei.mpg.de 25 Sep '11

25 Sep '11

User: hinder Date: 2011/09/25 04:43 PM Added: /trunk/src/ Metadata.cc Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ TwoPunctures.c, make.code.defn Log: Add output of metadata file TwoPunctures.bbh The format and keys are defined in http://arxiv.org/abs/0709.0093 with additional draft keys defined for the NR-AR project (to be committed to the arXiv version when finalized). Also introduced grid scalars for the ADM energy and angular momentum and the puncture ADM masses. File Changes: Directory: /trunk/src/ ====================== File [added]: Metadata.cc Delta lines: +64 -0 =================================================================== --- trunk/src/Metadata.cc (rev 0) +++ trunk/src/Metadata.cc 2011-09-25 21:43:44 UTC (rev 124) @@ -0,0 +1,64 @@ + +#include <iostream> +#include <fstream> +#include <iomanip> + +#include "cctk.h" +#include "cctk_Arguments.h" +#include "cctk_Parameters.h" + +using namespace std; + +extern "C" +void TwoPunctures_Metadata (CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + + if (CCTK_MyProc(cctkGH) == 0) + { + ofstream o; + o.open(string(string(out_dir) + "/TwoPunctures.bbh").c_str()); + + o << setprecision(19); + + o << "\ +# ==================================\n\ +# Numerical Relativity Metadata file\n\ +# ==================================\n\ +#\n\ +# This file contains information about the simulation provided by the\n\ +# TwoPunctures thorn. The format is described in the NR Data Format Document\n\ +# http://arxiv.org/abs/0709.0093 [draft SVN r707].\n\ +" << endl; + + o << "[metadata]" << endl; + o << "initial-ADM-energy = " << *E << endl; + o << "initial-ADM-angular-momentumx = " << *J1 << endl; + o << "initial-ADM-angular-momentumy = " << *J2 << endl; + o << "initial-ADM-angular-momentumz = " << *J3 << endl; + o << "initial-separation = " << par_b * 2 << endl; + o << "initial-data-type = Bowen-York" << endl; + o << "initial-data-bibtex-keys = Bowen:1980yu Brandt:1997tf Ansorg:2004ds" << endl; + o << "initial-bh-position1x = " << par_b + center_offset[0] << endl; + o << "initial-bh-position1y = " << center_offset[1] << endl; + o << "initial-bh-position1z = " << center_offset[2] << endl; + o << "initial-bh-position2x = " << -par_b + center_offset[0] << endl; + o << "initial-bh-position2y = " << center_offset[1] << endl; + o << "initial-bh-position2z = " << center_offset[2] << endl; + o << "initial-bh-momentum1x = " << par_P_plus[0] << endl; + o << "initial-bh-momentum1y = " << par_P_plus[1] << endl; + o << "initial-bh-momentum1z = " << par_P_plus[2] << endl; + o << "initial-bh-momentum2x = " << par_P_minus[0] << endl; + o << "initial-bh-momentum2y = " << par_P_minus[1] << endl; + o << "initial-bh-momentum2z = " << par_P_minus[2] << endl; + o << "initial-bh-spin1x = " << par_S_plus[0] << endl; + o << "initial-bh-spin1y = " << par_S_plus[1] << endl; + o << "initial-bh-spin1z = " << par_S_plus[2] << endl; + o << "initial-bh-spin2x = " << par_S_minus[0] << endl; + o << "initial-bh-spin2y = " << par_S_minus[1] << endl; + o << "initial-bh-spin2z = " << par_S_minus[2] << endl; + o << "initial-bh-puncture-adm-mass1 = " << *mp_adm << endl; + o << "initial-bh-puncture-adm-mass2 = " << *mm_adm << endl; + } +} File [modified]: TwoPunctures.c Delta lines: +37 -13 =================================================================== --- trunk/src/TwoPunctures.c 2011-05-20 11:02:32 UTC (rev 123) +++ trunk/src/TwoPunctures.c 2011-09-25 21:43:44 UTC (rev 124) @@ -220,7 +220,7 @@ CCTK_REAL admMass; if (! F) { - CCTK_REAL Mp_adm, Mm_adm, up, um; + CCTK_REAL up, um; /* Solve only when called for the first time */ F = dvector (0, ntotal - 1); allocate_derivs (&u, ntotal); @@ -257,7 +257,7 @@ target ADM masses target_M_plus and target_M_minus and with initial guesses given by par_m_plus and par_m_minus. */ if(!(give_bare_mass)) { - CCTK_REAL tmp, Mp_adm_err, Mm_adm_err; + CCTK_REAL tmp, mp_adm_err, mm_adm_err; char valbuf[100]; CCTK_REAL M_p = target_M_plus; @@ -280,14 +280,14 @@ um = PunctIntPolAtArbitPosition(0, nvar, n1, n2, n3, v,-par_b, 0., 0.); /* Calculate the ADM masses from the current bare mass guess */ - Mp_adm = (1 + up) * *mp + *mp * *mm / (4. * par_b); - Mm_adm = (1 + um) * *mm + *mp * *mm / (4. * par_b); + *mp_adm = (1 + up) * *mp + *mp * *mm / (4. * par_b); + *mm_adm = (1 + um) * *mm + *mp * *mm / (4. * par_b); /* Check how far the current ADM masses are from the target */ - Mp_adm_err = fabs(M_p-Mp_adm); - Mm_adm_err = fabs(M_m-Mm_adm); + mp_adm_err = fabs(M_p-*mp_adm); + mm_adm_err = fabs(M_m-*mm_adm); CCTK_VInfo (CCTK_THORNSTRING, "ADM mass error: M_p_err=%.4g, M_m_err=%.4g", - (double)Mp_adm_err, (double)Mm_adm_err); + (double) mp_adm_err, (double) mm_adm_err); /* Invert the ADM mass equation and update the bare mass guess so that it gives the correct target ADM masses */ @@ -304,8 +304,8 @@ sprintf (valbuf,"%.17g", (double) *mm); CCTK_ParameterSet ("par_m_minus", "twopunctures", valbuf); - } while ( (Mp_adm_err > adm_tol) || - (Mm_adm_err > adm_tol) ); + } while ( (mp_adm_err > adm_tol) || + (mm_adm_err > adm_tol) ); CCTK_VInfo (CCTK_THORNSTRING, "Found bare masses."); } @@ -322,16 +322,40 @@ um = PunctIntPolAtArbitPosition(0, nvar, n1, n2, n3, v,-par_b, 0., 0.); /* Calculate the ADM masses from the current bare mass guess */ - Mp_adm = (1 + up) * *mp + *mp * *mm / (4. * par_b); - Mm_adm = (1 + um) * *mm + *mp * *mm / (4. * par_b); + *mp_adm = (1 + up) * *mp + *mp * *mm / (4. * par_b); + *mm_adm = (1 + um) * *mm + *mp * *mm / (4. * par_b); - CCTK_VInfo (CCTK_THORNSTRING, "Puncture 1 ADM mass is %g", (double)Mp_adm); - CCTK_VInfo (CCTK_THORNSTRING, "Puncture 2 ADM mass is %g", (double)Mm_adm); + CCTK_VInfo (CCTK_THORNSTRING, "Puncture 1 ADM mass is %g", (double) *mp_adm); + CCTK_VInfo (CCTK_THORNSTRING, "Puncture 2 ADM mass is %g", (double) *mm_adm); /* print out ADM mass, eq.: \Delta M_ADM=2*r*u=4*b*V for A=1,B=0,phi=0 */ admMass = (*mp + *mm - 4*par_b*PunctEvalAtArbitPosition(v.d0, 0, 1, 0, 0, nvar, n1, n2, n3)); CCTK_VInfo (CCTK_THORNSTRING, "The total ADM mass is %g", (double) admMass); + *E = admMass; + + /* + Run this in Mathematica (version 8 or later) with + math -script <file> + + Needs["SymbolicC`"]; + co = Table["center_offset[" <> ToString[i] <> "]", {i, 0, 2}]; + r1 = co + {"par_b", 0, 0}; + r2 = co + {-"par_b", 0, 0}; + {p1, p2} = Table["par_P_" <> bh <> "[" <> ToString[i] <> "]", {bh, {"plus", "minus"}}, {i, 0, 2}]; + {s1, s2} = Table["par_S_" <> bh <> "[" <> ToString[i] <> "]", {bh, {"plus", "minus"}}, {i, 0, 2}]; + + J = Cross[r1, p1] + Cross[r2, p2] + s1 + s2; + + JVar = Table["*J" <> ToString[i], {i, 1, 3}]; + Print[OutputForm@StringReplace[ + ToCCodeString@MapThread[CAssign[#1, CExpression[#2]] &, {JVar, J}], + "\"" -> ""]]; + */ + + *J1 = -(center_offset[2]*par_P_minus[1]) + center_offset[1]*par_P_minus[2] - center_offset[2]*par_P_plus[1] + center_offset[1]*par_P_plus[2] + par_S_minus[0] + par_S_plus[0]; + *J2 = center_offset[2]*par_P_minus[0] - center_offset[0]*par_P_minus[2] + par_b*par_P_minus[2] + center_offset[2]*par_P_plus[0] - center_offset[0]*par_P_plus[2] - par_b*par_P_plus[2] + par_S_minus[1] + par_S_plus[1]; + *J3 = -(center_offset[1]*par_P_minus[0]) + center_offset[0]*par_P_minus[1] - par_b*par_P_minus[1] - center_offset[1]*par_P_plus[0] + center_offset[0]*par_P_plus[1] + par_b*par_P_plus[1] + par_S_minus[2] + par_S_plus[2]; } if (CCTK_EQUALS(grid_setup_method, "Taylor expansion")) File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- trunk/src/make.code.defn 2011-05-20 11:02:32 UTC (rev 123) +++ trunk/src/make.code.defn 2011-09-25 21:43:44 UTC (rev 124) @@ -1,7 +1,7 @@ # Main make.code.defn file for thorn TwoPunctures # Source files in this directory -SRCS = CoordTransf.c Equations.c FuncAndJacobian.c Newton.c TwoPunctures.c TP_utilities.c ParamCheck.c +SRCS = CoordTransf.c Equations.c FuncAndJacobian.c Newton.c TwoPunctures.c TP_utilities.c ParamCheck.c Metadata.cc # Subdirectories containing source files SUBDIRS = Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +16 -0 =================================================================== --- trunk/interface.ccl 2011-05-20 11:02:32 UTC (rev 123) +++ trunk/interface.ccl 2011-09-25 21:43:44 UTC (rev 124) @@ -40,6 +40,18 @@ USES FUNCTION Set_Initial_Guess_for_u USES FUNCTION Rescale_Sources +PRIVATE: + +CCTK_REAL energy TYPE=scalar +{ + E +} "ADM energy of the Bowen-York spacetime" + +CCTK_REAL angular_momentum TYPE=scalar +{ + J1, J2, J3 +} "Angular momentum of the Bowen-York spacetime" + PUBLIC: CCTK_REAL bare_mass TYPE=scalar @@ -47,4 +59,8 @@ mp mm } "Bare masses of the punctures" +CCTK_REAL puncture_adm_mass TYPE=scalar +{ + mp_adm mm_adm +} "ADM masses of the punctures (measured at the other spatial infinities)" File [modified]: param.ccl Delta lines: +3 -0 =================================================================== --- trunk/param.ccl 2011-05-20 11:02:32 UTC (rev 123) +++ trunk/param.ccl 2011-09-25 21:43:44 UTC (rev 124) @@ -23,8 +23,11 @@ USES KEYWORD conformal_storage +SHARES: IO +USES STRING out_dir + RESTRICTED: BOOLEAN verbose "Print screen output while solving" File [modified]: schedule.ccl Delta lines: +21 -12 =================================================================== --- trunk/schedule.ccl 2011-05-20 11:02:32 UTC (rev 123) +++ trunk/schedule.ccl 2011-09-25 21:43:44 UTC (rev 124) @@ -2,6 +2,8 @@ if (CCTK_Equals(initial_data, "twopunctures")) { + STORAGE: energy, angular_momentum, puncture_adm_mass + if (keep_u_around) { STORAGE: puncture_u bare_mass } @@ -13,20 +15,27 @@ if (schedule_in_ADMBase_InitialData) { - SCHEDULE TwoPunctures IN ADMBase_InitialData - { - LANG: C - STORAGE: puncture_u bare_mass - # SYNC: ADMBase::metric ADMBase::curv ADMBase::lapse - } "Create puncture black hole initial data" + SCHEDULE GROUP TwoPunctures_Group IN ADMBase_InitialData + { + } "TwoPunctures initial data group" } else { - SCHEDULE TwoPunctures AT Initial AFTER ADMBase_InitialData BEFORE ADMBase_PostInitial AFTER HydroBase_Initial before SetTmunu before HydroBase_Prim2ConInitial - { - LANG: C - STORAGE: puncture_u bare_mass - # SYNC: ADMBase::metric ADMBase::curv ADMBase::lapse - } "Create puncture black hole initial data" + SCHEDULE GROUP TwoPunctures_Group AT Initial AFTER ADMBase_InitialData BEFORE ADMBase_PostInitial AFTER HydroBase_Initial before SetTmunu before HydroBase_Prim2ConInitial + { + } "TwoPunctures initial data group" } + + SCHEDULE TwoPunctures IN TwoPunctures_Group + { + LANG: C + STORAGE: puncture_u bare_mass + # SYNC: ADMBase::metric ADMBase::curv ADMBase::lapse + } "Create puncture black hole initial data" + + SCHEDULE TwoPunctures_Metadata IN TwoPunctures_Group after TwoPunctures + { + LANG: C + OPTIONS: global + } "Output TwoPunctures metadata" }

1 0

[svn:einsteintoolkit] WeylScal4/trunk/ (Rev. 79)
by ian.hinder＠aei.mpg.de 25 Sep '11

25 Sep '11

User: hinder Date: 2011/09/25 02:20 PM Added: /trunk/src/ psis_calc_Nth.cc Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ Differencing.h, make.code.defn, psis_calc_2nd.cc, psis_calc_4th.cc Log: Regenerate code File Changes: Directory: /trunk/src/ ====================== File [modified]: Differencing.h Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> File [modified]: psis_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psis_calc_4th.cc Delta lines: <Unavailable> File [added]: psis_calc_Nth.cc Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 78)
by ian.hinder＠aei.mpg.de 25 Sep '11

25 Sep '11

User: hinder Date: 2011/09/25 02:20 PM Modified: /trunk/m/ WeylScal4.m Log: Use run-time finite difference order selection Keep the old method for backwards compatibility for now File Changes: Directory: /trunk/m/ ==================== File [modified]: WeylScal4.m Delta lines: +19 -2 =================================================================== --- trunk/m/WeylScal4.m 2011-09-25 19:19:52 UTC (rev 77) +++ trunk/m/WeylScal4.m 2011-09-25 19:20:01 UTC (rev 78) @@ -25,6 +25,11 @@ PDstandard4th[i_, j_] -> StandardCenteredDifferenceOperator[1,2,i] * StandardCenteredDifferenceOperator[1,2,j], + PDstandard[i_] -> StandardCenteredDifferenceOperator[1,fdOrder/2,i], + PDstandard[i_, i_] -> StandardCenteredDifferenceOperator[2,fdOrder/2,i], + PDstandard[i_, j_] -> StandardCenteredDifferenceOperator[1,fdOrder/2,i] * + StandardCenteredDifferenceOperator[1,fdOrder/2,j], + PDplus[i_] -> DPlus[i], PDminus[i_] -> DMinus[i], PDplus[i_,j_] -> DPlus[i] DPlus[j], @@ -277,8 +282,8 @@ fdOrderParam = { Name -> "fd_order", - Default -> "2nd", - AllowedValues -> {"2nd", "4th"} + Default -> "Nth", + AllowedValues -> {"Nth", "2nd", "4th"} }; keywordParameters = @@ -286,8 +291,19 @@ fdOrderParam }; +intParameters = +{ + { + Name -> fdOrder, + Default -> 2, + AllowedValues -> {2,4,6,8} + } +}; + + calculations = { + PsisCalc["Nth", PDstandard], PsisCalc["2nd", PDstandard2nd], PsisCalc["4th", PDstandard4th] }; @@ -299,4 +315,5 @@ UseLoopControl -> True, KeywordParameters -> keywordParameters, RealParameters -> realParameters, + IntParameters -> intParameters, InheritedImplementations -> {"admbase", "methodoflines"}];

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits