Fix naming

lanl · Sep 28, 2024 · 5d180ee · 5d180ee
1 parent 6d3317d
commit 5d180ee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/singularity-opac/neutrinos/mean_opacity_neutrinos.hpp b/singularity-opac/neutrinos/mean_opacity_neutrinos.hpp
@@ -220,8 +220,9 @@ class MeanOpacity {
 
 } // namespace impl
 
+using MeanOpacityBase = impl::MeanOpacity;
 using MeanOpacity =
-    impl::MeanVariant<impl::MeanOpacity, MeanNonCGSUnits<impl::MeanOpacity>>;
+    impl::MeanVariant<MeanOpacityBase, MeanNonCGSUnits<MeanOpacityBase>>;
 
 } // namespace neutrinos
 } // namespace singularity

diff --git a/singularity-opac/photons/mean_opacity_photons.hpp b/singularity-opac/photons/mean_opacity_photons.hpp
@@ -196,8 +196,9 @@ class MeanOpacity {
 
 } // namespace impl
 
+using MeanOpacityBase = impl::MeanOpacity;
 using MeanOpacity =
-    impl::MeanVariant<impl::MeanOpacity, MeanNonCGSUnits<impl::MeanOpacity>>;
+    impl::MeanVariant<MeanOpacityBase, MeanNonCGSUnits<MeanOpacityBase>>;
 
 } // namespace photons
 } // namespace singularity

diff --git a/test/test_mean_opacities.cpp b/test/test_mean_opacities.cpp
@@ -87,7 +87,7 @@ TEST_CASE("Mean neutrino opacities", "[MeanNeutrinos]") {
     neutrinos::Gray opac_host(kappa);
     neutrinos::Opacity opac = opac_host.GetOnDevice();
 
-    neutrinos::MeanOpacity mean_opac_host = neutrinos::impl::MeanOpacity(
+    neutrinos::MeanOpacity mean_opac_host = neutrinos::MeanOpacityBase(
         opac_host, lRhoMin, lRhoMax, NRho, lTMin, lTMax, NT, YeMin, YeMax, NYe);
     auto mean_opac = mean_opac_host.GetOnDevice();
 
@@ -412,7 +412,7 @@ TEST_CASE("Mean photon opacities", "[MeanPhotons]") {
     photons::Gray opac_host(kappa);
     photons::Opacity opac = opac_host.GetOnDevice();
 
-    photons::MeanOpacity mean_opac_host = photons::impl::MeanOpacity(
+    photons::MeanOpacity mean_opac_host = photons::MeanOpacityBase(
         opac_host, lRhoMin, lRhoMax, NRho, lTMin, lTMax, NT);
     auto mean_opac = mean_opac_host.GetOnDevice();
 
@@ -448,7 +448,7 @@ TEST_CASE("Mean photon opacities", "[MeanPhotons]") {
     THEN("We can save to disk and reload") {
       mean_opac.Save(grayname);
       photons::MeanOpacity mean_opac_host_load =
-          photons::impl::MeanOpacity(grayname);
+          photons::MeanOpacityBase(grayname);
       AND_THEN("The reloaded table matches the gray opacities") {
 
         auto mean_opac_load = mean_opac_host_load.GetOnDevice();