cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed accretion_profile -> sink_accretion. More intuitive.

Browse Source
This commit is contained in:
Miikka Vaisala
2019-08-16 09:52:12 +08:00
parent 6c50c0a40e
commit 60f2af0971
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
acc/mhd_solver/stencil_process.sps
View File

@@ -86,9 +86,7 @@ truelove_density(in ScalarField lnrho){
} }
Scalar Scalar
accretion_profile(int3 globalVertexIdx, in ScalarField lnrho, Scalar dt){ sink_accretion(int3 globalVertexIdx, in ScalarField lnrho, Scalar dt){
// QUESTION: do I need to define grid_pos, sink_pos and distance again
// if the sink_gravity kernel will also be called once LSINK swtich is on? Seems redundant.
const Vector grid_pos = (Vector){(globalVertexIdx.x - nx_min) * dsx, const Vector grid_pos = (Vector){(globalVertexIdx.x - nx_min) * dsx,
(globalVertexIdx.y - ny_min) * dsy, (globalVertexIdx.y - ny_min) * dsy,
(globalVertexIdx.z - nz_min) * dsz}; (globalVertexIdx.z - nz_min) * dsz};
@@ -135,7 +133,7 @@ continuity(int3 globalVertexIdx, in VectorField uu, in ScalarField lnrho, Scalar
+ upwd_der6(uu, lnrho) + upwd_der6(uu, lnrho)
#endif #endif
#if LSINK #if LSINK
- accretion_profile(globalVertexIdx, lnrho, dt) / exp(value(lnrho)) - sink_accretion(globalVertexIdx, lnrho, dt) / exp(value(lnrho))
#endif #endif
- divergence(uu); - divergence(uu);
} }
@@ -165,7 +163,7 @@ momentum(int3 globalVertexIdx, in VectorField uu, in ScalarField lnrho, in Scala
+ zeta * gradient_of_divergence(uu) + zeta * gradient_of_divergence(uu)
#if LSINK #if LSINK
+ sink_gravity(globalVertexIdx) + sink_gravity(globalVertexIdx)
- accretion_profile(globalVertexIdx, lnrho, dt) / exp(value(lnrho)) - sink_accretion(globalVertexIdx, lnrho, dt) / exp(value(lnrho))
* value(uu); //TODO: Confirm * value(uu); //TODO: Confirm
#else #else
; ;
@@ -435,9 +433,9 @@ solve(Scalar dt) {
#endif #endif
#if LSINK #if LSINK
// out_lnrho = log(exp(out_lnrho) - accretion_profile(globalVertexIdx, lnrho)); // out_lnrho = log(exp(out_lnrho) - sink_accretion(globalVertexIdx, lnrho));
// out_accretion = value(accretion) + (accretion_profile(globalVertexIdx,lnrho) * dsx * dsy * dsz); // out_accretion = value(accretion) + (sink_accretion(globalVertexIdx,lnrho) * dsx * dsy * dsz);
out_accretion = rk3(out_accretion, accretion, accretion_profile(globalVertexIdx, lnrho, dt), dt);// unit now is rho! out_accretion = rk3(out_accretion, accretion, sink_accretion(globalVertexIdx, lnrho, dt), dt);// unit now is rho!
out_lnrho = log(exp(out_lnrho) - out_accretion); out_lnrho = log(exp(out_lnrho) - out_accretion);
out_accretion = out_accretion * dsx * dsy * dsz;// unit is now mass! out_accretion = out_accretion * dsx * dsy * dsz;// unit is now mass!
//TODO: implement accretion correction to contiunity equation and momentum equation. //TODO: implement accretion correction to contiunity equation and momentum equation.