fused macro, as suggested by Adam

Author: jonahm-LANL

singularity-eos/eos/eos_base.hpp

@@ -185,6 +185,12 @@ char *StrCat(char *destination, const char *source) {
       const {                                                                            \
     NAME(IN1, IN2, OUT, num, std::forward<LambdaIndexer>(lambdas));                      \
   }
+// This one does both BlahFromDensityTemperature and
+// BlahFromDensityInternalEnergy at once. Not always useful. But
+// frequently is.
+#define SG_EOS_VEC_FOR(OUTNAME)                                                          \
+  SG_EOS_VEC_2IN_1OUT(OUTNAME##FromDensityTemperature, rhos, temperatures, OUTNAME##s)   \
+  SG_EOS_VEC_2IN_1OUT(OUTNAME##FromDensityInternalEnergy, rhos, sies, OUTNAME##s)
 
 class Factor {
   Real value_ = 1.0;
@@ -372,8 +378,7 @@ class EosBase {
   // Vector member functions
   SG_EOS_VEC_2IN_1OUT(TemperatureFromDensityInternalEnergy, rhos, sies, temperatures)
   SG_EOS_VEC_2IN_1OUT(InternalEnergyFromDensityTemperature, rhos, temperatures, sies)
-  SG_EOS_VEC_2IN_1OUT(PressureFromDensityTemperature, rhos, temperatures, pressures)
-  SG_EOS_VEC_2IN_1OUT(PressureFromDensityInternalEnergy, rhos, sies, pressures)
+  SG_EOS_VEC_FOR(Pressure)
 
   /// This is sort of what the SG_EOS_VEC would concretize too, though
   /// it has fewer arguments.
@@ -406,16 +411,11 @@ class EosBase {
   }
   ///
 
-  SG_EOS_VEC_2IN_1OUT(EntropyFromDensityTemperature, rhos, temperatures, entropies)
-  SG_EOS_VEC_2IN_1OUT(EntropyFromDensityInternalEnergy, rhos, sies, entropies)
-  SG_EOS_VEC_2IN_1OUT(SpecificHeatFromDensityTemperature, rhos, temperatures, cvs)
-  SG_EOS_VEC_2IN_1OUT(SpecificHeatFromDensityInternalEnergy, rhos, sies, cvs)
-  SG_EOS_VEC_2IN_1OUT(BulkModulusFromDensityTemperature, rhos, temperatures, bmods)
-  SG_EOS_VEC_2IN_1OUT(BulkModulusFromDensityInternalEnergy, rhos, sies, bmods)
-  SG_EOS_VEC_2IN_1OUT(GruneisenParamFromDensityTemperature, rhos, temperatures, gm1s)
-  SG_EOS_VEC_2IN_1OUT(GruneisenParamFromDensityInternalEnergy, rhos, sies, gm1s)
-  SG_EOS_VEC_2IN_1OUT(GibbsFreeEnergyFromDensityTemperature, rhos, Ts, Gs)
-  SG_EOS_VEC_2IN_1OUT(GibbsFreeEnergyFromDensityInternalEnergy, rhos, sies, Gs)
+  SG_EOS_VEC_FOR(Entropy)
+  SG_EOS_VEC_FOR(SpecificHeat)
+  SG_EOS_VEC_FOR(BulkModulus)
+  SG_EOS_VEC_FOR(GruneisenParam)
+  SG_EOS_VEC_FOR(GibbsFreeEnergy)
 
   template <typename RealIndexer, typename LambdaIndexer>
   inline void FillEos(RealIndexer &&rhos, RealIndexer &&temps, RealIndexer &&energies,
@@ -754,6 +754,7 @@ class EosBase {
 } // namespace eos_base
 } // namespace singularity
 
+#undef SG_EOS_VEC_FOR
 #undef SG_EOS_VEC_2IN_1OUT
 #undef SG_MEMBER_FUNC_NAME
 #endif

singularity-eos/eos/eos_eospac.hpp

@@ -154,6 +154,10 @@ inline void SetUpOutputScalingOption(EOS_INTEGER options[], EOS_REAL values[],
         std::forward<ConstRealIndexer>(IN1), std::forward<ConstRealIndexer>(IN2),        \
         std::forward<RealIndexer>(OUT), num, std::forward<LambdaIndexer>(lambdas));      \
   }
+// Does fromdensitytemperature and fromdensityinternalenergy at once
+#define SG_EOSPAC_VEC_FOR(OUTNAME)                                                       \
+  SG_EOSPAC_VEC_2IN_1OUT(OUTNAME##FromDensityTemperature, rhos, temps, OUTNAME##s)       \
+  SG_EOSPAC_VEC_2IN_1OUT(OUTNAME##FromDensityInternalEnergy, rhos, sies, OUTNAME##s)
 
 // TODO(@adempsey): Add mass fractions + better multiphase support
 class EOSPAC : public EosBase<EOSPAC> {
@@ -282,8 +286,8 @@ class EOSPAC : public EosBase<EOSPAC> {
   using EosBase<EOSPAC>::is_raw_pointer;
   SG_EOSPAC_VEC_2IN_1OUT(TemperatureFromDensityInternalEnergy, rhos, sies, temperatures)
   SG_EOSPAC_VEC_2IN_1OUT(InternalEnergyFromDensityTemperature, rhos, temperatures, sies)
-  SG_EOSPAC_VEC_2IN_1OUT(PressureFromDensityTemperature, rhos, temperatures, pressures)
-  SG_EOSPAC_VEC_2IN_1OUT(PressureFromDensityInternalEnergy, rhos, sies, pressures)
+  SG_EOSPAC_VEC_FOR(Pressure)
+
   template <typename RealIndexer, typename ConstRealIndexer, typename LambdaIndexer>
   inline void MinInternalEnergyFromDensity(ConstRealIndexer &&rhos, RealIndexer &&sies,
                                            const int num, LambdaIndexer &&lambdas) const {
@@ -297,14 +301,11 @@ class EOSPAC : public EosBase<EOSPAC> {
     PORTABLE_WARN("EOSPAC type mismatch will cause significant performance degradation");
     EosBase<EOSPAC>::MinInternalEnergyFromDensity(rhos, sies, num, lambdas);
   }
-  SG_EOSPAC_VEC_2IN_1OUT(EntropyFromDensityTemperature, rhos, temperatures, entropies)
-  SG_EOSPAC_VEC_2IN_1OUT(EntropyFromDensityInternalEnergy, rhos, sies, entropies)
-  SG_EOSPAC_VEC_2IN_1OUT(SpecificHeatFromDensityTemperature, rhos, temperatures, cvs)
-  SG_EOSPAC_VEC_2IN_1OUT(SpecificHeatFromDensityInternalEnergy, rhos, sies, cvs)
-  SG_EOSPAC_VEC_2IN_1OUT(BulkModulusFromDensityTemperature, rhos, temperatures, bmods)
-  SG_EOSPAC_VEC_2IN_1OUT(BulkModulusFromDensityInternalEnergy, rhos, sies, bmods)
-  SG_EOSPAC_VEC_2IN_1OUT(GruneisenParamFromDensityTemperature, rhos, temperatures, gm1s)
-  SG_EOSPAC_VEC_2IN_1OUT(GruneisenParamFromDensityInternalEnergy, rhos, sies, gm1s)
+
+  SG_EOSPAC_VEC_FOR(Entropy)
+  SG_EOSPAC_VEC_FOR(SpecificHeat)
+  SG_EOSPAC_VEC_FOR(BulkModulus)
+  SG_EOSPAC_VEC_FOR(GruneisenParam)
 
   // TODO(JMM): Add performant Gibbs Free Energy
   using EosBase<EOSPAC>::FillEos;

singularity-eos/eos/eos_variant.hpp

@@ -94,6 +94,12 @@ struct NullIndexer {
         },                                                                               \
         eos_);                                                                           \
   }
+// This one does both FromDensityTemperature and
+// FromDensityInternalEnergy at once. Not always useful, but
+// frequently is.
+#define SG_VARIANT_VEC_FOR(OUTNAME)                                                      \
+  SG_VARIANT_VEC_2IN_1OUT(OUTNAME##FromDensityTemperature, rhos, temps, OUTNAME##s)      \
+  SG_VARIANT_VEC_2IN_1OUT(OUTNAME##FromDensityInternalEnergy, rhos, sies, OUTNAME##s)
 
 template <typename... EOSs>
 class Variant {
@@ -489,8 +495,7 @@ class Variant {
   */
   SG_VARIANT_VEC_2IN_1OUT(TemperatureFromDensityInternalEnergy, rhos, sies, temperatures)
   SG_VARIANT_VEC_2IN_1OUT(InternalEnergyFromDensityTemperature, rhos, temperatures, sies)
-  SG_VARIANT_VEC_2IN_1OUT(PressureFromDensityTemperature, rhos, temperatures, pressures)
-  SG_VARIANT_VEC_2IN_1OUT(PressureFromDensityInternalEnergy, rhos, sies, pressures)
+  SG_VARIANT_VEC_FOR(Pressure)
 
   /// This is sort of what the SG_VARIANT_VEC would concretize too, though
   /// it has fewer arguments.
@@ -537,16 +542,11 @@ class Variant {
   }
   ///
 
-  SG_VARIANT_VEC_2IN_1OUT(EntropyFromDensityTemperature, rhos, temperatures, entropies)
-  SG_VARIANT_VEC_2IN_1OUT(EntropyFromDensityInternalEnergy, rhos, sies, entropies)
-  SG_VARIANT_VEC_2IN_1OUT(GibbsFreeEnergyFromDensityTemperature, rhos, temperatures, Gs)
-  SG_VARIANT_VEC_2IN_1OUT(GibbsFreeEnergyFromDensityInternalEnergy, rhos, sies, Gs)
-  SG_VARIANT_VEC_2IN_1OUT(SpecificHeatFromDensityTemperature, rhos, temperatures, cvs)
-  SG_VARIANT_VEC_2IN_1OUT(SpecificHeatFromDensityInternalEnergy, rhos, sies, cvs)
-  SG_VARIANT_VEC_2IN_1OUT(BulkModulusFromDensityTemperature, rhos, temperatures, bmods)
-  SG_VARIANT_VEC_2IN_1OUT(BulkModulusFromDensityInternalEnergy, rhos, sies, bmods)
-  SG_VARIANT_VEC_2IN_1OUT(GruneisenParamFromDensityTemperature, rhos, temperatures, gm1s)
-  SG_VARIANT_VEC_2IN_1OUT(GruneisenParamFromDensityInternalEnergy, rhos, sies, gm1s)
+  SG_VARIANT_VEC_FOR(Entropy)
+  SG_VARIANT_VEC_FOR(GibbsFreeEnergy)
+  SG_VARIANT_VEC_FOR(SpecificHeat)
+  SG_VARIANT_VEC_FOR(BulkModulus)
+  SG_VARIANT_VEC_FOR(GruneisenParam)
   SG_VARIANT_VEC_2IN_1OUT(InternalEnergyFromDensityPressure, rhos, Ps, sies)
 
   template <typename RealIndexer>
@@ -738,5 +738,6 @@ class Variant {
 };
 } // namespace singularity
 
+#undef SG_VARIANT_VEC_FOR
 #undef SG_VARIANT_VEC_2IN_1OUT
 #endif // EOS_VARIANT_HPP