Remove radas git hash from regression result

Was actually pointing to POPCON hash

Author: tbody-cfs

cfspopcon/formulas/atomic_data/atomic_data.py

@@ -45,7 +45,6 @@ def __init__(self, atomic_data_directory: Path = Path() / "radas_dir") -> None:
 
         self.species_ne_tau: dict[AtomicSpecies, xr.DataArray] = dict()
         self.ne_tau_units = ureg.m**-3 * ureg.s
-        self.radas_git_hash: str = ""
 
         for species in self.available_species:
             dataset = self[species]
@@ -65,18 +64,6 @@ def __init__(self, atomic_data_directory: Path = Path() / "radas_dir") -> None:
                 self.noncoronal_Lz_interpolators[(species, ne_tau)] = CoeffInterpolator(subds.equilibrium_Lz, **ref)
                 self.noncoronal_Z_interpolators[(species, ne_tau)] = CoeffInterpolator(subds.equilibrium_mean_charge_state, **ref)
 
-            self._check_radas_git_hash(dataset.git_hash)
-
-    def _check_radas_git_hash(self, test_git_hash: str) -> None:
-        """Check that all of the datasets have the same git hash."""
-        if self.radas_git_hash == "":
-            self.radas_git_hash = test_git_hash
-        elif self.radas_git_hash != test_git_hash:
-            warnings.warn(
-                f"Found multiple radas git hashes ({self.radas_git_hash} != {test_git_hash}) in the requested atomic data. Will set radas_git_hash = UNDEFINED.",
-                stacklevel=2,
-            )
-
     @staticmethod
     def read_atomic_data(atomic_data_directory: Path = Path() / "radas_dir") -> dict[AtomicSpecies, xr.Dataset]:
         """Reads atomic data from netCDF files located in the specified directory.
@@ -203,8 +190,8 @@ def get_noncoronal_Z_interpolator(
         return self.noncoronal_Z_interpolators[(self.key_to_enum(species), ne_tau)]
 
 
-@Algorithm.register_algorithm(return_keys=["atomic_data", "radas_git_hash"])
-def read_atomic_data(radas_dir: Path) -> tuple[AtomicData, str]:
+@Algorithm.register_algorithm(return_keys=["atomic_data"])
+def read_atomic_data(radas_dir: Path) -> AtomicData:
     """Construct an AtomicData interface using the atomic data in the specified directory."""
     atomic_data = AtomicData(get_item(radas_dir))
-    return atomic_data, atomic_data.radas_git_hash
+    return atomic_data

cfspopcon/variables.yaml

@@ -1481,13 +1481,6 @@ radas_dir:
   set_by: []
   used_by:
   - read_atomic_data
-radas_git_hash:
-  default_units: null
-  description:
-  - Git hash for the version of radas used to construct the atomic data files.
-  set_by:
-  - read_atomic_data
-  used_by: []
 radiated_power_method:
   default_units: null
   description:

docs/doc_sources/physics_glossary.rst

@@ -422,9 +422,6 @@ Physics Glossary
   radas_dir
     A path to the `radas <https://github.com/cfs-energy/radas>`_ working directory.
 
-  radas_git_hash
-    Git hash for the version of radas used to construct the atomic data files.
-
   radiated_power_method
     A :class:`~cfspopcon.named_options.RadiationMethod` indicating how we should calculate the power radiated from the confined region.
 

tests/regression_results/PRD.json

@@ -1062,11 +1062,6 @@
             "data": 3.290275716,
             "dims": []
         },
-        "radas_git_hash": {
-            "attrs": {},
-            "data": "9741acc",
-            "dims": []
-        },
         "radiated_power_method": {
             "attrs": {},
             "data": "Radas",

tests/regression_results/SPARC_PRD_result.nc

@@ -140,12 +140,3 @@ def test_get_functions_with_missing_ne_tau(atomic_data, species, ne_tau):
 
     with pytest.raises(KeyError):
         atomic_data.get_noncoronal_Z_interpolator(species, ne_tau, ne_tau_rel_tolerance=1e-2)
-
-
-def test_get_git_hash(atomic_data):
-    atomic_data._check_radas_git_hash(atomic_data.radas_git_hash)
-
-    with pytest.warns(UserWarning):
-        atomic_data._check_radas_git_hash("git hashes don't have spaces in them.")
-
-    assert atomic_data.radas_git_hash == atomic_data["hydrogen"].git_hash == atomic_data["helium"].git_hash