Skip to content

Kwarg updates to allow bootstrap solve in fortran backend #5

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.

Sign up for GitHub

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
StuartBenjamin wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Kwarg updates to allow bootstrap solve in fortran backend #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90394f9
kwarg support for bootstrap solve in fortran back end
StuartBenjamin Jun 8, 2026
7a0a955
Missing solve_with_bootstrap kwarg
StuartBenjamin Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions bouquet/TokaMaker_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@ def perturb_kinetic_equilibrium(
spike_profile_recon_cached=None,
proxy_bias_warmstart=None,
pin_jphi=False,
**kwargs
):
r"""Perturb kinetic and current-density profiles and iterate to
match :math:`I_p` and :math:`l_i` targets.
Expand Down Expand Up @@ -990,6 +991,7 @@ def _probe(label):
isolate_edge_jBS=isolate_edge_jBS,
diagnostic_plots=False,
verbose=False,
**kwargs
)
finally:
if _stashed_bounds is not None:
Expand Down Expand Up @@ -1192,6 +1194,7 @@ def _probe(label):
# SWB H-mode self-consistency iterations (default 3). Env
# SWB_ITERS lets us trim for speed (2 is usually enough).
iterations=int(os.environ.get('SWB_ITERS', '3')),
**kwargs
)
if os.environ.get('PROFILE', '0') == '1':
print(f" [profile] SWB call: {time.perf_counter()-_t_swb0:.1f}s")
Expand Down Expand Up @@ -1871,6 +1874,7 @@ def generate_bouquet(
jphi_baseline=True,
seed=None,
pin_jphi=False,
**kwargs
):
r"""Generate a batch of perturbed equilibria and archive to HDF5.

Expand Down Expand Up @@ -2756,7 +2760,7 @@ def _k2e(a):
initial_Ip_target, _swb_seed_cache,
scale_jBS=1.0,
isolate_edge_jBS=isolate_edge_jBS,
diagnostic_plots=False, verbose=False,
diagnostic_plots=False, verbose=False,**kwargs
)
_diff_spike_recon = np.asarray(
_cache_results["isolated_j_BS"]).copy()
Expand Down Expand Up @@ -2978,6 +2982,7 @@ def _k2e(a):
spike_profile_recon_cached=_diff_spike_recon,
proxy_bias_warmstart=_proxy_bias_warmstart,
pin_jphi=pin_jphi,
**kwargs
)
except Exception as e:
# Catch ANY exception during a perturbed solve -- ValueError
Expand Down Expand Up @@ -3684,7 +3689,7 @@ def _build_bounds(drift_F, drift_VSC):
def reconstruct_equilibrium(mygs, eqdsk, ne, te, ni, ti, Zeff,
isoflux_pts, weights, psi_pad,
guess_jinductive,n_k,psi_bridge,rescale_j_BS,
shelf_psi_N,initialize_psi=True):
shelf_psi_N,initialize_psi=True,**kwargs):
r"""Reconstruct a single Grad-Shafranov equilibrium from a geqdsk
reference and kinetic profiles, matching the EFIT :math:`l_i(1)`.

Expand Down Expand Up @@ -3776,6 +3781,7 @@ def reconstruct_equilibrium(mygs, eqdsk, ne, te, ni, ti, Zeff,
scale_jBS=1.0,
isolate_edge_jBS=True,
diagnostic_plots=False,
**kwargs
)

j_BS_isolated = results['isolated_j_BS']
Expand Down