Skip to content
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

fix some namespace issues + add missing headers to runtime_parameters.H #2891

Merged
merged 1 commit into from
Jun 27, 2024
Merged

fix some namespace issues + add missing headers to runtime_parameters.H #2891

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions Source/driver/runtime_parameters.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef RUNTIME_PARAMETERS_H
#define RUNTIME_PARAMETERS_H

#include <AMReX_Print.H>
#include <AMReX_ParmParse.H>
#include <castro_limits.H>

Expand All @@ -25,34 +26,34 @@ initialize_cpp_runparams()
{

{
ParmParse pp("castro");
amrex::ParmParse pp("castro");
#include <castro_queries.H>
}

#ifdef AMREX_PARTICLES
{
ParmParse pp("particles");
amrex::ParmParse pp("particles");
#include <particles_queries.H>
}
#endif

#ifdef DIFFUSION
{
ParmParse pp("diffusion");
amrex::ParmParse pp("diffusion");
#include <diffusion_queries.H>
}
#endif

#ifdef GRAVITY
{
ParmParse pp("gravity");
amrex::ParmParse pp("gravity");
#include <gravity_queries.H>
}
#endif

#ifdef RADIATION
{
ParmParse pp("radiation");
amrex::ParmParse pp("radiation");
#include <radiation_queries.H>
}
#endif
Expand Down Expand Up @@ -102,14 +103,14 @@ validate_runparams()
for (const auto& nm: check_namespaces)
{
// "castro"
if (ParmParse::hasUnusedInputs(nm)) {
if (amrex::ParmParse::hasUnusedInputs(nm)) {
amrex::Print() << "Warning: the following " + nm + ".* parameters are ignored\n";
auto unused = ParmParse::getUnusedInputs(nm);
auto unused = amrex::ParmParse::getUnusedInputs(nm);
for (const auto& p: unused) {
amrex::Print() << p << "\n";
}
amrex::Print() << std::endl;
if (abort_on_invalid_params) {
if (castro::abort_on_invalid_params) {
amrex::Error("Error: invalid parameters");
}
}
Expand Down