[WIP] Gravity with subcycling #499

psharda · 2024-01-14T20:52:04Z

Description

Continues #20 to add gravity with subcycling

Related issues

Checklist

Before this pull request can be reviewed, all of these tasks should be completed. Denote completed tasks with an x inside the square brackets [ ] in the Markdown source below:

I have added a description (see above).
I have added a link to any related issues see (see above).
I have read the Contributing Guide.
I have added tests for any new physics that this PR adds to the code.
I have tested this PR on my local computer and all tests pass.
I have manually triggered the GPU tests with the magic comment /azp run.
I have requested a reviewer for this PR.

for more information, see https://pre-commit.ci

src/Gravity_impl.hpp

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 10 out of 143. Check the log or trigger a new build to see more.

src/Gravity.cpp

src/Gravity.hpp

for more information, see https://pre-commit.ci

src/Gravity.hpp

BenWibking · 2024-01-14T22:30:28Z

src/RadhydroSimulation.hpp

@@ -139,6 +141,7 @@ template <typename problem_t> class RadhydroSimulation : public AMRSimulation<pr
 	amrex::Long radiationCellUpdates_ = 0; // total number of radiation cell-updates

 	amrex::Real Gconst_ = C::Gconst; // gravitational constant G
+	std::unique_ptr<Gravity<problem_t>> gravitySolver;


I created the gravity solver object here, but I apparently never initialized it. In the test problem in test_poisson.cpp, I create a separate Gravity<problem_t> object just for testing purposes.

So do I remove this line?

This is needed in either AMRSimulation or RadhydroSimulation. Which one is up to you.

Okay lets keep it here as it is then.

BenWibking · 2024-01-14T22:31:17Z

src/PoissonFreeSpace/test_poisson.cpp

+	// solve Poisson equation
+	amrex::Print() << "Initializing gravity solver..." << std::endl;
+
+	Gravity<PoissonProblem> grav(&sim, phys_bc, sim.coordCenter_, HydroSystem<PoissonProblem>::density_index);


Here I created a Gravity<PoissonProblem> object for testing purposes. For real usage, it should all be contained within AMRSimulation/RadhydroSimulation.

src/GravityBC.hpp

src/GravityBC_util.hpp

for more information, see https://pre-commit.ci

psharda · 2024-01-14T22:46:29Z

src/Gravity_level.hpp

