Skip to content

Commit

Permalink
Update fusion cross-section to Bosch-Hale for PRD (#101)
Browse files Browse the repository at this point in the history
* Switch from Hively to Bosch-Hale fusion cross-section

* Update notebooks

* Use all significant figures from Bosch-Hale

* Fix notebook error
  • Loading branch information
tbody-cfs authored Sep 11, 2024
1 parent ecbc626 commit 6825b2d
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 85 deletions.
4 changes: 2 additions & 2 deletions cfspopcon/formulas/fusion_power/fusion_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ def __init__(self) -> None:
def calc_rate_coefficient(ion_temp: float) -> float:
r"""Calculate :math:`\\langle \\sigma v \rangle` for a given ion temperature.
Cross-section from :cite:`bosch_improved_1992`
Cross-section from :cite:`bosch_improved_1992`, equation 12, using coefficients from table VII, page 625 (first column is DT reaction)
Args:
ion_temp: [keV]
Returns:
:math:`\\langle \\sigma v \rangle` [cm^3/s]
"""
C = [0.0, 1.173e-9, 1.514e-2, 7.519e-2, 4.606e-3, 1.35e-2, -1.068e-4, 1.366e-5]
C = [0.0, 1.17302e-9, 1.51361e-2, 7.51886e-2, 4.60643e-3, 1.35000e-2, -1.06750e-4, 1.36600e-5]
B_G = 34.3827
mr_c2 = 1124656

Expand Down
93 changes: 49 additions & 44 deletions docs/doc_sources/getting_started.ipynb

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions docs/doc_sources/separatrix_operational_space.ipynb

Large diffs are not rendered by default.

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions docs/doc_sources/understanding_algorithms.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion example_cases/SPARC_PRD/input.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ plasma_current: 8.7e+6
fraction_of_external_power_coupled: 0.9

# What fusion reaction are we using?
fusion_reaction: DTFusionHively
fusion_reaction: DTFusionBoschHale
# Fraction of fuel ions which are the heavier species
heavier_fuel_species_fraction: 0.5

Expand Down
26 changes: 13 additions & 13 deletions tests/regression_results/PRD.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,35 +65,35 @@
"attrs": {
"units": "megawatt"
},
"data": 22.55867182,
"data": 23.15670789,
"dims": []
},
"P_auxiliary_absorbed": {
"attrs": {
"units": "megawatt"
},
"data": 7.702542635,
"data": 7.104506562,
"dims": []
},
"P_auxiliary_launched": {
"attrs": {
"units": "megawatt"
},
"data": 8.558380706,
"data": 7.893896180,
"dims": []
},
"P_external": {
"attrs": {
"units": "megawatt"
},
"data": 8.904164506,
"data": 8.306128433,
"dims": []
},
"P_fusion": {
"attrs": {
"units": "megawatt"
},
"data": 112.7933591,
"data": 115.7835394,
"dims": []
},
"P_in": {
Expand All @@ -107,7 +107,7 @@
"attrs": {
"units": "megawatt"
},
"data": 90.23468727,
"data": 92.62683156,
"dims": []
},
"P_ohmic": {
Expand Down Expand Up @@ -135,7 +135,7 @@
"attrs": {
"units": "dimensionless"
},
"data": 11.55669358,
"data": 12.72973555,
"dims": []
},
"SOL_momentum_loss_function": {
Expand Down Expand Up @@ -320,14 +320,14 @@
"attrs": {
"units": "dimensionless"
},
"data": 0.08439528049,
"data": 0.08439527661,
"dims": []
},
"edge_impurity_concentration_in_core": {
"attrs": {
"units": "dimensionless"
},
"data": 0.01687905610,
"data": 0.01687905532,
"dims": []
},
"edge_impurity_enrichment": {
Expand Down Expand Up @@ -634,7 +634,7 @@
},
"fusion_reaction": {
"attrs": {},
"data": "DTFusionHively",
"data": "DTFusionBoschHale",
"dims": []
},
"fusion_triple_product": {
Expand Down Expand Up @@ -687,7 +687,7 @@
"data": [
0.06000000000,
0.003100000000,
0.01687905610,
0.01687905532,
0.000000000,
1.500000000e-05
],
Expand Down Expand Up @@ -933,14 +933,14 @@
"attrs": {
"units": "megawatt / meter ** 2"
},
"data": 1.624788752,
"data": 1.667862312,
"dims": []
},
"neutron_rate": {
"attrs": {
"units": "1 / second"
},
"data": 4.000004399e+19,
"data": 4.106045524e+19,
"dims": []
},
"normalized_beta": {
Expand Down
Binary file modified tests/regression_results/SPARC_PRD_result.nc
Binary file not shown.

0 comments on commit 6825b2d

Please sign in to comment.