Update default isotope mix to 50-50 DT with correct masses.

Minor modifications to test cases. Relative differences are O(1e-4) level. Precursor to refactor setting Ai, Aimp based on constants.ION_PROPERTIES. The refactor should now pass the tests. PiperOrigin-RevId: 713340227
google-deepmind · Jan 8, 2025 · a54a177 · a54a177
1 parent f27552c
commit a54a177
Show file tree

Hide file tree

Showing 50 changed files with 10 additions and 10 deletions.
diff --git a/torax/config/plasma_composition.py b/torax/config/plasma_composition.py
@@ -37,7 +37,7 @@ class PlasmaComposition(
   """Configuration for the plasma composition."""
 
   # amu of main ion (if multiple isotope, make average)
-  Ai: float = 2.5
+  Ai: float = 2.51505
   # charge of main ion
   Zi: float = 1.0
   # needed for qlknn and fusion power

diff --git a/torax/tests/test_data/test_all_transport_crank_nicolson.nc b/torax/tests/test_data/test_all_transport_crank_nicolson.nc
diff --git a/torax/tests/test_data/test_all_transport_fusion_qlknn.nc b/torax/tests/test_data/test_all_transport_fusion_qlknn.nc
diff --git a/torax/tests/test_data/test_bohmgyrobohm_all.nc b/torax/tests/test_data/test_bohmgyrobohm_all.nc
diff --git a/torax/tests/test_data/test_bootstrap.nc b/torax/tests/test_data/test_bootstrap.nc
diff --git a/torax/tests/test_data/test_bremsstrahlung.nc b/torax/tests/test_data/test_bremsstrahlung.nc
diff --git a/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.nc b/torax/tests/test_data/test_bremsstrahlung_time_dependent_Zimp.nc
diff --git a/torax/tests/test_data/test_cgmheat.nc b/torax/tests/test_data/test_cgmheat.nc
diff --git a/torax/tests/test_data/test_changing_config_after.nc b/torax/tests/test_data/test_changing_config_after.nc
diff --git a/torax/tests/test_data/test_changing_config_after.py b/torax/tests/test_data/test_changing_config_after.py
@@ -19,7 +19,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.8,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862.

diff --git a/torax/tests/test_data/test_changing_config_before.nc b/torax/tests/test_data/test_changing_config_before.nc
diff --git a/torax/tests/test_data/test_changing_config_before.py b/torax/tests/test_data/test_changing_config_before.py
@@ -19,7 +19,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.6,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862.

diff --git a/torax/tests/test_data/test_fixed_dt.nc b/torax/tests/test_data/test_fixed_dt.nc
diff --git a/torax/tests/test_data/test_fusion_power.nc b/torax/tests/test_data/test_fusion_power.nc
diff --git a/torax/tests/test_data/test_iterbaseline_mockup.nc b/torax/tests/test_data/test_iterbaseline_mockup.nc
diff --git a/torax/tests/test_data/test_iterbaseline_mockup.py b/torax/tests/test_data/test_iterbaseline_mockup.py
@@ -19,7 +19,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.74,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862

diff --git a/torax/tests/test_data/test_iterhybrid_mockup.nc b/torax/tests/test_data/test_iterhybrid_mockup.nc
diff --git a/torax/tests/test_data/test_iterhybrid_mockup.py b/torax/tests/test_data/test_iterhybrid_mockup.py
@@ -19,7 +19,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.6,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862.

diff --git a/torax/tests/test_data/test_iterhybrid_newton.nc b/torax/tests/test_data/test_iterhybrid_newton.nc
diff --git a/torax/tests/test_data/test_iterhybrid_newton.py b/torax/tests/test_data/test_iterhybrid_newton.py
@@ -23,7 +23,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.6,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862.

diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector.nc b/torax/tests/test_data/test_iterhybrid_predictor_corrector.nc
diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector.py b/torax/tests/test_data/test_iterhybrid_predictor_corrector.py
@@ -19,7 +19,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.6,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862.

diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector_clip_inputs.nc b/torax/tests/test_data/test_iterhybrid_predictor_corrector_clip_inputs.nc
diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector_cyclotron.nc b/torax/tests/test_data/test_iterhybrid_predictor_corrector_cyclotron.nc
diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector_ec_linliu.nc b/torax/tests/test_data/test_iterhybrid_predictor_corrector_ec_linliu.nc
diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector_eqdsk.nc b/torax/tests/test_data/test_iterhybrid_predictor_corrector_eqdsk.nc
diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector_impurity_radiation.nc b/torax/tests/test_data/test_iterhybrid_predictor_corrector_impurity_radiation.nc
diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector_qualikiz.py b/torax/tests/test_data/test_iterhybrid_predictor_corrector_qualikiz.py
@@ -18,7 +18,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.6,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862.

diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector_zeffprofile.nc b/torax/tests/test_data/test_iterhybrid_predictor_corrector_zeffprofile.nc
diff --git a/torax/tests/test_data/test_iterhybrid_predictor_corrector_zi2.nc b/torax/tests/test_data/test_iterhybrid_predictor_corrector_zi2.nc
diff --git a/torax/tests/test_data/test_iterhybrid_rampup.nc b/torax/tests/test_data/test_iterhybrid_rampup.nc
diff --git a/torax/tests/test_data/test_iterhybrid_rampup.py b/torax/tests/test_data/test_iterhybrid_rampup.py
@@ -23,7 +23,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.6,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862.

diff --git a/torax/tests/test_data/test_iterhybrid_rampup_short.py b/torax/tests/test_data/test_iterhybrid_rampup_short.py
@@ -31,7 +31,7 @@
     'runtime_params': {
         'plasma_composition': {
             # physical inputs
-            'Ai': 2.5,  # amu of main ion (if multiple isotope, make average)
+            'Ai': 2.51505,  # amu of main ion (bundled isotope average)
             'Zeff': 1.6,  # needed for qlknn and fusion power
             # effective impurity charge state assumed for matching
             # dilution=0.862.

diff --git a/torax/tests/test_data/test_ne_qlknn_deff_veff.nc b/torax/tests/test_data/test_ne_qlknn_deff_veff.nc
diff --git a/torax/tests/test_data/test_ne_qlknn_defromchie.nc b/torax/tests/test_data/test_ne_qlknn_defromchie.nc
diff --git a/torax/tests/test_data/test_ohmic_power.nc b/torax/tests/test_data/test_ohmic_power.nc
diff --git a/torax/tests/test_data/test_particle_sources_cgm.nc b/torax/tests/test_data/test_particle_sources_cgm.nc
diff --git a/torax/tests/test_data/test_particle_sources_constant.nc b/torax/tests/test_data/test_particle_sources_constant.nc
diff --git a/torax/tests/test_data/test_pc_method_ne.nc b/torax/tests/test_data/test_pc_method_ne.nc
diff --git a/torax/tests/test_data/test_pedestal.nc b/torax/tests/test_data/test_pedestal.nc
diff --git a/torax/tests/test_data/test_prescribed_generic_current_source.nc b/torax/tests/test_data/test_prescribed_generic_current_source.nc
diff --git a/torax/tests/test_data/test_prescribed_timedependent_ne.nc b/torax/tests/test_data/test_prescribed_timedependent_ne.nc
diff --git a/torax/tests/test_data/test_psi_and_heat.nc b/torax/tests/test_data/test_psi_and_heat.nc
diff --git a/torax/tests/test_data/test_psi_heat_dens.nc b/torax/tests/test_data/test_psi_heat_dens.nc
diff --git a/torax/tests/test_data/test_qei.nc b/torax/tests/test_data/test_qei.nc
diff --git a/torax/tests/test_data/test_qei_chease_highdens.nc b/torax/tests/test_data/test_qei_chease_highdens.nc
diff --git a/torax/tests/test_data/test_qlknnheat.nc b/torax/tests/test_data/test_qlknnheat.nc
diff --git a/torax/tests/test_data/test_semiimplicit_convection.nc b/torax/tests/test_data/test_semiimplicit_convection.nc
diff --git a/torax/tests/test_data/test_time_dependent_circular_geo.nc b/torax/tests/test_data/test_time_dependent_circular_geo.nc
diff --git a/torax/tests/test_data/test_timedependence.nc b/torax/tests/test_data/test_timedependence.nc