From eaa6f3eaaa5bb8086bf905f7f3336c2ac9042064 Mon Sep 17 00:00:00 2001 From: Philippe Hamel Date: Wed, 11 Sep 2024 06:58:25 -0700 Subject: [PATCH] Remove coll_mult from configs. We are using the default value, so no need to set it explicitly. PiperOrigin-RevId: 673375813 --- docs/configuration.rst | 1 - torax/examples/iterhybrid_predictor_corrector.py | 1 - torax/examples/iterhybrid_rampup.py | 1 - torax/tests/test_data/test_changing_config_after.py | 1 - torax/tests/test_data/test_changing_config_before.py | 1 - torax/tests/test_data/test_iterbaseline_mockup.py | 1 - torax/tests/test_data/test_iterhybrid_mockup.py | 1 - torax/tests/test_data/test_iterhybrid_newton.py | 1 - torax/tests/test_data/test_iterhybrid_predictor_corrector.py | 1 - torax/tests/test_data/test_iterhybrid_rampup.py | 1 - torax/tests/test_data/test_iterhybrid_rampup_short.py | 1 - 11 files changed, 11 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 0a8901d1..e60e7692 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -1169,7 +1169,6 @@ The configuration file is also available in ``torax/examples/iterhybrid_rampup.p 'smoothing_sigma': 0.1, 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, 'include_TEM': True, 'include_ETG': True, diff --git a/torax/examples/iterhybrid_predictor_corrector.py b/torax/examples/iterhybrid_predictor_corrector.py index 5331feef..78b0b910 100644 --- a/torax/examples/iterhybrid_predictor_corrector.py +++ b/torax/examples/iterhybrid_predictor_corrector.py @@ -162,7 +162,6 @@ 'Demin': 0.05, # minimum electron diffusivity 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off diff --git a/torax/examples/iterhybrid_rampup.py b/torax/examples/iterhybrid_rampup.py index a639187d..eac9e0d1 100644 --- a/torax/examples/iterhybrid_rampup.py +++ b/torax/examples/iterhybrid_rampup.py @@ -173,7 +173,6 @@ 'smoothing_sigma': 0.1, 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off diff --git a/torax/tests/test_data/test_changing_config_after.py b/torax/tests/test_data/test_changing_config_after.py index 7b689963..3b794bbc 100644 --- a/torax/tests/test_data/test_changing_config_after.py +++ b/torax/tests/test_data/test_changing_config_after.py @@ -162,7 +162,6 @@ 'Demin': 0.05, # minimum electron diffusivity 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off diff --git a/torax/tests/test_data/test_changing_config_before.py b/torax/tests/test_data/test_changing_config_before.py index ed6f1c52..ae93b0f7 100644 --- a/torax/tests/test_data/test_changing_config_before.py +++ b/torax/tests/test_data/test_changing_config_before.py @@ -162,7 +162,6 @@ 'Demin': 0.05, # minimum electron diffusivity 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off diff --git a/torax/tests/test_data/test_iterbaseline_mockup.py b/torax/tests/test_data/test_iterbaseline_mockup.py index f5d3e58d..d5b7158b 100644 --- a/torax/tests/test_data/test_iterbaseline_mockup.py +++ b/torax/tests/test_data/test_iterbaseline_mockup.py @@ -153,7 +153,6 @@ 'Demin': 0.05, # minimum electron diffusivity 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle ITG modes on or off 'include_ETG': True, # to toggle ITG modes on or off diff --git a/torax/tests/test_data/test_iterhybrid_mockup.py b/torax/tests/test_data/test_iterhybrid_mockup.py index 2f805bcc..c674a5a7 100644 --- a/torax/tests/test_data/test_iterhybrid_mockup.py +++ b/torax/tests/test_data/test_iterhybrid_mockup.py @@ -155,7 +155,6 @@ 'Demin': 0.05, # minimum electron diffusivity 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off diff --git a/torax/tests/test_data/test_iterhybrid_newton.py b/torax/tests/test_data/test_iterhybrid_newton.py index aed6037a..9f69a935 100644 --- a/torax/tests/test_data/test_iterhybrid_newton.py +++ b/torax/tests/test_data/test_iterhybrid_newton.py @@ -169,7 +169,6 @@ 'Vemax': 10, # minimum electron convection 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector.py b/torax/tests/test_data/test_iterhybrid_predictor_corrector.py index 5331feef..78b0b910 100644 --- a/torax/tests/test_data/test_iterhybrid_predictor_corrector.py +++ b/torax/tests/test_data/test_iterhybrid_predictor_corrector.py @@ -162,7 +162,6 @@ 'Demin': 0.05, # minimum electron diffusivity 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off diff --git a/torax/tests/test_data/test_iterhybrid_rampup.py b/torax/tests/test_data/test_iterhybrid_rampup.py index a639187d..eac9e0d1 100644 --- a/torax/tests/test_data/test_iterhybrid_rampup.py +++ b/torax/tests/test_data/test_iterhybrid_rampup.py @@ -173,7 +173,6 @@ 'smoothing_sigma': 0.1, 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off diff --git a/torax/tests/test_data/test_iterhybrid_rampup_short.py b/torax/tests/test_data/test_iterhybrid_rampup_short.py index a243674c..15377c12 100644 --- a/torax/tests/test_data/test_iterhybrid_rampup_short.py +++ b/torax/tests/test_data/test_iterhybrid_rampup_short.py @@ -172,7 +172,6 @@ 'smoothing_sigma': 0.1, 'qlknn_params': { 'DVeff': True, - 'coll_mult': 0.25, 'include_ITG': True, # to toggle ITG modes on or off 'include_TEM': True, # to toggle TEM modes on or off 'include_ETG': True, # to toggle ETG modes on or off