Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 0 additions & 1 deletion doc/sphinx/src/amr.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ following lines to the ``<parthenon/mesh>`` block of your input file:
.. code::

refinement = static # Enable static mesh refinement
numlevel = 5 # maximum number of refined levels allowed

Then you may add any number of blocks named
``<parthenon/static_refinement*>``, where ``*`` is a number. Each
Expand Down
5 changes: 3 additions & 2 deletions src/amr_criteria/amr_criteria.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ AMRCriteria::AMRCriteria(ParameterInput *pin, std::string &block_name)
"magnitude that triggers refinement");
derefine_criteria = pin->GetOrAddReal(block_name, "derefine_tol", 0.05,
"magnitude that triggers de-refinement");
int global_max_level = pin->GetOrAddInteger("parthenon/mesh", "numlevel", 1,
"maximum level of refinement globally");
int global_max_level =
pin->GetOrAddInteger("parthenon/mesh", "numlevel", 1,
"maximum level of refinement globally when AMR is on");
max_level =
pin->GetOrAddInteger(block_name, "max_level", global_max_level,
"maximum level this refinement criterion will achieve");
Expand Down
10 changes: 6 additions & 4 deletions src/mesh/mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ Mesh::Mesh(ParameterInput *pin, ApplicationInput *app_in, Packages_t &packages,
root_level = 0;
// SMR / AMR:
if (adaptive) {
max_level_ref_ = pin->GetOrAddInteger("parthenon/mesh", "numlevel", 1,
"maximum level of refinement globally");
max_level_ref_ =
pin->GetOrAddInteger("parthenon/mesh", "numlevel", 1,
"maximum level of refinement globally when AMR is on");
max_level = max_level_ref_ + root_level - 1;
} else {
max_level_ref_ = 63;
Expand Down Expand Up @@ -211,8 +212,9 @@ Mesh::Mesh(ParameterInput *pin, ApplicationInput *app_in, Packages_t &packages,

// SMR / AMR:
if (adaptive) {
max_level_ref_ = pin->GetOrAddInteger("parthenon/mesh", "numlevel", 1,
"maximum level of refinement globally");
max_level_ref_ =
pin->GetOrAddInteger("parthenon/mesh", "numlevel", 1,
"maximum level of refinement globally when AMR is on");
Comment on lines +215 to +217
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change might need a rebuilt of the autogenerated parameter docs as the string changed.

max_level = max_level_ref_ + root_level - 1;
} else {
max_level_ref_ = 63;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ problem_id = advection

<parthenon/mesh>
refinement = none
numlevel = 2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AMR is done for this test case (enabled via command line parameters for some steps).
So this needs to either stay or added to the test cases with AMR in advection_convergence.py


nx1 = 64
x1min = -0.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ enable_sparse = true

<parthenon/mesh>
refinement = none
numlevel = 2

nx1 = 64
x1min = -0.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ problem_id = boundary_exchange

<parthenon/mesh>
refinement = static
numlevel = 1

nx1 = 8
x1min = 0.0
Expand Down