Skip to content

Use constexpr std::string_view #1825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zingale merged 2 commits into from
Jun 26, 2025
Merged

Use constexpr std::string_view #1825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d828a40
use constexpr std::string_view
BenWibking Jun 26, 2025
c3297d8
fix string concat
BenWibking Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion EOS/breakout/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
#include <fundamental_constants.H>
#include <network.H>
#include <actual_eos_data.H>
#include <string_view>

const std::string eos_name = "breakout";
constexpr std::string_view eos_name = "breakout";

inline
void actual_eos_init ()
Expand Down
3 changes: 2 additions & 1 deletion EOS/gamma_law/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define ACTUAL_EOS_H

#include <string>
#include <string_view>
#include <extern_parameters.H>
#include <fundamental_constants.H>
#include <cmath>
Expand All @@ -14,7 +15,7 @@
// expression for entropy is only valid for an ideal MONATOMIC gas
// (gamma = 5/3).

const std::string eos_name = "gamma_law";
constexpr std::string_view eos_name = "gamma_law";

inline
void actual_eos_init() {
Expand Down
3 changes: 2 additions & 1 deletion EOS/helmholtz/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define ACTUAL_EOS_H

#include <string>
#include <string_view>
#include <iostream>
#include <fstream>
#include <sstream>
Expand Down Expand Up @@ -39,7 +40,7 @@
//
// references: cox & giuli chapter 24 ; timmes & swesty apj 1999

const std::string eos_name = "helmholtz";
constexpr std::string_view eos_name = "helmholtz";

// quintic hermite polynomial functions
// psi0 and its derivatives
Expand Down
3 changes: 2 additions & 1 deletion EOS/metal_chem/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
#include <extern_parameters.H>
#include <cmath>
#include <actual_eos_data.H>
#include <string_view>

const std::string eos_name = "multigamma";
constexpr std::string_view eos_name = "multigamma";

inline
void actual_eos_init ()
Expand Down
3 changes: 2 additions & 1 deletion EOS/multigamma/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
// Note: at the moment, it is not clear what the proper expression for
// a multi-gamma entropy should be, so do not rely on the entropy.

#include <string_view>
#include <AMReX.H>
#include <network.H>
#include <fundamental_constants.H>
#include <extern_parameters.H>
#include <cmath>
#include <actual_eos_data.H>

const std::string eos_name = "multigamma";
constexpr std::string_view eos_name = "multigamma";

inline
void actual_eos_init ()
Expand Down
3 changes: 2 additions & 1 deletion EOS/polytrope/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
//
// This is assumed to be constant for the degenerate gases.

#include <string_view>
#include <AMReX.H>
#include <extern_parameters.H>
#include <eos_type.H>
#include <actual_eos_data.H>

const std::string eos_name = "polytrope";
constexpr std::string_view eos_name = "polytrope";

inline
void actual_eos_init ()
Expand Down
3 changes: 2 additions & 1 deletion EOS/primordial_chem/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
#include <extern_parameters.H>
#include <cmath>
#include <actual_eos_data.H>
#include <string_view>

const std::string eos_name = "multigamma";
constexpr std::string_view eos_name = "multigamma";

inline
void actual_eos_init ()
Expand Down
3 changes: 2 additions & 1 deletion EOS/rad_power_law/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
#include <extern_parameters.H>
#include <eos_type.H>
#include <cmath>
#include <string_view>

const std::string eos_name = "rad_power_law";
constexpr std::string_view eos_name = "rad_power_law";

inline
void actual_eos_init ()
Expand Down
3 changes: 2 additions & 1 deletion EOS/tillotson/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
#define ACTUAL_EOS_H

#include <string>
#include <string_view>
#include <extern_parameters.H>
#include <fundamental_constants.H>
#include <eos_data.H>
#include <cmath>

const std::string eos_name = "tillotson";
constexpr std::string_view eos_name = "tillotson";

inline
void actual_eos_init() {
Expand Down
3 changes: 2 additions & 1 deletion EOS/ztwd/actual_eos.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
#include <AMReX.H>
#include <fundamental_constants.H>
#include <eos_type.H>
#include <string_view>

using namespace amrex::literals;

const std::string eos_name = "ztwd";
constexpr std::string_view eos_name = "ztwd";

const amrex::Real A = M_PI * amrex::Math::powi<4>(C::m_e) * amrex::Math::powi<5>(C::c_light) / (3.0_rt * amrex::Math::powi<3>(C::hplanck));
const amrex::Real B2 = 8.0_rt * M_PI * amrex::Math::powi<3>(C::m_e) * amrex::Math::powi<3>(C::c_light) * C::m_p / (3.0_rt * amrex::Math::powi<3>(C::hplanck));
Expand Down
3 changes: 2 additions & 1 deletion conductivity/constant/actual_conductivity.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#ifndef ACTUAL_CONDUCTIVITY_H
#define ACTUAL_CONDUCTIVITY_H

#include <string_view>
#include <cmath>
#include <eos_type.H>
#include <network.H>
#include <extern_parameters.H>

using namespace conductivity_rp;

const std::string cond_name = "constant";
constexpr std::string_view cond_name = "constant";

AMREX_FORCE_INLINE
void
Expand Down
3 changes: 2 additions & 1 deletion conductivity/constant_opacity/actual_conductivity.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#ifndef ACTUAL_CONDUCTIVITY_H
#define ACTUAL_CONDUCTIVITY_H

#include <string_view>
#include <cmath>
#include <eos_type.H>
#include <network.H>
#include <extern_parameters.H>

using namespace conductivity_rp;

const std::string cond_name = "constant_opacity";
constexpr std::string_view cond_name = "constant_opacity";

AMREX_FORCE_INLINE
void
Expand Down
3 changes: 2 additions & 1 deletion conductivity/powerlaw/actual_conductivity.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#ifndef ACTUAL_CONDUCTIVITY_H
#define ACTUAL_CONDUCTIVITY_H

#include <string_view>
#include <cmath>
#include <eos_type.H>
#include <network.H>
#include <extern_parameters.H>

using namespace conductivity_rp;

const std::string cond_name = "powerlaw";
constexpr std::string_view cond_name = "powerlaw";

AMREX_FORCE_INLINE
void
Expand Down
3 changes: 2 additions & 1 deletion conductivity/stellar/actual_conductivity.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#ifndef ACTUAL_CONDUCTIVITY_H
#define ACTUAL_CONDUCTIVITY_H

#include <string_view>
#include <cmath>
#include <eos_type.H>
#include <network.H>
#include <fundamental_constants.H>

const std::string cond_name = "stellar";
constexpr std::string_view cond_name = "stellar";

using namespace amrex::literals;

Expand Down
3 changes: 2 additions & 1 deletion networks/CNO_extras/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef actual_network_H
#define actual_network_H

#include <string_view>
#include <AMReX_REAL.H>
#include <AMReX_Array.H>
#include <AMReX_Loop.H>
Expand All @@ -12,7 +13,7 @@ using namespace amrex;

void actual_network_init();

const std::string network_name = "pynucastro-cxx";
constexpr std::string_view network_name = "pynucastro-cxx";

namespace network
{
Expand Down
3 changes: 2 additions & 1 deletion networks/ECSN/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef actual_network_H
#define actual_network_H

#include <string_view>
#include <AMReX_REAL.H>
#include <AMReX_Array.H>
#include <AMReX_Loop.H>
Expand All @@ -12,7 +13,7 @@ using namespace amrex;

void actual_network_init();

const std::string network_name = "pynucastro-cxx";
constexpr std::string_view network_name = "pynucastro-cxx";

namespace network
{
Expand Down
3 changes: 2 additions & 1 deletion networks/aprox13/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <AMReX_REAL.H>
#include <AMReX_Vector.H>
#include <AMReX_Array.H>
#include <string_view>

using namespace amrex::literals;

Expand All @@ -21,7 +22,7 @@ using namespace network_rp;
AMREX_INLINE
void actual_network_init() {}

const std::string network_name = "aprox13";
constexpr std::string_view network_name = "aprox13";

namespace network
{
Expand Down
5 changes: 3 additions & 2 deletions networks/aprox19/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <AMReX_REAL.H>
#include <AMReX_Vector.H>
#include <AMReX_Array.H>
#include <string_view>

using namespace amrex::literals;

Expand All @@ -23,9 +24,9 @@ void actual_network_init() {
}

#ifndef NSE
const std::string network_name = "aprox19";
constexpr std::string_view network_name = "aprox19";
#else
const std::string network_name = "aprox19_nse";
constexpr std::string_view network_name = "aprox19_nse";
#endif

namespace network
Expand Down
3 changes: 2 additions & 1 deletion networks/aprox21/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <AMReX_REAL.H>
#include <AMReX_Vector.H>
#include <AMReX_Array.H>
#include <string_view>

using namespace amrex::literals;

Expand All @@ -21,7 +22,7 @@ using namespace network_rp;
AMREX_INLINE
void actual_network_init() {}

const std::string network_name = "aprox21";
constexpr std::string_view network_name = "aprox21";

namespace network
{
Expand Down
3 changes: 2 additions & 1 deletion networks/ase/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef actual_network_H
#define actual_network_H

#include <string_view>
#include <AMReX_REAL.H>
#include <AMReX_Array.H>
#include <AMReX_Loop.H>
Expand All @@ -12,7 +13,7 @@ using namespace amrex::literals;

void actual_network_init();

const std::string network_name = "pynucastro-cxx";
constexpr std::string_view network_name = "pynucastro-cxx";

namespace network
{
Expand Down
3 changes: 2 additions & 1 deletion networks/general_null/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#ifndef actual_network_H
#define actual_network_H

#include <string_view>
#include <AMReX_REAL.H>
#include <AMReX_Array.H>

#include <network_properties.H>

void actual_network_init();

const std::string network_name = "general_null";
constexpr std::string_view network_name = "general_null";

namespace network
{}
Expand Down
3 changes: 2 additions & 1 deletion networks/he-burn/cno-he-burn-33a/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef actual_network_H
#define actual_network_H

#include <string_view>
#include <AMReX_REAL.H>
#include <AMReX_Array.H>
#include <AMReX_Loop.H>
Expand All @@ -12,7 +13,7 @@ using namespace amrex;

void actual_network_init();

const std::string network_name = "pynucastro-cxx";
constexpr std::string_view network_name = "pynucastro-cxx";

namespace network
{
Expand Down
3 changes: 2 additions & 1 deletion networks/he-burn/he-burn-18a/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef actual_network_H
#define actual_network_H

#include <string_view>
#include <AMReX_REAL.H>
#include <AMReX_Array.H>
#include <AMReX_Loop.H>
Expand All @@ -12,7 +13,7 @@ using namespace amrex;

void actual_network_init();

const std::string network_name = "pynucastro-cxx";
constexpr std::string_view network_name = "pynucastro-cxx";

namespace network
{
Expand Down
3 changes: 2 additions & 1 deletion networks/he-burn/he-burn-22a/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef actual_network_H
#define actual_network_H

#include <string_view>
#include <AMReX_REAL.H>
#include <AMReX_Array.H>
#include <AMReX_Loop.H>
Expand All @@ -12,7 +13,7 @@ using namespace amrex;

void actual_network_init();

const std::string network_name = "pynucastro-cxx";
constexpr std::string_view network_name = "pynucastro-cxx";

namespace network
{
Expand Down
3 changes: 2 additions & 1 deletion networks/he-burn/he-burn-31anp/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef actual_network_H
#define actual_network_H

#include <string_view>
#include <AMReX_REAL.H>
#include <AMReX_Array.H>
#include <AMReX_Loop.H>
Expand All @@ -12,7 +13,7 @@ using namespace amrex;

void actual_network_init();

const std::string network_name = "pynucastro-cxx";
constexpr std::string_view network_name = "pynucastro-cxx";

namespace network
{
Expand Down
Loading
Loading