Compare commits

..

2 Commits

Author SHA1 Message Date
1cdd2d92e0 fix(degfined_engine_view): removed broken logs
some old log statements reference a member no longer present, removed these
2026-02-03 08:02:09 -05:00
4423d7594c fix(build-check): only add global arguments when not a subproject
This is needd to let gridfire work as a subproject
2026-02-03 07:52:24 -05:00
5 changed files with 31 additions and 26 deletions

View File

@@ -5,8 +5,10 @@ cc = meson.get_compiler('c')
ignore_unused_args = '-Wno-unused-command-line-argument'
add_global_arguments(ignore_unused_args, language: 'cpp')
add_global_arguments(ignore_unused_args, language: 'c')
if !meson.is_subproject()
add_global_arguments(ignore_unused_args, language: 'cpp')
add_global_arguments(ignore_unused_args, language: 'c')
endif
subdir('CPPC')

View File

@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# *********************************************************************** #
project('GridFire', ['c', 'cpp'], version: 'v0.7.6rc3.1', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
project('GridFire', ['c', 'cpp'], version: 'v0.7.6rc3.2', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
# Start by running the code which validates the build environment
subdir('build-check')

View File

@@ -0,0 +1,26 @@
#pragma once
#include <format>
namespace gridfire {
struct version {
static constexpr int major = #STRINGIFY(GF_VERSION_MAJOR);
static constexpr int minor = #STRINGIFY(GF_VERSION_MINOR);
static constexpr int patch = #STRINGIFY(GF_VERSION_PATCH);
static constexpr const char* tag = #STRINGIFY(GF_VERSION_TAG);
};
}
template <>
struct std::formatter<gridfire::version> : std::formatter<std::string> {
auto format(const gridfire::version& v, auto& ctx) {
std::string versionStr = std::to_string(v.major) + "." +
std::to_string(v.minor) + "." +
std::to_string(v.patch);
if (std::string(v.tag) != "") {
versionStr += "-" + std::string(v.tag);
}
return std::formatter<std::string>::format(versionStr, ctx);
}
};

View File

View File

@@ -415,29 +415,6 @@ namespace gridfire::engine {
}
state->active_reactions.add_reaction(*reaction);
}
LOG_TRACE_L3(m_logger, "DefinedEngineView built with {} active species and {} active reactions.", m_activeSpecies.size(), m_activeReactions.size());
LOG_TRACE_L3(m_logger, "Active species: {}", [this]() -> std::string {
std::string result;
for (const auto& species : m_activeSpecies) {
result += std::string(species.name()) + ", ";
}
if (!result.empty()) {
result.pop_back(); // Remove last space
result.pop_back(); // Remove last comma
}
return result;
}());
LOG_TRACE_L3(m_logger, "Active reactions: {}", [this]() -> std::string {
std::string result;
for (const auto& reaction : m_activeReactions) {
result += std::string(reaction->id()) + ", ";
}
if (!result.empty()) {
result.pop_back(); // Remove last space
result.pop_back(); // Remove last comma
}
return result;
}());
state->species_index_map = constructSpeciesIndexMap(ctx);
state->reaction_index_map = constructReactionIndexMap(ctx);
}