Skip to content

Conversation

@bangerth
Copy link
Contributor

Copy link
Member

@gassmoeller gassmoeller left a comment

Choose a reason for hiding this comment

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

The change makes sense, but please fix the accidentally committed conflict.

Comment on lines 614 to 631
<<<<<<< Updated upstream
=======
ar &(*initial_temperature_manager);
ar &(*initial_composition_manager);
ar &boundary_temperature_manager;
ar &boundary_convective_heating_manager;
ar &boundary_composition_manager;
ar &prescribed_solution_manager;
ar &boundary_convective_heating_manager;
ar &boundary_velocity_manager;
ar &boundary_traction_manager;
ar &prescribed_solution_manager;

// The following two are not manager classes but straight up plugins and so don't
// The following are not manager classes but straight up plugins and so don't
// currently have the ability to serialize themselves. We should add those later.
// ar &prescribed_stokes_solution;
// ar &boundary_heat_flux;

// By definition, a checkpoint is past the first time step. As a consequence,
// the Simulator object will not need the initial conditions objects, and
// we do not need to serialize those
// ar &(*adiabatic_conditions);
// ar &(*initial_topography_model);
>>>>>>> Stashed changes
Copy link
Member

Choose a reason for hiding this comment

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

I think you committed this accidentally.

@bangerth
Copy link
Contributor Author

Yes, sorry for the miscued commit. Fixed!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants