yohai/phigrape
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved some variables from global to main and removed some unused variables

Browse source
This commit is contained in:
Yohai Meiron 2020-03-18 11:55:24 -04:00
parent 9296db0609
commit 22f983cf17
3 changed files with 130 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pn_bh_spin.c
View file

@ -10,7 +10,7 @@ int calc_force_pn_BH(double m1, double xx1[], double vv1[], double spin1[],
double CCC_NB, double dt_bh,
int usedOrNot[],
double a_pn1[][3], double adot_pn1[][3],
double a_pn2[][3], double adot_pn2[][3])
double a_pn2[][3], double adot_pn2[][3], int myRank, int rootRank)
{
/*
@ -52,7 +52,7 @@ double PI2 = 9.86960440108935;
double c_1, c_2, c_4, c_5, c_6, c_7, RS_DIST;
double M, eta, r, r2, r3, MOR;
double V1_V22,VWHOLE, RP, RPP, VA;
double V1_V22, RP, RPP, VA;
double N[3], x[3], v[3], A[3];
double A1, B1, A2, B2, A2_5, B2_5, AK2, BK2, AK4, BK4, AK5, BK5;
double A1D, A2D, A2_5D, B1D, B2D, B2_5D, ADK2, BDK2, ADK4, BDK4, ADK5, BDK5;
@ -72,7 +72,6 @@ double SS1aux[3],SS2aux[3],SU[3],SV[3],XAD[3],XSD[3];
double NDOTCS[3], NCSU[3], NDOTCSIG[3], NCSV[3], ACS[3], VCSU[3], ACSIG[3], VCSV[3], SNVDOT,
SIGNVDOT, NSDOT, NSIGDOT, VSDOT, VSIGDOT, NXSDOT, NXADOT;
double C1_5D[3],C2D[3], C2_5D[3];
double ADK, BDK, AD[3], KSAK, KSBK;
double nu, Spin1Abs2, Spin2Abs2, rS1, rS2, S1Dir[3], S2Dir[3], QM[3];
double Spin1Abs, Spin2Abs, QMAux2_1[3], QMAux2_2[3], QMAux1[3] , QMD[3], SPINPrev[3][2], SpinPrev2_1,
SpinPrev2_2, SPSPP1, SPSPP2, Spin1AbsNew2, Spin2AbsNew2, Spin1AbsNew, Spin2AbsNew, S1DirNew[3],
@ -129,7 +128,6 @@ r3 = r2*r;
MOR = M/r;
V1_V22 = v[0]*v[0]+v[1]*v[1]+v[2]*v[2];
VWHOLE = sqrt(V1_V22);
RP = (x[0]*v[0]+x[1]*v[1]+x[2]*v[2])/r;
@ -667,15 +665,6 @@ if(usedOrNot[5] == 1) // PN3.5 ~1/c^7
} /* if(Van_Spin==1) */
ADK = ADK2+ADK4+ADK5+ADK6+ADK7;
BDK = BDK2+BDK4+BDK5+BDK6+BDK7;
KSAK = AK2+AK4+AK5+AK6+AK7;
KSBK = BK2+BK4+BK5+BK6+BK7;
for(k=0;k<3;k++) AD[k] = -2.0*MOR*RP*(KSAK*N[k]+KSBK*v[k])/r2 + MOR*(ADK*N[k]+BDK*v[k])/r + MOR*(KSAK*(v[k]-N[k]*RP)/r+KSBK*AT[k])/r + C1_5D[k]/c_2 + C2D[k]/c_4 +C2_5D[k]/c_4 + QMD[k]/c_4;
for(k=0;k<3;k++) // new values of the BH's spins, returned back to the main program...
{
spin1[k] = SPIN[k][0];