LALSimInspiralTaylorT2.c   LALSimInspiralTaylorT2.c 
skipping to change at line 537 skipping to change at line 537
REAL8 oneby6 = 1./6.; REAL8 oneby6 = 1./6.;
ak->t0 = 0; ak->t0 = 0;
ak->totalmass = m1 + m2; ak->totalmass = m1 + m2;
eta = ak->eta = m1 * m2 / (ak->totalmass * ak->totalmass); eta = ak->eta = m1 * m2 / (ak->totalmass * ak->totalmass);
ak->totalmass *= LAL_G_SI / pow(LAL_C_SI, 3.0); /* convert m from kilogra ms to seconds */ ak->totalmass *= LAL_G_SI / pow(LAL_C_SI, 3.0); /* convert m from kilogra ms to seconds */
ak->f0 = f_min; ak->f0 = f_min;
ak->samplinginterval = deltaT; ak->samplinginterval = deltaT;
ak->fn = 1. / (2. * ak->samplinginterval); ak->fn = 1. / (2. * ak->samplinginterval);
ak->vn = cbrt(LAL_PI * ak->totalmass * ak->fn);
ak->v0 = cbrt(LAL_PI * ak->totalmass * f_min); ak->v0 = cbrt(LAL_PI * ak->totalmass * f_min);
ak->tvaN = XLALSimInspiralTaylorT2Timing_0PNCoeff(m1+m2, eta); ak->tvaN = XLALSimInspiralTaylorT2Timing_0PNCoeff(m1+m2, eta);
ak->tva2 = XLALSimInspiralTaylorT2Timing_2PNCoeff(eta); ak->tva2 = XLALSimInspiralTaylorT2Timing_2PNCoeff(eta);
ak->tva3 = XLALSimInspiralTaylorT2Timing_3PNCoeff(eta); ak->tva3 = XLALSimInspiralTaylorT2Timing_3PNCoeff(eta);
ak->tva4 = XLALSimInspiralTaylorT2Timing_4PNCoeff(eta); ak->tva4 = XLALSimInspiralTaylorT2Timing_4PNCoeff(eta);
ak->tva5 = XLALSimInspiralTaylorT2Timing_5PNCoeff(eta); ak->tva5 = XLALSimInspiralTaylorT2Timing_5PNCoeff(eta);
ak->tva6 = XLALSimInspiralTaylorT2Timing_6PNCoeff(eta); ak->tva6 = XLALSimInspiralTaylorT2Timing_6PNCoeff(eta);
ak->tva7 = XLALSimInspiralTaylorT2Timing_7PNCoeff(eta); ak->tva7 = XLALSimInspiralTaylorT2Timing_7PNCoeff(eta);
ak->tvl6 = XLALSimInspiralTaylorT2Timing_6PNLogCoeff(eta); ak->tvl6 = XLALSimInspiralTaylorT2Timing_6PNLogCoeff(eta);
skipping to change at line 630 skipping to change at line 631
break; break;
case 8: case 8:
XLALPrintError("XLAL Error - %s: PN approximant not supported fo r requested PN order\n", __func__); XLALPrintError("XLAL Error - %s: PN approximant not supported fo r requested PN order\n", __func__);
XLAL_ERROR(XLAL_EINVAL); XLAL_ERROR(XLAL_EINVAL);
break; break;
default: default:
XLALPrintError("XLAL Error - %s: Unknown PN order in switch\n", __f unc__); XLALPrintError("XLAL Error - %s: Unknown PN order in switch\n", __f unc__);
XLAL_ERROR(XLAL_EINVAL); XLAL_ERROR(XLAL_EINVAL);
} }
ak->flso = pow(ak->vlso, 3.0) / (LAL_PI * ak->totalmass);
return XLAL_SUCCESS; return XLAL_SUCCESS;
} }
/** /**
* Computes a post-Newtonian orbit using the Taylor T2 method. * Computes a post-Newtonian orbit using the Taylor T2 method.
*/ */
int XLALSimInspiralTaylorT2PNEvolveOrbit( int XLALSimInspiralTaylorT2PNEvolveOrbit(
REAL8TimeSeries **V, /**< post-Newtonian parameter [return ed] */ REAL8TimeSeries **V, /**< post-Newtonian parameter [return ed] */
REAL8TimeSeries **phi, /**< orbital phase [returned] */ REAL8TimeSeries **phi, /**< orbital phase [returned] */
REAL8 phi0, /**< initial phase */ REAL8 phi0, /**< initial phase */
skipping to change at line 699 skipping to change at line 702
toffIn.tc = 0.; toffIn.tc = 0.;
funcParams = (void *) &toffIn; funcParams = (void *) &toffIn;
tC = timing2(f_min, funcParams); tC = timing2(f_min, funcParams);
if (XLAL_IS_REAL8_FAIL_NAN(tC)) if (XLAL_IS_REAL8_FAIL_NAN(tC))
XLAL_ERROR(XLAL_EFUNC); XLAL_ERROR(XLAL_EFUNC);
/* Reset chirp time in toffIn structure */ /* Reset chirp time in toffIn structure */
toffIn.tc = -tC; toffIn.tc = -tC;
/* If flso is less than the user inputted upper frequency cutoff fu */ /* If flso is less than the user inputted upper frequency cutoff fu */
fLso = ak.fn; fLso = (ak.flso < ak.fn) ? ak.flso : ak.fn;
/* Is the sampling rate large enough? */ /* Is the sampling rate large enough? */
if (fLso > 0.5/deltaT) if (fLso > 0.5/deltaT)
XLAL_ERROR(XLAL_EDOM); XLAL_ERROR(XLAL_EDOM);
if (fLso <= f_min) if (fLso <= f_min)
XLAL_ERROR(XLAL_EDOM); XLAL_ERROR(XLAL_EDOM);
xmax = 1.5*fLso; xmax = 1.5*fLso;
xacc = 1.0e-8; xacc = 1.0e-8;
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/