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

Improvements to GPU forcing (now applied only at substep 2)

Browse Source
This commit is contained in:
jpekkila
2019-06-19 16:08:44 +03:00
parent feef97563d
commit e580f6f5d7
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
acc/mhd_solver/stencil_process.sps
View File

@@ -2,7 +2,7 @@
#define LENTROPY (1) #define LENTROPY (1)
#define LTEMPERATURE (0) #define LTEMPERATURE (0)
#define LGRAVITY (0) #define LGRAVITY (0)
#define LFORCING (0) #define LFORCING (1)
// Declare uniforms (i.e. device constants) // Declare uniforms (i.e. device constants)
@@ -185,27 +185,24 @@ heat_transfer(in Vector uu, in Scalar lnrho, in Scalar tt)
} }
#endif #endif
#if LFORCING
Vector Vector
forcing(int3 globalVertexIdx) forcing(int3 globalVertexIdx)
{ {
#if LFORCING Vector a = Scalar(.5) * (Vector){globalGrid.n.x * dsx,
Vector a = Scalar(.5) * (Vector){globalGrid.n.x * dsx, globalGrid.n.y * dsy,
globalGrid.n.y * dsy, globalGrid.n.z * dsz}; // source (origin)
globalGrid.n.z * dsz}; // source (origin) Vector b = (Vector){(globalVertexIdx.x - nx_min) * dsx,
Vector b = (Vector){(globalVertexIdx.x - nx_min) * dsx, (globalVertexIdx.y - ny_min) * dsy,
(globalVertexIdx.y - ny_min) * dsy, (globalVertexIdx.z - nz_min) * dsz}; // sink (current index)
(globalVertexIdx.z - nz_min) * dsz}; // sink (current index)
Scalar magnitude = 0.1; Scalar magnitude = .1;
// Vector c = magnitude * (1 / length(b - a)) * normalized(b - a); // Outward flow // Vector c = magnitude * (1 / length(b - a)) * normalized(b - a); // Outward flow
Vector c = magnitude * cross(normalized(b - a), (Vector){0, 0, 1}); // Vortex Vector c = magnitude * cross(normalized(b - a), (Vector){0, 0, 1}); // Vortex
if (is_valid(c)) { return c; } if (is_valid(c)) { return c; }
else { return (Vector){0, 0, 0}; } else { return (Vector){0, 0, 0}; }
#else
return (Vector){0, 0, 0};
#endif // LFORCING
} }
#endif // LFORCING
// Declare input and output arrays using locations specified in the // Declare input and output arrays using locations specified in the
// array enum in astaroth.h // array enum in astaroth.h
@@ -240,12 +237,18 @@ solve(Scalar dt) {
#endif #endif
#if LENTROPY #if LENTROPY
out_uu = rk3(out_uu, uu, momentum(uu, lnrho, ss, aa) + forcing(globalVertexIdx), dt); out_uu = rk3(out_uu, uu, momentum(uu, lnrho, ss, aa), dt);
out_ss = rk3(out_ss, ss, entropy(ss, uu, lnrho, aa), dt); out_ss = rk3(out_ss, ss, entropy(ss, uu, lnrho, aa), dt);
#elif LTEMPERATURE #elif LTEMPERATURE
out_uu =rk3(out_uu, uu, momentum(uu, lnrho, tt), dt); out_uu = rk3(out_uu, uu, momentum(uu, lnrho, tt), dt);
out_tt = rk3(out_tt, tt, heat_transfer(uu, lnrho, tt), dt); out_tt = rk3(out_tt, tt, heat_transfer(uu, lnrho, tt), dt);
#else #else
out_uu = rk3(out_uu, uu, momentum(uu, lnrho), dt); out_uu = rk3(out_uu, uu, momentum(uu, lnrho), dt);
#endif #endif
#if LFORCING
if (step_number == 2) {
out_uu = out_uu + forcing(globalVertexIdx);
}
#endif
} }