+	// Fill data from the level below if we're not doing a solve on this level
+
+	if (level > gravity::max_solve_level) {
+		sim->FillCoarsePatch(level, time, grav_vector, g_old_, g_new_, 0, 3, quokka::direction::na);


I think we dont need g_old_ and g_new_ here anymore? This function expects integers as arguments at the 4th and 5th positions, and I think these integer arguments are 0 and 3.

BenWibking · 2024-01-14T22:50:05Z

I would recommend reading this (and the referenced Castro paper) before going much farther: #334. The algorithm is non-trivial.

psharda · 2024-01-14T22:53:27Z

I would recommend reading this (and the referenced Castro paper) before going much farther: #334. The algorithm is non-trivial.

Ah, I thought this was not going to be hard because of all the modifications to quokka in the last 2 years. If it remains non-trivial I wouldn't have the time to implement it either. Let's leave it here for now - at least a lot of the code in this PR (originally from #20 ) has caught up with the current version of quokka.

BenWibking · 2024-01-14T23:00:15Z

I would recommend reading this (and the referenced Castro paper) before going much farther: #334. The algorithm is non-trivial.

Ah, I thought this was not going to be hard because of all the modifications to quokka in the last 2 years. If it remains non-trivial I wouldn't have the time to implement it either. Let's leave it here for now - at least a lot of the code in this PR (originally from #20 ) has caught up with the current version of quokka.

It's easier, but not totally trivial.

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 10 out of 124. Check the log or trigger a new build to see more.

src/Gravity.cpp

src/Gravity.hpp

for more information, see https://pre-commit.ci

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 10 out of 114. Check the log or trigger a new build to see more.

github-actions · 2024-01-15T09:23:08Z

src/Gravity.hpp

+#ifndef GRAVITY_HPP_
+#define GRAVITY_HPP_


warning: header guard does not follow preferred style [llvm-header-guard]

Suggested change

#ifndef GRAVITY_HPP_

#define GRAVITY_HPP_

#ifndef GITHUB_WORKSPACE_SRC_GRAVITY_HPP

#define GITHUB_WORKSPACE_SRC_GRAVITY_HPP

src/Gravity.hpp:467:

- #endif // GRAVITY_HPP_ + #endif // GITHUB_WORKSPACE_SRC_GRAVITY_HPP

github-actions · 2024-01-15T09:23:08Z

src/Gravity.hpp

+
+	static const int test_solves;
+	static amrex::Real mass_offset;
+	static amrex::Real Ggravity;


warning: variable 'Ggravity' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

static amrex::Real Ggravity; ^

github-actions · 2024-01-15T09:23:08Z

src/Gravity.hpp

+	static const int test_solves;
+	static amrex::Real mass_offset;
+	static amrex::Real Ggravity;
+	static int stencil_type;


warning: variable 'stencil_type' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

static int stencil_type; ^

github-actions · 2024-01-15T09:23:08Z

src/Gravity_impl.hpp

@@ -0,0 +1,653 @@
+//==============================================================================


warning: header is missing header guard [llvm-header-guard]

Suggested change

//==============================================================================

#ifndef GITHUB_WORKSPACE_SRC_GRAVITY_IMPL_HPP

#define GITHUB_WORKSPACE_SRC_GRAVITY_IMPL_HPP

//==============================================================================

src/Gravity_impl.hpp:-1:

+ + #endif

github-actions · 2024-01-15T09:23:09Z

src/Gravity_impl.hpp

+
+#include "Gravity.hpp"
+
+template <typename T> Real Gravity<T>::mass_offset = 0.0;


warning: redefinition of 'mass_offset' [clang-diagnostic-error]

template <typename T> Real Gravity<T>::mass_offset = 0.0; ^

Additional context

src/Gravity.hpp:463: '/github/workspace/src/Gravity_impl.hpp' included multiple times, additional include site here

#include "Gravity_impl.hpp" ^

src/Gravity_impl.hpp:20: unguarded header; consider using #ifdef guards or #pragma once

template <typename T> Real Gravity<T>::mass_offset = 0.0; ^

github-actions · 2024-01-15T09:23:09Z

src/Gravity_impl.hpp

+
+#include "Gravity.hpp"
+
+template <typename T> Real Gravity<T>::mass_offset = 0.0;


warning: variable 'mass_offset' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

template <typename T> Real Gravity<T>::mass_offset = 0.0; ^

github-actions · 2024-01-15T09:23:09Z

src/Gravity_impl.hpp

+#include "Gravity.hpp"
+
+template <typename T> Real Gravity<T>::mass_offset = 0.0;
+template <typename T> Real Gravity<T>::Ggravity = 0.;


warning: redefinition of 'Ggravity' [clang-diagnostic-error]

template <typename T> Real Gravity<T>::Ggravity = 0.; ^

Additional context

src/Gravity.hpp:463: '/github/workspace/src/Gravity_impl.hpp' included multiple times, additional include site here

#include "Gravity_impl.hpp" ^

src/Gravity_impl.hpp:21: unguarded header; consider using #ifdef guards or #pragma once

template <typename T> Real Gravity<T>::Ggravity = 0.; ^

github-actions · 2024-01-15T09:23:09Z

src/Gravity_impl.hpp

+#include "Gravity.hpp"
+
+template <typename T> Real Gravity<T>::mass_offset = 0.0;
+template <typename T> Real Gravity<T>::Ggravity = 0.;


warning: variable 'Ggravity' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

template <typename T> Real Gravity<T>::Ggravity = 0.; ^

github-actions · 2024-01-15T09:23:09Z

src/Gravity_impl.hpp

+template <typename T> Real Gravity<T>::mass_offset = 0.0;
+template <typename T> Real Gravity<T>::Ggravity = 0.;
+
+template <typename T>


warning: constructor does not initialize these fields: mlmg_lobc, mlmg_hibc [cppcoreguidelines-pro-type-member-init]

template <typename T> ^

github-actions · 2024-01-15T09:23:09Z

src/Gravity_impl.hpp

+template <typename T> Real Gravity<T>::Ggravity = 0.;
+
+template <typename T>
+Gravity<T>::Gravity(AMRSimulation<T> *_sim, BCRec &_phys_bc, amrex::GpuArray<Real, AMREX_SPACEDIM> &_coordCenter, int Density_,


warning: redefinition of 'Gravity' [clang-diagnostic-error]

Gravity<T>::Gravity(AMRSimulation<T> *_sim, BCRec &_phys_bc, amrex::GpuArray<Real, AMREX_SPACEDIM> &_coordCenter, int Density_, ^

Additional context

src/Gravity_impl.hpp:24: previous definition is here

Gravity<T>::Gravity(AMRSimulation<T> *_sim, BCRec &_phys_bc, amrex::GpuArray<Real, AMREX_SPACEDIM> &_coordCenter, int Density_, ^

Ben Wibking and others added 30 commits January 10, 2022 16:00

add prototype poisson gravity (does not yet compile)

bede28e

include AMRLevelOrion for reference

7fe1df7

clean up gravity, style fixes

ca786bf

add note about changes from original code

e298ae7

URHO -> density_index, other changes

f533477

remove most AmrLevel usage from gravity code

81036d6

templatify Gravity class

baa2245

clean-up gravity headers

aba8638

quokka-fication of gravity code

eee7946

builds, but assertion failure

d0b4f5d

use sim->boxArray when possible

a1362e6

fix bugs

41e7ee7

add debugging for non-cell-centered rhs bug

c7ad4b2

fix bug caused by calling surroudingNodes(dir) on sim->grids

aab9dc8

fix const issues with .surroundingNodes(dir)

07015af

revert CMakeLists changes

05b7469

fix headers for gravity code

61cf57d

added TODO

adc173b

fix implicit capture of this

1a86493

use if constexpr for AMREX_SPACEDIM conditions

6e2ba07

remove if constexpr use that nvcc does not support

138cd6c

set tolerance before solve

b9c71c7

use smooth test problem from MLC thesis

41755f9

add reference solution to PoissonFreeSpace

2c980b3

remove symmetric bc support

1d61169

cleanup gravity headers

5d7e678

move mass off-center

5b590b1

fix set_numpts_in_gravity

0853d69

call construct_new_gravity

e436af9

do composite solve in test problem

1a7c88b

Piyush Sharda and others added 5 commits January 14, 2024 22:22

add remaining amrex:: to multifabs

f3c14b4

fix bug

d33e1ad

fix typo

ac31480

add remaining 3 arguments to FillCoarsePatch

db307c8

[pre-commit.ci] auto fixes from pre-commit.com hooks

8ed67b6

for more information, see https://pre-commit.ci

psharda commented Jan 14, 2024

View reviewed changes

src/Gravity_impl.hpp Outdated Show resolved Hide resolved

psharda requested a review from BenWibking January 14, 2024 21:40

github-actions bot reviewed Jan 14, 2024

View reviewed changes

Piyush Sharda and others added 3 commits January 14, 2024 23:20

more updates

ce7eaca

[pre-commit.ci] auto fixes from pre-commit.com hooks

216c6cd

for more information, see https://pre-commit.ci

Merge branch 'development' into subcycling

1577582

BenWibking reviewed Jan 14, 2024

View reviewed changes

src/Gravity.hpp Outdated Show resolved Hide resolved

BenWibking reviewed Jan 14, 2024

View reviewed changes

src/GravityBC.hpp Outdated Show resolved Hide resolved

BenWibking reviewed Jan 14, 2024

View reviewed changes

src/GravityBC_util.hpp Outdated Show resolved Hide resolved

Piyush Sharda and others added 4 commits January 14, 2024 23:34

removed gravity BC files

02fa2e6

remove multipole

57f07e4

[pre-commit.ci] auto fixes from pre-commit.com hooks

8e5b659

for more information, see https://pre-commit.ci

uce bcs_cc in gravity

e0cb3ae

psharda commented Jan 14, 2024

View reviewed changes

github-actions bot reviewed Jan 14, 2024

View reviewed changes

Piyush Sharda and others added 3 commits January 15, 2024 09:53

remove multipole stuff

dc8c77d

[pre-commit.ci] auto fixes from pre-commit.com hooks

1d9544f

for more information, see https://pre-commit.ci

remove old decl

3013235

github-actions bot reviewed Jan 15, 2024

View reviewed changes

BenWibking changed the title ~~Gravity with subcycling~~ [WIP] Gravity with subcycling Jan 20, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Gravity with subcycling #499

[WIP] Gravity with subcycling #499

psharda commented Jan 14, 2024

github-actions bot left a comment

BenWibking Jan 14, 2024

psharda Jan 14, 2024

BenWibking Jan 14, 2024

psharda Jan 14, 2024

BenWibking Jan 14, 2024

psharda Jan 14, 2024

BenWibking commented Jan 14, 2024

psharda commented Jan 14, 2024

BenWibking commented Jan 14, 2024

github-actions bot left a comment

github-actions bot left a comment

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

github-actions bot Jan 15, 2024

		@@ -0,0 +1,653 @@
		//==============================================================================


		#include "Gravity.hpp"

		template <typename T> Real Gravity<T>::mass_offset = 0.0;

[WIP] Gravity with subcycling #499

Are you sure you want to change the base?

[WIP] Gravity with subcycling #499

Conversation

psharda commented Jan 14, 2024

Description

Related issues

Checklist

github-actions bot left a comment

Choose a reason for hiding this comment

BenWibking Jan 14, 2024

Choose a reason for hiding this comment

psharda Jan 14, 2024

Choose a reason for hiding this comment

BenWibking Jan 14, 2024

Choose a reason for hiding this comment

psharda Jan 14, 2024

Choose a reason for hiding this comment

BenWibking Jan 14, 2024

Choose a reason for hiding this comment

psharda Jan 14, 2024

Choose a reason for hiding this comment

BenWibking commented Jan 14, 2024

psharda commented Jan 14, 2024

BenWibking commented Jan 14, 2024

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment

github-actions bot Jan 15, 2024

Choose a reason for hiding this comment