Skip to content

pass ParameterMap into Grid3D::Set_Initial_Conditions #470

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

Open
mabruzzo wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

pass ParameterMap into Grid3D::Set_Initial_Conditions #470

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
f0fe738
pass ParameterMap into Grid3D::Set_Initial_Conditions
mabruzzo Feb 4, 2026
d7af4dd
Merge branch 'dev' into pass-pmap-to-params
mabruzzo Feb 4, 2026
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
10 changes: 5 additions & 5 deletions src/grid/grid3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <functional>

#include "../global/global.h"
#include "../global/global.h" // declares Parameter and forward-declares ParameterMap
#include "../global/global_cuda.h"
#include "../io/FnameTemplate.h"

Expand Down Expand Up @@ -437,10 +437,10 @@ class Grid3D
* \brief Allocate memory for the d, m, E arrays. */
void AllocateMemory(void);

/*! \fn void Set_Initial_Conditions(Parameters P )
* \brief Set the initial conditions based on info in the parameters
* structure. */
void Set_Initial_Conditions(Parameters P);
/*! Set the initial conditions based on already-parsed parameter info in the
* \ref Parameters arg or unparsed parameter-info in the \ref ParameterMap arg
*/
void Set_Initial_Conditions(Parameters P, const ParameterMap &pmap);

/*! \fn void Get_Position(long i, long j, long k, Real *xpos, Real *ypos, Real
* *zpos) \brief Get the cell-centered position based on cell index */
Expand Down
6 changes: 2 additions & 4 deletions src/grid/initial_conditions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@
#include "../utils/math_utilities.h"
#include "../utils/mhd_utilities.h"

/*! \fn void Set_Initial_Conditions(Parameters P )
* \brief Set the initial conditions based on info in the parameters structure.
*/
void Grid3D::Set_Initial_Conditions(Parameters P)
/*! Set the initial conditions based on info in the parameters structure. */
void Grid3D::Set_Initial_Conditions(Parameters P, const ParameterMap &pmap)
{
Set_Domain_Properties(P);
Set_Gammas(P.gamma);
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ int main(int argc, char *argv[])

// Set initial conditions
chprintf("Setting initial conditions...\n");
G.Set_Initial_Conditions(P);
G.Set_Initial_Conditions(P, pmap);
chprintf("Initial conditions set.\n");
// set main variables for Read_Grid and Read_Grid_Cat initial conditions
if (is_restart) {
Expand Down