-
Notifications
You must be signed in to change notification settings - Fork 31
[Doc] add sod tube example to sphinx #1645
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tdavidcl
wants to merge
9
commits into
Shamrock-code:main
Choose a base branch
from
tdavidcl:patch-2026-02-14-19-25
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d1e355a
[Doc] add sod tube example to sphinx
tdavidcl 4755e54
[Doc] add sod tube example to sphinx
tdavidcl 1ff5c9e
[Doc] add double expansion example to sphinx
tdavidcl 1fc5f92
[Doc] add double expansion example to sphinx
tdavidcl ddd4993
Merge branch 'main' into patch-2026-02-14-19-25
tdavidcl 4acecb8
Delete doc/sphinx/examples/ramses/run_double_expansion.py
tdavidcl 2a31b38
Merge branch 'main' into patch-2026-02-14-19-25
tdavidcl 68ee827
update
tdavidcl 401d4c5
split sod test away from main job
tdavidcl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,241 @@ | ||
| """ | ||
| Sod tube test in RAMSES solver | ||
| ============================================= | ||
|
|
||
| Compare Sod tube with all slope limiters & Riemann solvers | ||
| """ | ||
|
|
||
| import os | ||
|
|
||
| import matplotlib.pyplot as plt | ||
| import numpy as np | ||
|
|
||
| import shamrock | ||
|
|
||
| tmax = 0.245 | ||
| timestamps = 40 | ||
| gamma = 1.4 | ||
|
|
||
| multx = 4 | ||
| multy = 1 | ||
| multz = 1 | ||
|
|
||
| sz = 1 << 1 | ||
| base = 16 | ||
|
|
||
| positions = [(x, 0, 0) for x in np.linspace(0.5, 1.5, 256).tolist()[:-1]] | ||
|
|
||
|
|
||
| def run_advect(slope_limiter: str, riemann_solver: str, only_last_step: bool = True): | ||
| ctx = shamrock.Context() | ||
| ctx.pdata_layout_new() | ||
|
|
||
| model = shamrock.get_Model_Ramses(context=ctx, vector_type="f64_3", grid_repr="i64_3") | ||
|
|
||
| cfg = model.gen_default_config() | ||
| scale_fact = 2 / (sz * base * multx) | ||
| cfg.set_scale_factor(scale_fact) | ||
| cfg.set_eos_gamma(gamma) | ||
|
|
||
| if slope_limiter == "none": | ||
| cfg.set_slope_lim_none() | ||
| elif slope_limiter == "vanleer": | ||
| cfg.set_slope_lim_vanleer_f() | ||
| elif slope_limiter == "vanleer_std": | ||
| cfg.set_slope_lim_vanleer_std() | ||
| elif slope_limiter == "vanleer_sym": | ||
| cfg.set_slope_lim_vanleer_sym() | ||
| elif slope_limiter == "minmod": | ||
| cfg.set_slope_lim_minmod() | ||
| else: | ||
| raise ValueError(f"Invalid slope limiter: {slope_limiter}") | ||
|
|
||
| if riemann_solver == "rusanov": | ||
| cfg.set_riemann_solver_rusanov() | ||
| elif riemann_solver == "hll": | ||
| cfg.set_riemann_solver_hll() | ||
| elif riemann_solver == "hllc": | ||
| cfg.set_riemann_solver_hllc() | ||
| else: | ||
| raise ValueError(f"Invalid Riemann solver: {riemann_solver}") | ||
|
tdavidcl marked this conversation as resolved.
Outdated
|
||
|
|
||
| cfg.set_face_time_interpolation(True) | ||
| model.set_solver_config(cfg) | ||
|
|
||
| model.init_scheduler(int(1e7), 1) | ||
| model.make_base_grid((0, 0, 0), (sz, sz, sz), (base * multx, base * multy, base * multz)) | ||
|
|
||
| def rho_map(rmin, rmax): | ||
| x, y, z = rmin | ||
| if x < 1: | ||
| return 1 | ||
| else: | ||
| return 0.125 | ||
|
|
||
| etot_L = 1.0 / (gamma - 1) | ||
| etot_R = 0.1 / (gamma - 1) | ||
|
|
||
| def rhoetot_map(rmin, rmax): | ||
| rho = rho_map(rmin, rmax) | ||
|
|
||
| x, y, z = rmin | ||
| if x < 1: | ||
| return etot_L | ||
| else: | ||
| return etot_R | ||
|
|
||
| def rhovel_map(rmin, rmax): | ||
| rho = rho_map(rmin, rmax) | ||
|
|
||
| return (0, 0, 0) | ||
|
|
||
| model.set_field_value_lambda_f64("rho", rho_map) | ||
| model.set_field_value_lambda_f64("rhoetot", rhoetot_map) | ||
| model.set_field_value_lambda_f64_3("rhovel", rhovel_map) | ||
|
|
||
| results = [] | ||
|
|
||
| def analysis(iplot: int): | ||
| rho_vals = model.render_slice("rho", "f64", positions) | ||
| rhov_vals = model.render_slice("rhovel", "f64_3", positions) | ||
| rhoetot_vals = model.render_slice("rhoetot", "f64", positions) | ||
|
|
||
| vx = np.array(rhov_vals)[:, 0] / np.array(rho_vals) | ||
| P = (np.array(rhoetot_vals) - 0.5 * np.array(rho_vals) * vx**2) * (gamma - 1) | ||
| results_dic = { | ||
| "rho": np.array(rho_vals), | ||
| "vx": np.array(vx), | ||
| "P": np.array(P), | ||
| } | ||
|
tdavidcl marked this conversation as resolved.
Outdated
|
||
| results.append(results_dic) | ||
|
|
||
| if only_last_step: | ||
| model.evolve_until(tmax) | ||
| analysis(timestamps) | ||
| else: | ||
| dt_evolve = tmax / timestamps | ||
|
|
||
| for i in range(timestamps + 1): | ||
| model.evolve_until(dt_evolve * i) | ||
| analysis(i) | ||
|
|
||
| return results | ||
|
|
||
|
|
||
| # %% | ||
| data = {} | ||
| data["none_rusanov"] = run_advect("none", "rusanov") | ||
| data["none_hll"] = run_advect("none", "hll") | ||
| data["none_hllc"] = run_advect("none", "hllc") | ||
| data["minmod_rusanov"] = run_advect("minmod", "rusanov") | ||
| data["minmod_hll"] = run_advect("minmod", "hll") | ||
| data["minmod_hllc"] = run_advect("minmod", "hllc", only_last_step=False) | ||
|
|
||
| # %% | ||
| # Plot 1: Comparison against analytical solution | ||
| riemann_solvers = ["rusanov", "hll", "hllc"] | ||
| slope_limiters = ["none", "minmod"] | ||
|
|
||
| xref = 1.0 | ||
| xrange = 0.5 | ||
| sod = shamrock.phys.SodTube(gamma=gamma, rho_1=1, P_1=1, rho_5=0.125, P_5=0.1) | ||
|
|
||
| #### add analytical soluce | ||
| arr_x = [x[0] for x in positions] | ||
|
|
||
| arr_rho = [] | ||
| arr_P = [] | ||
| arr_vx = [] | ||
|
|
||
| for i in range(len(arr_x)): | ||
| x_ = arr_x[i] - xref | ||
|
|
||
| _rho, _vx, _P = sod.get_value(tmax, x_) | ||
| # print(x_,_rho, _vx, _P) | ||
| arr_rho.append(_rho) | ||
| arr_vx.append(_vx) | ||
| arr_P.append(_P) | ||
|
|
||
| arr_rho = np.array(arr_rho) | ||
| arr_vx = np.array(arr_vx) | ||
| arr_P = np.array(arr_P) | ||
|
|
||
| fig, axes = plt.subplots(3, 1, figsize=(6, 15)) | ||
| fig.suptitle(f"t={tmax} (Last Step)", fontsize=14) | ||
|
|
||
| for i in range(3): | ||
| axes[i].set_xlabel("$x$") | ||
| axes[i].set_yscale("log") | ||
| axes[i].grid(True, alpha=0.3) | ||
|
|
||
| ax1, ax2, ax3 = axes | ||
| ax1.set_xlabel("$x$") | ||
| ax1.set_ylabel("$\\rho$") | ||
|
|
||
| ax2.set_xlabel("$x$") | ||
| ax2.set_ylabel("$v_x$") | ||
|
|
||
| ax3.set_xlabel("$x$") | ||
| ax3.set_ylabel("$P$") | ||
|
|
||
|
|
||
| # ax1.plot(arr_x, arr_rho, color="black", label="analytic") | ||
| # ax2.plot(arr_x, arr_vx, color="black", label="analytic") | ||
| # ax3.plot(arr_x, arr_P, color="black", label="analytic") | ||
|
|
||
|
|
||
| for limiter in slope_limiters: | ||
| for solver in riemann_solvers: | ||
| key = f"{limiter}_{solver}" | ||
| if key in data: | ||
| # Get the last timestep | ||
| delta_rho = np.abs(data[key][-1]["rho"] - arr_rho) | ||
| delta_vx = np.abs(data[key][-1]["vx"] - arr_vx) | ||
| delta_P = np.abs(data[key][-1]["P"] - arr_P) | ||
|
|
||
| ax1.plot(arr_x, delta_rho, label=f"{limiter} {solver} (rho)", linewidth=1) | ||
| ax2.plot(arr_x, delta_vx, label=f"{limiter} {solver} (vx)", linewidth=1) | ||
| ax3.plot(arr_x, delta_P, label=f"{limiter} {solver} (P)", linewidth=1) | ||
|
|
||
|
|
||
| ax1.legend() | ||
| ax2.legend() | ||
| ax3.legend() | ||
|
|
||
| plt.tight_layout() | ||
| plt.show() | ||
|
|
||
| # %% | ||
| # Plot 2: Animation of vanleer_sym_hllc configuration | ||
|
|
||
| # sphinx_gallery_thumbnail_number = 2 | ||
|
|
||
| from matplotlib.animation import FuncAnimation | ||
|
tdavidcl marked this conversation as resolved.
|
||
|
|
||
| fig2, ax2 = plt.subplots() | ||
|
tdavidcl marked this conversation as resolved.
|
||
| ax2.set_xlabel("$x$") | ||
| ax2.set_ylabel("$\\rho$") | ||
| ax2.set_ylim(-0.1, 1.1) | ||
| ax2.set_xlim(0.5, 1.5) | ||
| ax2.grid(True, alpha=0.3) | ||
|
|
||
| (line_rho,) = ax2.plot(arr_x, data["minmod_hllc"][0]["rho"], label="rho", linewidth=2) | ||
| (line_vx,) = ax2.plot(arr_x, data["minmod_hllc"][0]["vx"], label="vx", linewidth=2) | ||
| (line_P,) = ax2.plot(arr_x, data["minmod_hllc"][0]["P"], label="P", linewidth=2) | ||
|
|
||
| ax2.legend() | ||
| ax2.set_title(f"minmod_hllc - t = {0.0:.3f} s") | ||
|
|
||
|
|
||
| def animate(frame): | ||
| t = tmax * frame / timestamps | ||
| line_rho.set_ydata(data["minmod_hllc"][frame]["rho"]) | ||
| line_vx.set_ydata(data["minmod_hllc"][frame]["vx"]) | ||
| line_P.set_ydata(data["minmod_hllc"][frame]["P"]) | ||
| ax2.set_title(f"minmod_hllc - t = {t:.3f} s") | ||
| return (line_rho, line_vx, line_P) | ||
|
|
||
|
|
||
| anim = FuncAnimation(fig2, animate, frames=timestamps + 1, interval=50, blit=False, repeat=True) | ||
| plt.tight_layout() | ||
| plt.show() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
| */ | ||
|
|
||
| #include "shamphys/SodTube.hpp" | ||
| #include "shamcomm/logs.hpp" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| #include "shammath/derivatives.hpp" | ||
| #include "shammath/solve.hpp" | ||
| #include <cmath> | ||
|
|
@@ -22,7 +23,7 @@ | |
| f64 shamphys::SodTube::soundspeed(f64 P, f64 rho) { return std::sqrt(gamma * P / rho); }; | ||
|
|
||
| shamphys::SodTube::SodTube(f64 _gamma, f64 _rho_1, f64 _P_1, f64 _rho_5, f64 _P_5) | ||
| : gamma(_gamma), rho_1(_rho_1), P_1(_P_1), rho_5(_rho_5), P_5(_P_5) { | ||
| : gamma(_gamma), rho_1(_rho_1), P_1(_P_1), rho_5(_rho_5), P_5(_P_5), vx_1(0), vx_5(0) { | ||
| c_1 = soundspeed(P_1, rho_1); | ||
| c_5 = soundspeed(P_5, rho_5); | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.