diff --git a/torax/_src/fvm/tests/calc_coeffs_test.py b/torax/_src/fvm/tests/calc_coeffs_test.py index cefdd9643..57cc4b02e 100644 --- a/torax/_src/fvm/tests/calc_coeffs_test.py +++ b/torax/_src/fvm/tests/calc_coeffs_test.py @@ -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(), ) ) diff --git a/torax/_src/fvm/tests/fvm_test.py b/torax/_src/fvm/tests/fvm_test.py index 83d5c95a7..935fde4b3 100644 --- a/torax/_src/fvm/tests/fvm_test.py +++ b/torax/_src/fvm/tests/fvm_test.py @@ -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(), ) ) @@ -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(), ) ) @@ -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(), ) ) diff --git a/torax/examples/basic_config.py b/torax/examples/basic_config.py index 52f93b271..13d26aa70 100644 --- a/torax/examples/basic_config.py +++ b/torax/examples/basic_config.py @@ -41,7 +41,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [ + {'model_name': 'constant'}, + ], }, 'solver': { 'solver_type': 'linear', diff --git a/torax/examples/step_flattop_bgb.py b/torax/examples/step_flattop_bgb.py index 3815caec6..1338e7c83 100644 --- a/torax/examples/step_flattop_bgb.py +++ b/torax/examples/step_flattop_bgb.py @@ -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, diff --git a/torax/tests/test_data/compilation_benchmark.py b/torax/tests/test_data/compilation_benchmark.py index 417c3c477..34ba759ce 100644 --- a/torax/tests/test_data/compilation_benchmark.py +++ b/torax/tests/test_data/compilation_benchmark.py @@ -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', diff --git a/torax/tests/test_data/default_config.py b/torax/tests/test_data/default_config.py index 6a062c984..750bb899f 100644 --- a/torax/tests/test_data/default_config.py +++ b/torax/tests/test_data/default_config.py @@ -41,7 +41,10 @@ 'ohmic': {}, }, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [ + {'model_name': 'constant'}, + ], }, 'pedestal': {}, 'solver': { diff --git a/torax/tests/test_data/test_all_transport_fusion_qlknn.nc b/torax/tests/test_data/test_all_transport_fusion_qlknn.nc index 46a8e9c9a..35526d2c5 100644 Binary files a/torax/tests/test_data/test_all_transport_fusion_qlknn.nc and b/torax/tests/test_data/test_all_transport_fusion_qlknn.nc differ diff --git a/torax/tests/test_data/test_all_transport_fusion_qlknn.py b/torax/tests/test_data/test_all_transport_fusion_qlknn.py index d3f5a2270..210cdd55a 100644 --- a/torax/tests/test_data/test_all_transport_fusion_qlknn.py +++ b/torax/tests/test_data/test_all_transport_fusion_qlknn.py @@ -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', diff --git a/torax/tests/test_data/test_bohmgyrobohm_all.nc b/torax/tests/test_data/test_bohmgyrobohm_all.nc index 9760cd085..33206a6fd 100644 Binary files a/torax/tests/test_data/test_bohmgyrobohm_all.nc and b/torax/tests/test_data/test_bohmgyrobohm_all.nc differ diff --git a/torax/tests/test_data/test_bohmgyrobohm_all.py b/torax/tests/test_data/test_bohmgyrobohm_all.py index cfe69c75c..a8d89c9e0 100644 --- a/torax/tests/test_data/test_bohmgyrobohm_all.py +++ b/torax/tests/test_data/test_bohmgyrobohm_all.py @@ -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', diff --git a/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.nc b/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.nc index c6f09fa22..9560fb9fb 100644 Binary files a/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.nc and b/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.nc differ diff --git a/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.py b/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.py index 4787e2d64..474c4fde7 100644 --- a/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.py +++ b/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.py @@ -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', diff --git a/torax/tests/test_data/test_chease.nc b/torax/tests/test_data/test_chease.nc index ef688333b..47bd56fcc 100644 Binary files a/torax/tests/test_data/test_chease.nc and b/torax/tests/test_data/test_chease.nc differ diff --git a/torax/tests/test_data/test_chease.py b/torax/tests/test_data/test_chease.py index 3f5e5604c..4057a1e0d 100644 --- a/torax/tests/test_data/test_chease.py +++ b/torax/tests/test_data/test_chease.py @@ -64,7 +64,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [{ + 'model_name': 'constant', + }], }, 'solver': { 'solver_type': 'linear', diff --git a/torax/tests/test_data/test_combined_transport.nc b/torax/tests/test_data/test_combined_transport.nc index bea3301f5..54579c989 100644 Binary files a/torax/tests/test_data/test_combined_transport.nc and b/torax/tests/test_data/test_combined_transport.nc differ diff --git a/torax/tests/test_data/test_crank_nicolson.py b/torax/tests/test_data/test_crank_nicolson.py index 30e8e2702..db541f56a 100644 --- a/torax/tests/test_data/test_crank_nicolson.py +++ b/torax/tests/test_data/test_crank_nicolson.py @@ -47,7 +47,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [{ + 'model_name': 'constant', + }], }, 'solver': { 'solver_type': 'linear', diff --git a/torax/tests/test_data/test_fixed_dt.nc b/torax/tests/test_data/test_fixed_dt.nc index 841d5d61e..8ea247afb 100644 Binary files a/torax/tests/test_data/test_fixed_dt.nc and b/torax/tests/test_data/test_fixed_dt.nc differ diff --git a/torax/tests/test_data/test_fixed_dt.py b/torax/tests/test_data/test_fixed_dt.py index e23362777..0c8037221 100644 --- a/torax/tests/test_data/test_fixed_dt.py +++ b/torax/tests/test_data/test_fixed_dt.py @@ -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', diff --git a/torax/tests/test_data/test_implicit.nc b/torax/tests/test_data/test_implicit.nc index 335118cb3..524056e35 100644 Binary files a/torax/tests/test_data/test_implicit.nc and b/torax/tests/test_data/test_implicit.nc differ diff --git a/torax/tests/test_data/test_implicit_short_optimizer.nc b/torax/tests/test_data/test_implicit_short_optimizer.nc index b14f4184d..1c145702e 100644 Binary files a/torax/tests/test_data/test_implicit_short_optimizer.nc and b/torax/tests/test_data/test_implicit_short_optimizer.nc differ diff --git a/torax/tests/test_data/test_implicit_short_optimizer.py b/torax/tests/test_data/test_implicit_short_optimizer.py index 3168e49ef..bb5ac0b72 100644 --- a/torax/tests/test_data/test_implicit_short_optimizer.py +++ b/torax/tests/test_data/test_implicit_short_optimizer.py @@ -41,7 +41,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [{ + 'model_name': 'constant', + }], }, 'solver': { 'solver_type': 'optimizer', diff --git a/torax/tests/test_data/test_ne_qlknn_deff_veff.nc b/torax/tests/test_data/test_ne_qlknn_deff_veff.nc index e0c0aab22..cc648b4e4 100644 Binary files a/torax/tests/test_data/test_ne_qlknn_deff_veff.nc and b/torax/tests/test_data/test_ne_qlknn_deff_veff.nc differ diff --git a/torax/tests/test_data/test_ne_qlknn_deff_veff.py b/torax/tests/test_data/test_ne_qlknn_deff_veff.py index 60af329dd..902eb8606 100644 --- a/torax/tests/test_data/test_ne_qlknn_deff_veff.py +++ b/torax/tests/test_data/test_ne_qlknn_deff_veff.py @@ -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', diff --git a/torax/tests/test_data/test_ne_qlknn_defromchie.nc b/torax/tests/test_data/test_ne_qlknn_defromchie.nc index b7b6e6591..3869bc0ae 100644 Binary files a/torax/tests/test_data/test_ne_qlknn_defromchie.nc and b/torax/tests/test_data/test_ne_qlknn_defromchie.nc differ diff --git a/torax/tests/test_data/test_ne_qlknn_defromchie.py b/torax/tests/test_data/test_ne_qlknn_defromchie.py index 34a46ee57..3dad2c1f2 100644 --- a/torax/tests/test_data/test_ne_qlknn_defromchie.py +++ b/torax/tests/test_data/test_ne_qlknn_defromchie.py @@ -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', diff --git a/torax/tests/test_data/test_particle_sources_cgm.nc b/torax/tests/test_data/test_particle_sources_cgm.nc index 313be442e..fc179989b 100644 Binary files a/torax/tests/test_data/test_particle_sources_cgm.nc and b/torax/tests/test_data/test_particle_sources_cgm.nc differ diff --git a/torax/tests/test_data/test_particle_sources_cgm.py b/torax/tests/test_data/test_particle_sources_cgm.py index a59b006d1..e21b2831d 100644 --- a/torax/tests/test_data/test_particle_sources_cgm.py +++ b/torax/tests/test_data/test_particle_sources_cgm.py @@ -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', diff --git a/torax/tests/test_data/test_prescribed_generic_current_source.nc b/torax/tests/test_data/test_prescribed_generic_current_source.nc index 8ff4278c1..c39331ace 100644 Binary files a/torax/tests/test_data/test_prescribed_generic_current_source.nc and b/torax/tests/test_data/test_prescribed_generic_current_source.nc differ diff --git a/torax/tests/test_data/test_prescribed_generic_current_source.py b/torax/tests/test_data/test_prescribed_generic_current_source.py index 6391c48b8..c26fe9253 100644 --- a/torax/tests/test_data/test_prescribed_generic_current_source.py +++ b/torax/tests/test_data/test_prescribed_generic_current_source.py @@ -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', diff --git a/torax/tests/test_data/test_prescribed_timedependent_ne.nc b/torax/tests/test_data/test_prescribed_timedependent_ne.nc index 6e42b66ba..25d173aa9 100644 Binary files a/torax/tests/test_data/test_prescribed_timedependent_ne.nc and b/torax/tests/test_data/test_prescribed_timedependent_ne.nc differ diff --git a/torax/tests/test_data/test_prescribed_timedependent_ne.py b/torax/tests/test_data/test_prescribed_timedependent_ne.py index 46dff08bc..c11f80f66 100644 --- a/torax/tests/test_data/test_prescribed_timedependent_ne.py +++ b/torax/tests/test_data/test_prescribed_timedependent_ne.py @@ -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', diff --git a/torax/tests/test_data/test_prescribed_transport.nc b/torax/tests/test_data/test_prescribed_transport.nc index 6221101b5..1bb8d8254 100644 Binary files a/torax/tests/test_data/test_prescribed_transport.nc and b/torax/tests/test_data/test_prescribed_transport.nc differ diff --git a/torax/tests/test_data/test_prescribed_transport.py b/torax/tests/test_data/test_prescribed_transport.py index ff9ab4372..0bad7f1a4 100644 --- a/torax/tests/test_data/test_prescribed_transport.py +++ b/torax/tests/test_data/test_prescribed_transport.py @@ -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, + }], } diff --git a/torax/tests/test_data/test_psi_and_heat.nc b/torax/tests/test_data/test_psi_and_heat.nc index c64e3412a..5acc23930 100644 Binary files a/torax/tests/test_data/test_psi_and_heat.nc and b/torax/tests/test_data/test_psi_and_heat.nc differ diff --git a/torax/tests/test_data/test_psi_and_heat.py b/torax/tests/test_data/test_psi_and_heat.py index 3a4b5356b..758f6c516 100644 --- a/torax/tests/test_data/test_psi_and_heat.py +++ b/torax/tests/test_data/test_psi_and_heat.py @@ -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', diff --git a/torax/tests/test_data/test_psi_heat_dens.nc b/torax/tests/test_data/test_psi_heat_dens.nc index 30f617098..32f06ca66 100644 Binary files a/torax/tests/test_data/test_psi_heat_dens.nc and b/torax/tests/test_data/test_psi_heat_dens.nc differ diff --git a/torax/tests/test_data/test_psi_heat_dens.py b/torax/tests/test_data/test_psi_heat_dens.py index 8c6efa143..13a4689ad 100644 --- a/torax/tests/test_data/test_psi_heat_dens.py +++ b/torax/tests/test_data/test_psi_heat_dens.py @@ -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', diff --git a/torax/tests/test_data/test_psichease_ip_chease_vloop.nc b/torax/tests/test_data/test_psichease_ip_chease_vloop.nc index c7a7e2811..acf600f33 100644 Binary files a/torax/tests/test_data/test_psichease_ip_chease_vloop.nc and b/torax/tests/test_data/test_psichease_ip_chease_vloop.nc differ diff --git a/torax/tests/test_data/test_psichease_ip_chease_vloop.py b/torax/tests/test_data/test_psichease_ip_chease_vloop.py index cde3bcfe7..5602949a1 100644 --- a/torax/tests/test_data/test_psichease_ip_chease_vloop.py +++ b/torax/tests/test_data/test_psichease_ip_chease_vloop.py @@ -51,7 +51,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [{ + 'model_name': 'constant', + }], }, 'solver': { 'solver_type': 'linear', diff --git a/torax/tests/test_data/test_psichease_ip_parameters_vloop_varying.nc b/torax/tests/test_data/test_psichease_ip_parameters_vloop_varying.nc index 862748a0b..ad34f4770 100644 Binary files a/torax/tests/test_data/test_psichease_ip_parameters_vloop_varying.nc and b/torax/tests/test_data/test_psichease_ip_parameters_vloop_varying.nc differ diff --git a/torax/tests/test_data/test_psichease_ip_parameters_vloop_varying.py b/torax/tests/test_data/test_psichease_ip_parameters_vloop_varying.py index 582b9d336..1ba735ae5 100644 --- a/torax/tests/test_data/test_psichease_ip_parameters_vloop_varying.py +++ b/torax/tests/test_data/test_psichease_ip_parameters_vloop_varying.py @@ -59,7 +59,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [{ + 'model_name': 'constant', + }], }, 'solver': { 'solver_type': 'linear', diff --git a/torax/tests/test_data/test_psichease_prescribed_johm.nc b/torax/tests/test_data/test_psichease_prescribed_johm.nc index fd40b79c0..c88fdf1df 100644 Binary files a/torax/tests/test_data/test_psichease_prescribed_johm.nc and b/torax/tests/test_data/test_psichease_prescribed_johm.nc differ diff --git a/torax/tests/test_data/test_psichease_prescribed_johm.py b/torax/tests/test_data/test_psichease_prescribed_johm.py index be4dc6df7..0767066df 100644 --- a/torax/tests/test_data/test_psichease_prescribed_johm.py +++ b/torax/tests/test_data/test_psichease_prescribed_johm.py @@ -49,7 +49,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [{ + 'model_name': 'constant', + }], }, 'solver': { 'solver_type': 'linear', diff --git a/torax/tests/test_data/test_psichease_prescribed_jtot.nc b/torax/tests/test_data/test_psichease_prescribed_jtot.nc index bf7d63699..bc18350ad 100644 Binary files a/torax/tests/test_data/test_psichease_prescribed_jtot.nc and b/torax/tests/test_data/test_psichease_prescribed_jtot.nc differ diff --git a/torax/tests/test_data/test_psichease_prescribed_jtot.py b/torax/tests/test_data/test_psichease_prescribed_jtot.py index 209e61c75..008155513 100644 --- a/torax/tests/test_data/test_psichease_prescribed_jtot.py +++ b/torax/tests/test_data/test_psichease_prescribed_jtot.py @@ -49,7 +49,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'constant', + 'model_name': 'combined', + 'transport_models': [{ + 'model_name': 'constant', + }], }, 'solver': { 'solver_type': 'linear', diff --git a/torax/tests/test_data/test_psichease_prescribed_jtot_vloop.nc b/torax/tests/test_data/test_psichease_prescribed_jtot_vloop.nc index ea176fe82..7d2a723ac 100644 Binary files a/torax/tests/test_data/test_psichease_prescribed_jtot_vloop.nc and b/torax/tests/test_data/test_psichease_prescribed_jtot_vloop.nc differ diff --git a/torax/tests/test_data/test_semiimplicit_convection.nc b/torax/tests/test_data/test_semiimplicit_convection.nc index 7ecfea2a9..190acafd3 100644 Binary files a/torax/tests/test_data/test_semiimplicit_convection.nc and b/torax/tests/test_data/test_semiimplicit_convection.nc differ diff --git a/torax/tests/test_data/test_semiimplicit_convection.py b/torax/tests/test_data/test_semiimplicit_convection.py index e14e00762..09de98fb8 100644 --- a/torax/tests/test_data/test_semiimplicit_convection.py +++ b/torax/tests/test_data/test_semiimplicit_convection.py @@ -37,7 +37,10 @@ }, 'pedestal': {}, 'transport': { - 'model_name': 'CGM', + 'model_name': 'combined', + 'transport_models': [{ + 'model_name': 'CGM', + }], }, 'solver': { 'solver_type': 'linear', diff --git a/torax/tests/test_data/test_step_flattop_bgb.nc b/torax/tests/test_data/test_step_flattop_bgb.nc index 363cf21f0..5e902691e 100644 Binary files a/torax/tests/test_data/test_step_flattop_bgb.nc and b/torax/tests/test_data/test_step_flattop_bgb.nc differ diff --git a/torax/tests/test_data/test_timedependence.nc b/torax/tests/test_data/test_timedependence.nc index 91546bcf6..72b5f1dce 100644 Binary files a/torax/tests/test_data/test_timedependence.nc and b/torax/tests/test_data/test_timedependence.nc differ diff --git a/torax/tests/test_data/test_timedependence.py b/torax/tests/test_data/test_timedependence.py index 2b401bc81..7afdab99e 100644 --- a/torax/tests/test_data/test_timedependence.py +++ b/torax/tests/test_data/test_timedependence.py @@ -67,11 +67,23 @@ 'T_e_ped': {0: 2, 4: 2, 6: 5, 8: 4}, }, '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',