From 5c1714410af3fe721caa9f0c7a6206d65481ad99 Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Mon, 22 Dec 2025 08:17:23 -0500 Subject: [PATCH] fix(engine_defined): fixed gcc build warnings --- src/include/gridfire/engine/views/engine_defined.h | 3 +-- subprojects/fourdst.wrap | 2 +- tests/graphnet_sandbox/main.cpp | 4 ++-- tools/gf_quick/main.cpp | 12 +----------- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/include/gridfire/engine/views/engine_defined.h b/src/include/gridfire/engine/views/engine_defined.h index 39479037..260f0c75 100644 --- a/src/include/gridfire/engine/views/engine_defined.h +++ b/src/include/gridfire/engine/views/engine_defined.h @@ -359,7 +359,6 @@ namespace gridfire::engine { private: - using LogManager = LogManager; Config m_config; quill::Logger* m_logger = LogManager::getInstance().getLogger("log"); @@ -367,4 +366,4 @@ namespace gridfire::engine { ///< Parser for the network file. const io::NetworkFileParser& m_parser; }; -} \ No newline at end of file +} diff --git a/subprojects/fourdst.wrap b/subprojects/fourdst.wrap index 5ab46be9..a857546c 100644 --- a/subprojects/fourdst.wrap +++ b/subprojects/fourdst.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://github.com/4D-STAR/fourdst -revision = v0.9.18 +revision = v0.9.19 depth = 1 diff --git a/tests/graphnet_sandbox/main.cpp b/tests/graphnet_sandbox/main.cpp index f53eee32..795b212a 100644 --- a/tests/graphnet_sandbox/main.cpp +++ b/tests/graphnet_sandbox/main.cpp @@ -248,7 +248,7 @@ int main() { std::array netIns; for (size_t zone = 0; zone < nZones; ++zone) { netIns[zone] = netIn; - netIns[zone].temperature = 1.0e7; + netIns[zone].temperature = 1.5e7; } const solver::PointSolver localSolver(engine); @@ -256,4 +256,4 @@ int main() { const solver::GridSolver gridSolver(engine, localSolver); std::vector netOuts = gridSolver.evaluate(solverCtx, netIns | std::ranges::to()); -} \ No newline at end of file +} diff --git a/tools/gf_quick/main.cpp b/tools/gf_quick/main.cpp index 88a59fb2..0c1c7038 100644 --- a/tools/gf_quick/main.cpp +++ b/tools/gf_quick/main.cpp @@ -346,25 +346,15 @@ int main(int argc, char** argv) { double temp = 1.5e7; double rho = 1.5e2; double tMax = 3.1536e+16; - double X = 0.7; - double Z = 0.02; CLI::App app("GridFire Quick CLI Test"); - // Add temp, rho, and tMax as options if desired app.add_option("--temp", temp, "Initial Temperature")->default_val(std::format("{:5.2E}", temp)); app.add_option("--rho", rho, "Initial Density")->default_val(std::format("{:5.2E}", rho)); app.add_option("--tmax", tMax, "Maximum Time")->default_val(std::format("{:5.2E}", tMax)); - // app.add_option("--X", X, "Target Hydrogen Mass Fraction")->default_val(std::format("{:5.2f}", X)); - // app.add_option("--Z", Z, "Target Metal Mass Fraction")->default_val(std::format("{:5.2f}", Z)); CLI11_PARSE(app, argc, argv); NetIn netIn = init(temp, rho, tMax); - for (const auto& [sp, y] : netIn.composition) { - std::println("Species: {}, Abundance: {}", sp.name(), y); - } - return 0; - // netIn.composition = rescale(netIn.composition, X, Z); policy::MainSequencePolicy stellarPolicy(netIn.composition); auto [engine, ctx_template] = stellarPolicy.construct(); @@ -374,4 +364,4 @@ int main(int argc, char** argv) { NetOut result = solver.evaluate(solver_context, netIn); log_results(result, netIn); -} \ No newline at end of file +}