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.

Sign up for GitHub

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

Jump to bottom

Material output averaging #757

Merged
merged 3 commits into from Feb 22, 2016
Merged

Material output averaging #757

merged 3 commits into from Feb 22, 2016

Conversation

tjhei
Copy link
Member

@tjhei tjhei commented Feb 16, 2016

Allow averaging of AdditionalMaterialOutputs. This is based on @jdannberg's work. This branch is based off of #751, which should be merged first.

tjhei and others added 3 commits February 12, 2016 16:20
@tjhei
introduce create_additional_outputs
888e79a 
- add a signal set_assemblers
- add AssemblerBase::create_additional_material_model_outputs
- add test
@jdannberg @tjhei
add averaging for additional outputs
3181d5e 
Conflicts:

	include/aspect/material_model/interface.h
	source/material_model/interface.cc
@tjhei
add test
f10e070
@jdannberg
Copy link
Contributor

Thanks!
Just a comment for @bangerth or whoever ends up reviewing this: For looking at the commit 3181d5e, it might be useful to add ?w=1 to the URL so that whitespace is ignored. I moved a function out of a namespace, so with the whitespace included the diff is quite long and confusing.

@tjhei tjhei changed the title [WIP] Material output averaging Material output averaging Feb 19, 2016
@gassmoeller gassmoeller mentioned this pull request Feb 21, 2016
Merged
@gassmoeller
Copy link
Member

@tjhei: I can take a look at this as well, but currently it still shows the diffs as if #751 was not merged yet. Do you need to rebase, or is this updated after a while?

@bangerth
Copy link
Contributor

git can do this kind of merge just fine. I've looked through commits 2 and 3 of this pull request and it looks fine.

bangerth added a commit that referenced this pull request Feb 22, 2016
@bangerth
Merge pull request #757 from tjhei/material_output_averaging
9769ab8 
Material output averaging
@bangerth bangerth merged commit 9769ab8 into geodynamics:master Feb 22, 2016
@tjhei tjhei deleted the material_output_averaging branch February 22, 2016 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tjhei @jdannberg @gassmoeller @bangerth