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

Cleaning the forcing part.

Browse Source
This commit is contained in:
Miikka Vaisala
2019-06-25 14:48:47 +08:00
parent 44f26cde42
commit b1a2d9603c
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acc/mhd_solver/stencil_assembly.sas
View File

@@ -1,5 +1,5 @@
#define LUPWD (0) #define LUPWD (1)
Preprocessed Scalar Preprocessed Scalar

22
acc/mhd_solver/stencil_process.sps
View File

@@ -3,7 +3,7 @@
#define LTEMPERATURE (0) #define LTEMPERATURE (0)
#define LGRAVITY (0) #define LGRAVITY (0)
#define LFORCING (1) #define LFORCING (1)
#define LUPWD (0) #define LUPWD (1)
// Declare uniforms (i.e. device constants) // Declare uniforms (i.e. device constants)
@@ -204,6 +204,19 @@ heat_transfer(in Vector uu, in Scalar lnrho, in Scalar tt)
#endif #endif
#if LFORCING #if LFORCING
Vector
simple_vortex_forcing(Vector a, Vector b, Scalar magnitude)
{
return magnitude * cross(normalized(b - a), (Vector){0, 0, 1}); // Vortex
}
Vector
simple_outward_flow_forcing(Vector a, Vector b, Scalar magnitude)
{
return magnitude * (1 / length(b - a)) * normalized(b - a); // Outward flow
}
Vector Vector
forcing(int3 globalVertexIdx) forcing(int3 globalVertexIdx)
{ {
@@ -215,8 +228,11 @@ forcing(int3 globalVertexIdx)
(globalVertexIdx.z - nz_min) * dsz}; // sink (current index) (globalVertexIdx.z - nz_min) * dsz}; // sink (current index)
Scalar magnitude = 0.05; Scalar magnitude = 0.05;
// Vector c = magnitude * (1 / length(b - a)) * normalized(b - a); // Outward flow
Vector c = magnitude * cross(normalized(b - a), (Vector){0, 0, 1}); // Vortex //Determine that forcing funtion type at this point.
Vector c = simple_vortex_forcing(a, b, magnitude);
//Vector c = simple_outward_flow_forcing(a, b, magnitude);
if (is_valid(c)) { return c; } if (is_valid(c)) { return c; }
else { return (Vector){0, 0, 0}; } else { return (Vector){0, 0, 0}; }
} }

4
analysis/python/jupyter/notebook_example.ipynb
View File

@@ -33,7 +33,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"#imesh = 16000\n", "#imesh = 30000\n",
"imesh = 30000\n", "imesh = 30000\n",
"mesh = ad.read.Mesh(imesh, fdir=meshdir)" "mesh = ad.read.Mesh(imesh, fdir=meshdir)"
] ]
@@ -76,7 +76,7 @@
"vis.slices.plot_3(mesh, mesh.lnrho, title = r'$\\ln_\\rho$')\n", "vis.slices.plot_3(mesh, mesh.lnrho, title = r'$\\ln_\\rho$')\n",
"vis.slices.plot_3(mesh, np.exp(mesh.lnrho), title = r'$\\rho$')\n", "vis.slices.plot_3(mesh, np.exp(mesh.lnrho), title = r'$\\rho$')\n",
"vis.slices.plot_3(mesh, np.exp(mesh.lnrho), title = r'$N_\\mathrm{col}$', slicetype = 'sum')\n", "vis.slices.plot_3(mesh, np.exp(mesh.lnrho), title = r'$N_\\mathrm{col}$', slicetype = 'sum')\n",
"#vis.slices.plot_3(mesh, mesh.entropy, title = r'$s$')\n" "vis.slices.plot_3(mesh, mesh.ss, title = r'$s$')\n"
] ]
}, },
{ {