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.

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

GH+CCE for a gauge wave #4271

Merged
merged 5 commits into from
Dec 16, 2022

Conversation

Sizheng-Ma
Copy link
Contributor

Proposed changes

This PR adds a GH+CCE executable for a gauge wave (without horizons). It lays the foundation for CCM. The system is not compatible with the local time stepping.

Upgrade instructions

I add one more template to SendGhWorldtubeData so that it can distinguish between LTS and GTS. Please remember to update your CceWorldtubeTarget @knelli2

Code review checklist

  • The code is documented and the documentation renders correctly. Run
    make doc to generate the documentation locally into BUILD_DIR/docs/html.
    Then open index.html.
  • The code follows the stylistic and code quality guidelines listed in the
    code review guide.
  • The PR lists upgrade instructions and is labeled bugfix or
    new feature if appropriate.

Further comments

@knelli2 knelli2 self-requested a review October 5, 2022 01:58
Comment on lines 35 to 36
/// a TimeStepId.
template <typename CceEvolutionComponent, bool DuringSelfStart>
template <typename CceEvolutionComponent, bool DuringSelfStart, bool LTS>
Copy link
Contributor

Choose a reason for hiding this comment

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

I see why you had to add the extra template, but DuringSelfStart and LTS serve the same purpose here so could you combine them somehow? Maybe name it NeedsInterfaceManager? Then whatever calls this is responsible for passing the correct bool.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'd think both DuringSelfStart and LTS are wanted because we need to distinguish self-start from evolution even when the interface manager is used (Cce::Actions::ReceiveGhWorldtubeData takes DuringSelfStart other than NeedsInterfaceManager).

Copy link
Contributor

Choose a reason for hiding this comment

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

Ahh I see, then I think this LTS template is ok.

Comment on lines 145 to 153
template <typename InitialData>
constexpr auto make_default_phase_order() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Capitalize reorder in the commit message please.

Comment on lines 71 to 72
template <typename Metavariables>
class CProxy_ConstGlobalCache;
Copy link
Contributor

Choose a reason for hiding this comment

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

What is this? We don't have a ConstGlobalCache

Comment on lines 204 to 205

template <bool DuringSelfStart, bool LTS>
Copy link
Contributor

Choose a reason for hiding this comment

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

If you make the above change about the LTS template to SendGhWorldtubeData, I don't think you need this LTS template. Just use the local_time_stepping member that's defined at the top of the metavariables.

For the SendGhWorldtubeData template, I think you can use tmpl::or_v<DuringSelfStart, local_time_stepping>.

Copy link
Contributor

Choose a reason for hiding this comment

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

I still think you can get rid of this LTS template. Just use the local_time_stepping bool directly inside the target.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

Comment on lines 4 to 6
# Executable: EvolveGhCceGaugeWave
# Check: parse;execute
# Timeout: 8
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd remove the execute part. This takes a while. Parsing should be ok for now

Copy link
Contributor

@knelli2 knelli2 left a comment

Choose a reason for hiding this comment

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

Ok all changes look good! Please squash and rebase.

Seems like GCC 9 is still running out of memory on CI...not much I think we can do about that at the moment. One idea could be, for the time being, to just not include this target when building the tests

@Sizheng-Ma Sizheng-Ma force-pushed the GaugeWave+CCE+GTS branch 2 times, most recently from ff7bd41 to 5f1d85f Compare October 17, 2022 17:00
@knelli2
Copy link
Contributor

knelli2 commented Oct 17, 2022

@Sizheng-Ma Once #4299 has been merged, you'll have to rebase and fix the #includes.

@knelli2
Copy link
Contributor

knelli2 commented Nov 30, 2022

@Sizheng-Ma This needs a rebase on develop. Several things have changed over the past month or so.

In order to have CI actually pass and not run out of memory trying to build this executable, please remove the input file you have. If there isn't an input file in the test directory, then it won't build the executable. Please make sure this executable builds on your own branch before pushing. I'll also check that it will build in a couple places before I approve. This will just be a temporary fix until we can reduce the memory usage during compile time.

@Sizheng-Ma Sizheng-Ma added the dependent Needs a different PR to be merged in first label Dec 7, 2022
@Sizheng-Ma Sizheng-Ma force-pushed the GaugeWave+CCE+GTS branch 2 times, most recently from 7a81a6f to deecf2b Compare December 8, 2022 00:47
@Sizheng-Ma Sizheng-Ma closed this Dec 8, 2022
@Sizheng-Ma Sizheng-Ma reopened this Dec 8, 2022
@Sizheng-Ma
Copy link
Contributor Author

Sizheng-Ma commented Dec 8, 2022

@Sizheng-Ma This needs a rebase on develop. Several things have changed over the past month or so.

In order to have CI actually pass and not run out of memory trying to build this executable, please remove the input file you have. If there isn't an input file in the test directory, then it won't build the executable. Please make sure this executable builds on your own branch before pushing. I'll also check that it will build in a couple places before I approve. This will just be a temporary fix until we can reduce the memory usage during compile time.

I've updated the branch and removed the input file. @knelli2

knelli2
knelli2 previously approved these changes Dec 8, 2022
Copy link
Contributor

@knelli2 knelli2 left a comment

Choose a reason for hiding this comment

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

This is still dependent on #4466, but I've built both of these executables locally on this branch and after rebasing on the current develop, so looks good!

@Sizheng-Ma Sizheng-Ma removed the dependent Needs a different PR to be merged in first label Dec 12, 2022
knelli2
knelli2 previously approved these changes Dec 12, 2022
Copy link
Member

@nilsdeppe nilsdeppe left a comment

Choose a reason for hiding this comment

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

You can squash immediately. Also please rebase on the latest develop to make sure you have some recent changes to the GH system

@@ -41,7 +42,7 @@ namespace callbacks {
/// \note This callback requires the temporal ID in an InterpolationTargetTag be
/// a TimeStepId.
template <typename CceEvolutionComponent, typename InterpolationTargetTag,
bool DuringSelfStart>
bool DuringSelfStart, bool LTS>
Copy link
Member

Choose a reason for hiding this comment

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

LTS -> LocalTimeStepping

@@ -28,7 +29,7 @@

namespace {

template <typename InterpolationTargetTag>
template <typename InterpolationTargetTag, bool LTS>
Copy link
Member

Choose a reason for hiding this comment

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

LTS -> LocalTimeStepping

using with_these_simple_actions = tmpl::list<test_receive_gh_data>;
using chare_type = ActionTesting::MockArrayChare;
using array_index = size_t;
using phase_dependent_action_list = tmpl::list<
Parallel::PhaseActions<Parallel::Phase::Initialization, tmpl::list<>>>;
};

template <bool LTS>
Copy link
Member

Choose a reason for hiding this comment

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

LTS -> LocalTimeStepping

"Unit.NumericalAlgorithms.Interpolation.SendGhWorldtubeDataCallback",
"[Unit][Cce]") {
MAKE_GENERATOR(gen);
template <bool LTS, typename Generator>
Copy link
Member

Choose a reason for hiding this comment

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

LTS -> LocalTimeStepping

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done! Cheers.

@nilsdeppe nilsdeppe merged commit e44a3ce into sxs-collaboration:develop Dec 16, 2022
@Sizheng-Ma Sizheng-Ma deleted the GaugeWave+CCE+GTS branch December 16, 2022 23:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants