Skip to content

Migrate default and simple configs to combined transport model. #2256

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
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate default and simple configs to combined transport model. #2256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion torax/_src/fvm/tests/calc_coeffs_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ def test_calc_coeffs_smoke_test(
solver=dict(
use_predictor_corrector=False, theta_implicit=theta_implicit
),
transport=dict(model_name='constant', chi_min=0, chi_i=1),
transport=dict(
model_name='combined',
transport_models=[dict(model_name='constant', chi_i=1)],
chi_min=0,
),
time_step_calculator=dict(),
)
)
Expand Down
18 changes: 15 additions & 3 deletions torax/_src/fvm/tests/fvm_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,11 @@ def test_nonlinear_solve_block_loss_minimum(
solver=dict(
use_predictor_corrector=False, theta_implicit=theta_implicit
),
transport=dict(model_name='constant', chi_min=0, chi_i=1),
transport=dict(
model_name='combined',
transport_models=[dict(model_name='constant', chi_i=1)],
chi_min=0,
),
time_step_calculator=dict(),
)
)
Expand Down Expand Up @@ -333,7 +337,11 @@ def test_implicit_solve_block_uses_updated_boundary_conditions(self):
pedestal=dict(),
sources=source_config,
solver=dict(use_predictor_corrector=False, theta_implicit=1.0),
transport=dict(model_name='constant', chi_min=0, chi_i=1),
transport=dict(
model_name='combined',
transport_models=[dict(model_name='constant', chi_i=1)],
chi_min=0,
),
time_step_calculator=dict(),
)
)
Expand Down Expand Up @@ -444,7 +452,11 @@ def test_theta_residual_uses_updated_boundary_conditions(self):
pedestal=dict(),
sources=source_config,
solver=dict(use_predictor_corrector=False, theta_implicit=0.0),
transport=dict(model_name='constant', chi_min=0, chi_i=1),
transport=dict(
model_name='combined',
transport_models=[dict(model_name='constant', chi_i=1)],
chi_min=0,
),
time_step_calculator=dict(),
)
)
Expand Down
5 changes: 4 additions & 1 deletion torax/examples/basic_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
},
'pedestal': {},
'transport': {
'model_name': 'constant',
'model_name': 'combined',
'transport_models': [
{'model_name': 'constant'},
],
},
'solver': {
'solver_type': 'linear',
Expand Down
33 changes: 18 additions & 15 deletions torax/examples/step_flattop_bgb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,24 @@
},
},
"transport": {
"model_name": "bohm-gyrobohm",
# BgB settings from [2] sec 3.3
# Tuning factor to achieve desired confinement
"chi_e_bohm_multiplier": bgb_multiplier,
"chi_i_bohm_multiplier": bgb_multiplier,
"chi_e_gyrobohm_multiplier": bgb_multiplier,
"chi_i_gyrobohm_multiplier": bgb_multiplier,
# Base coefficients
"chi_e_bohm_coeff": 0.01 * 2e-4,
"chi_e_gyrobohm_coeff": 50 * 5e-6,
"chi_i_bohm_coeff": 0.001 * 2e-4,
"chi_i_gyrobohm_coeff": 1.0 * 5e-6,
"D_face_c1": 1,
"D_face_c2": 0.3,
"V_face_coeff": -0.1,
"model_name": "combined",
"transport_models": [{
"model_name": "bohm-gyrobohm",
# BgB settings from [2] sec 3.3
# Tuning factor to achieve desired confinement
"chi_e_bohm_multiplier": bgb_multiplier,
"chi_i_bohm_multiplier": bgb_multiplier,
"chi_e_gyrobohm_multiplier": bgb_multiplier,
"chi_i_gyrobohm_multiplier": bgb_multiplier,
# Base coefficients
"chi_e_bohm_coeff": 0.01 * 2e-4,
"chi_e_gyrobohm_coeff": 50 * 5e-6,
"chi_i_bohm_coeff": 0.001 * 2e-4,
"chi_i_gyrobohm_coeff": 1.0 * 5e-6,
"D_face_c1": 1,
"D_face_c2": 0.3,
"V_face_coeff": -0.1,
}],
# Clipping
"chi_min": 0.15,
"chi_max": 100.0,
Expand Down
8 changes: 5 additions & 3 deletions torax/tests/test_data/compilation_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,12 @@
'n_e_ped': 1e20,
},
'transport': {
'model_name': 'qlknn',
'qlknn_params': {
'model_name': 'combined',
'transport_models': [{
'model_name': 'qlknn',
'DV_effective': False,
},
}],
'smoothing_width': 0.1,
},
'solver': {
'solver_type': 'newton_raphson',
Expand Down
5 changes: 4 additions & 1 deletion torax/tests/test_data/default_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
'ohmic': {},
},
'transport': {
'model_name': 'constant',
'model_name': 'combined',
'transport_models': [
{'model_name': 'constant'},
],
},
'pedestal': {},
'solver': {
Expand Down
Binary file modified torax/tests/test_data/test_all_transport_fusion_qlknn.nc
View file
Open in desktop
Binary file not shown.
8 changes: 6 additions & 2 deletions torax/tests/test_data/test_all_transport_fusion_qlknn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,12 @@
'n_e_ped': 1.0e20,
},
'transport': {
'model_name': 'qlknn',
'DV_effective': False,
'model_name': 'combined',
'transport_models': [{
'model_name': 'qlknn',
'DV_effective': False,
}],
'smoothing_width': 0.1,
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_bohmgyrobohm_all.nc
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion torax/tests/test_data/test_bohmgyrobohm_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@
'n_e_ped_is_fGW': True,
},
'transport': {
'model_name': 'bohm-gyrobohm',
'model_name': 'combined',
'transport_models': [{
'model_name': 'bohm-gyrobohm',
}],
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.nc
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,12 @@
'set_pedestal': True,
},
'transport': {
'model_name': 'constant',
'chi_i': 0.5,
'chi_e': 0.5,
'model_name': 'combined',
'transport_models': [{
'model_name': 'constant',
'chi_i': 0.5,
'chi_e': 0.5,
}],
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_chease.nc
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion torax/tests/test_data/test_chease.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@
},
'pedestal': {},
'transport': {
'model_name': 'constant',
'model_name': 'combined',
'transport_models': [{
'model_name': 'constant',
}],
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_combined_transport.nc
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion torax/tests/test_data/test_crank_nicolson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@
},
'pedestal': {},
'transport': {
'model_name': 'constant',
'model_name': 'combined',
'transport_models': [{
'model_name': 'constant',
}],
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_fixed_dt.nc
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion torax/tests/test_data/test_fixed_dt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@
'set_pedestal': True,
},
'transport': {
'model_name': 'qlknn',
'model_name': 'combined',
'transport_models': [{
'model_name': 'qlknn',
}],
'smoothing_width': 0.1,
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_implicit.nc
View file
Open in desktop
Binary file not shown.
Binary file modified torax/tests/test_data/test_implicit_short_optimizer.nc
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion torax/tests/test_data/test_implicit_short_optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
},
'pedestal': {},
'transport': {
'model_name': 'constant',
'model_name': 'combined',
'transport_models': [{
'model_name': 'constant',
}],
},
'solver': {
'solver_type': 'optimizer',
Expand Down
Binary file modified torax/tests/test_data/test_ne_qlknn_deff_veff.nc
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions torax/tests/test_data/test_ne_qlknn_deff_veff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,12 @@
'n_e_ped': 1.0e20,
},
'transport': {
'model_name': 'qlknn',
# qlknn params.
'DV_effective': True,
'model_name': 'combined',
'transport_models': [{
'model_name': 'qlknn',
'DV_effective': True,
}],
'smoothing_width': 0.1,
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_ne_qlknn_defromchie.nc
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions torax/tests/test_data/test_ne_qlknn_defromchie.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,12 @@
'n_e_ped': 1.0e20,
},
'transport': {
'model_name': 'qlknn',
# qlknn params.
'DV_effective': False,
'model_name': 'combined',
'transport_models': [{
'model_name': 'qlknn',
'DV_effective': False,
}],
'smoothing_width': 0.1,
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_particle_sources_cgm.nc
View file
Open in desktop
Binary file not shown.
10 changes: 6 additions & 4 deletions torax/tests/test_data/test_particle_sources_cgm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@
'n_e_ped': 1.0e20,
},
'transport': {
'model_name': 'CGM',
# cgm params.
'chi_D_ratio': 8,
'VR_D_ratio': {0: -3.0, 1: 0.0},
'model_name': 'combined',
'transport_models': [{
'model_name': 'CGM',
'chi_D_ratio': 8,
'VR_D_ratio': {0: -3.0, 1: 0.0},
}],
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_prescribed_generic_current_source.nc
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions torax/tests/test_data/test_prescribed_generic_current_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ def gaussian(r, center, width, amplitude):
},
'pedestal': {},
'transport': {
'model_name': 'constant',
# constant params.
# diffusion coefficient in electron density equation in m^2/s
'D_e': 0.5,
# convection coefficient in electron density equation in m^2/s
'V_e': -0.2,
'model_name': 'combined',
'transport_models': [{
'model_name': 'constant',
'D_e': 0.5,
'V_e': -0.2,
}],
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_prescribed_timedependent_ne.nc
View file
Open in desktop
Binary file not shown.
22 changes: 17 additions & 5 deletions torax/tests/test_data/test_prescribed_timedependent_ne.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,23 @@
'generic_current': {},
},
'transport': {
'model_name': 'qlknn',
'apply_inner_patch': True,
'chi_i_inner': 2.0,
'chi_e_inner': 2.0,
'rho_inner': 0.3,
'model_name': 'combined',
'transport_models': [
{
'model_name': 'qlknn',
'rho_min': 0.3,
},
# Inner patch
{
'model_name': 'constant',
'chi_i': 2.0,
'chi_e': 2.0,
'D_e': 0.2,
'V_e': 0.0,
'rho_max': 0.3,
},
],
'smoothing_width': 0.1,
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_prescribed_transport.nc
View file
Open in desktop
Binary file not shown.
31 changes: 16 additions & 15 deletions torax/tests/test_data/test_prescribed_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,20 @@
CONFIG = copy.deepcopy(default_config.CONFIG)

CONFIG['transport'] = {
# Note: prescribed transport is currently handled by ConstantTransportModel
# The name of this model will change in a future release
'model_name': 'constant',
'chi_i': (
np.array([0.0, 5.0]),
x,
1.5 * np.stack([chi_base_t1, chi_base_t2]),
),
'chi_e': (
np.array([0.0, 5.0]),
x,
np.stack([chi_base_t1, chi_base_t2]),
),
'D_e': 1.0,
'V_e': -0.33,
'model_name': 'combined',
'transport_models': [{
'model_name': 'constant',
'chi_i': (
np.array([0.0, 5.0]),
x,
1.5 * np.stack([chi_base_t1, chi_base_t2]),
),
'chi_e': (
np.array([0.0, 5.0]),
x,
np.stack([chi_base_t1, chi_base_t2]),
),
'D_e': 1.0,
'V_e': -0.33,
}],
}
Binary file modified torax/tests/test_data/test_psi_and_heat.nc
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion torax/tests/test_data/test_psi_and_heat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@
'set_pedestal': True,
},
'transport': {
'model_name': 'qlknn',
'model_name': 'combined',
'transport_models': [{
'model_name': 'qlknn',
}],
'smoothing_width': 0.1,
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_psi_heat_dens.nc
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions torax/tests/test_data/test_psi_heat_dens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
},
'pedestal': {'model_name': 'set_T_ped_n_ped', 'set_pedestal': True},
'transport': {
'model_name': 'constant',
# constant params.
# diffusion coefficient in electron density equation in m^2/s
'D_e': 0.5,
# convection coefficient in electron density equation in m^2/s
'V_e': -0.2,
'model_name': 'combined',
'transport_models': [{
'model_name': 'constant',
'D_e': 0.5,
'V_e': -0.2,
}],
},
'solver': {
'solver_type': 'linear',
Expand Down
Binary file modified torax/tests/test_data/test_psichease_ip_chease_vloop.nc
View file
Open in desktop
Binary file not shown.
Loading
Loading