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

Heatflux new #987

Merged
merged 2 commits into from Jun 29, 2016
Merged

Heatflux new #987

merged 2 commits into from Jun 29, 2016

Conversation

jaustermann
Copy link
Contributor

This is an update version to pull request #963. It calculates the heat flux across each boundary and outputs it as a file or for visualization.

@@ -0,0 +1,71 @@
/*
Copyright (C) 2011, 2012 by the authors of the ASPECT code.
Copy link
Contributor

Choose a reason for hiding this comment

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

same as for @anne-glerum recently: learn to live in the present!

@jdannberg
Copy link
Contributor

/run-tests

{
public:
/**
* Evaluate the solution for the dynamic topography.
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

@gassmoeller
Copy link
Member

Seems like the output of the tests has changed, please update.

@jaustermann
Copy link
Contributor Author

Hm, I updated the tests in the last commit but double checked them right now and I'm still getting the same solution. Is there a way to see what exactly is failing?

@bangerth
Copy link
Contributor

ASPECT actually aborted (core dump) on the new test. Does this not happen on your system?

@bangerth
Copy link
Contributor

OK to merge once the tester is happy.

@bangerth
Copy link
Contributor

Oh, someone beat you to it and there is now a merge conflict. Can you rebase to master again and resolve the merge conflict (likely in changes.h)?

Jacky Austermann added 2 commits June 28, 2016 16:58
…ndary as (1) a text file and (2) visual output for paraview or visit.
@jaustermann
Copy link
Contributor Author

I rebased and resolved the merge conflict. Thanks for your help, Wolfgang!

This was referenced Jun 28, 2016
@gassmoeller gassmoeller merged commit 4c70006 into geodynamics:master Jun 29, 2016
@jaustermann jaustermann deleted the heatflux_new branch February 6, 2017 23:17
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.

None yet

4 participants