User: knarf Date: 2010/07/29 10:19 PM
Modified: /trunk/ schedule.ccl /trunk/src/ Bin_NS.cc
Log: a few corrections (rho~=0 handling, shift fix), still unknown: correct curvature transformation -> bin_ns.h mentioned K^{ij} being exported, but Eric G. mentioned it is K_{ij}, which indeed results in lesser mom-constraint violation. However, both versions do not converge - unlike the ham constraint violation
File Changes:
Directory: /trunk/src/ ======================
File [modified]: Bin_NS.cc Delta lines: +18 -14 =================================================================== --- trunk/src/Bin_NS.cc 2010-07-12 14:50:45 UTC (rev 7) +++ trunk/src/Bin_NS.cc 2010-07-30 03:19:48 UTC (rev 8) @@ -11,7 +11,6 @@ using namespace std;
- static void set_dt_from_domega (CCTK_ARGUMENTS, CCTK_REAL const* const var, CCTK_REAL * const dtvar, @@ -113,9 +112,9 @@
alp[i] = bin_ns.nnn[i];
- betax[i] = bin_ns.beta_x[i]; - betay[i] = bin_ns.beta_y[i]; - betaz[i] = bin_ns.beta_z[i]; + betax[i] = -bin_ns.beta_x[i]; + betay[i] = -bin_ns.beta_y[i]; + betaz[i] = -bin_ns.beta_z[i];
CCTK_REAL g[3][3]; g[0][0] = bin_ns.g_xx[i]; @@ -158,25 +157,30 @@ gyz[i] = g[1][2]; gzz[i] = g[2][2];
- kxx[i] = k[0][0]; - kxy[i] = k[0][1]; - kxz[i] = k[0][2]; - kyy[i] = k[1][1]; - kyz[i] = k[1][2]; - kzz[i] = k[2][2]; + kxx[i] = ku[0][0] * coord_unit; + kxy[i] = ku[0][1] * coord_unit; + kxz[i] = ku[0][2] * coord_unit; + kyy[i] = ku[1][1] * coord_unit; + kyz[i] = ku[1][2] * coord_unit; + kzz[i] = ku[2][2] * coord_unit;
rho[i] = bin_ns.nbar[i] / rho_unit; - + eps[i] = rho[i] * bin_ns.ener_spec[i] / ener_unit;
vel[i ] = bin_ns.u_euler_x[i] / vel_unit; vel[i+ npoints] = bin_ns.u_euler_y[i] / vel_unit; vel[i+2*npoints] = bin_ns.u_euler_z[i] / vel_unit; - + + if (rho[i] < 1.e-20) { + rho[i ] = 1.e-20; + vel[i ] = 0.0; + vel[i+ npoints] = 0.0; + vel[i+2*npoints] = 0.0; + } + } // for i
- - CCTK_INFO ("Calculating time derivatives of lapse and shift"); { // Angular velocity
Directory: /trunk/ ==================
File [modified]: schedule.ccl Delta lines: +1 -1 =================================================================== --- trunk/schedule.ccl 2010-07-12 14:50:45 UTC (rev 7) +++ trunk/schedule.ccl 2010-07-30 03:19:48 UTC (rev 8) @@ -12,7 +12,7 @@ LANG: C } "Check parameters"
- SCHEDULE ID_Bin_NS_initialise IN ADMBase_InitialData + SCHEDULE ID_Bin_NS_initialise IN HydroBase_Initial { LANG: C } "Set up binary neutron star initial data"