Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions documentation/physics-models/plasma_density.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ For the models below $P_{\perp}$ is the mean heat flux density across the separa

-----------------

## ASDEX model
## ASDEX model | `calculate_asdex_density_limit()`

Switch value: `i_density_limit = 1`[^1][^2]

Expand All @@ -23,7 +23,7 @@ $$

-----------------

## Borrass model for ITER, I
## Borrass model for ITER, I | `calculate_borrass_iter_i_density_limit()`

Switch value: `i_density_limit = 2` [^1]

Expand All @@ -35,7 +35,7 @@ $C \approx$ 1.8 for ITER-like conditions.

-----------------

## Borrass model for ITER, II
## Borrass model for ITER, II | `calculate_borrass_iter_ii_density_limit()`

Switch value: `i_density_limit = 3` [^1]

Expand All @@ -45,7 +45,7 @@ $$

-----------------

## JET edge radiation model
## JET edge radiation model | `calculate_jet_edge_radiation_density_limit()`

Switch value: `i_density_limit = 4` [^1]

Expand All @@ -55,7 +55,7 @@ $$

-----------------

## JET simplified model
## JET simplified model | `calculate_jet_simple_density_limit()`

Switch value: `i_density_limit = 5` [^1]

Expand All @@ -73,7 +73,7 @@ where $\kappa \approx 1.5, \Delta \approx 0.1a$ has been taken from JET.

-----------------

## Hugill-Murakami model
## Hugill-Murakami model | `calculate_hugill_murakami_density_limit()`

Switch value: `i_density_limit = 6` [^2]

Expand All @@ -84,7 +84,7 @@ $$

-----------------

## Greenwald model
## Greenwald model | `calculate_greenwald_density_limit()`

Switch value: `i_density_limit = 7` [^3][^4]

Expand All @@ -96,7 +96,7 @@ For the Greenwald model the limit applies to the line-averaged electron density,

---------------------

## ASDEX New model
## ASDEX New model | `calculate_asdex_new_density_limit()`

Switch value: `i_density_limit = 8` [^5][^6]

Expand Down
3 changes: 3 additions & 0 deletions process/io/plot_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@ def plot_plasma(
axis.plot(pg.rs[0], pg.zs[0], color="black")
axis.plot(pg.rs[1], pg.zs[1], color="black")

axis.plot(pg.rs[0] + 0.005, pg.zs[0] + 0.005, color="red", linestyle="dashed")
axis.plot(pg.rs[1] + 0.005, pg.zs[1] + 0.005, color="red", linestyle="dashed")

# Set triang_95 to stop plotting plasma past boundary
# Assume IPDG scaling
triang_95 = triang / 1.5
Expand Down
5 changes: 4 additions & 1 deletion process/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
)
from process.log import logging_model_handler, show_errors
from process.pfcoil import PFCoil
from process.physics import DetailedPhysics, Physics, PlasmaBeta, PlasmaInductance
from process.physics import DetailedPhysics, Physics, PlasmaBeta, PlasmaInductance, PlasmaDensityLimit
from process.plasma_geometry import PlasmaGeom
from process.plasma_profiles import PlasmaProfile
from process.power import Power
Expand Down Expand Up @@ -684,11 +684,13 @@ def __init__(self):
)
self.plasma_beta = PlasmaBeta()
self.plasma_inductance = PlasmaInductance()
self.plasma_density_limit = PlasmaDensityLimit()
self.physics = Physics(
plasma_profile=self.plasma_profile,
current_drive=self.current_drive,
plasma_beta=self.plasma_beta,
plasma_inductance=self.plasma_inductance,
plasma_density_limit=self.plasma_density_limit,
)
self.physics_detailed = DetailedPhysics(
plasma_profile=self.plasma_profile,
Expand All @@ -707,6 +709,7 @@ def __init__(self):
neoclassics=self.neoclassics,
plasma_beta=self.plasma_beta,
plasma_inductance=self.plasma_inductance,
plasma_density_limit=self.plasma_density_limit,
)
self.dcll = DCLL(fw=self.fw)

Expand Down
Loading
Loading