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

Squashed main melt implementation #894

Merged
merged 14 commits into from Jun 24, 2016

Conversation

jdannberg
Copy link
Contributor

This is the core of the melt implementation (ripped out of the melt branch).
To make the pull request small enough for reviewing, we here include only the general implementation. All additional features such as melt material models, heating models and benchmarks will follow separately. The code also still contains a few todos that we plan to work on soon, but we would already be glad about feedback regarding the structure and possible improvements.
Overall, it would be great if we could merge the melt implementation before the hackathon, so that we can avoid getting additional conflicts.

@jdannberg jdannberg force-pushed the melt_review branch 3 times, most recently from cf700ec to f8e94bf Compare May 27, 2016 09:29
0.
\end{align}

We use the indices $s$ to indicate properties of the solid and $f$ for the properties of the fluid. The equations are solved for the solid velocity $\mathbf{u_s}$, the fluid pressure $p_f$, and an additional variable, the compaction pressure $p_c$, which is related to the fluid and solid pressure through the relation $p_c = (1-\phi) (p_s-p_f)$. $K_D$ is the Darcy coefficient, which is defined as the quotient of the permeability and the fluid viscosity and $\Gamma$ is the melting rate. $\eta$ and $\xi$ are the shear and compaction viscosities and can depend on the porosity, temperature, pressure, strain rate and composition. However, there are various laws for these quantities and so this is implemented in the material model. Common formulations for the dependence on porosity are $\eta = (1-\phi) \eta_0 e^{-\alpha_\phi \phi}$ with $\alpha_\phi \approx 25...30$ and $\xi = \eta_0 \phi^{-n}$ with $n \approx 1$.
Copy link
Member

Choose a reason for hiding this comment

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

Maybe break this paragraph into more lines. That also makes it easier to comment lines. In the second to last sentence: maybe change "... and so this is implemented" into " ... and so they are implemented in the individual material models"

for (unsigned int i=0; i < idxset.n_elements(); ++i)
{
types::global_dof_index idx = idxset.nth_index_in_set(i);
pressure_sum += vector(idx);
Copy link
Contributor

Choose a reason for hiding this comment

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

might almost be easier to read if you just put the first line into the second

@bangerth
Copy link
Contributor

I know that you worked hard to minimize the impact of this on the rest of the code base, but there are still a significant number of if-statements in the core files that test for melt. This worries me because it significantly increases the complexity of the code base -- which leads to a number of problems: (i) Have we tested all combinations of parameters, and what happens if someone chooses a combination that doesn't work? (ii) What does it mean for reviewing future patches as the new complexity reduces the number of people who still really understand what is going on? (iii) How are we going to treat proposed contributions that further add similar functionality by modifying the formulation in other directions, e.g., by making both strain and velocity first-class variables to support viscoelasticity? Having opened to the door to one different formulation means that we at least have to significantly think about other people wanting to add other things. (iv) What about solutions that extend, not just augment stuff, for example by adding a Newton scheme? Would they have to support the full set of melt-enabled equation, or just the original part? If the latter, this opens more doors for unsupported combinations of parameters. (v) What about variations of formulations? We talked about adding assemblers for the BA, for example; will we also have to add BA assemblers for melt variations? If not, how do we deal with the resulting unsupported combinations of parameters?

I don't suggest that we don't merge this patch. In fact, I think it looks good enough that I would suggest it be merged once you address my comments made yesterday and today. I also recognize the incredible amount of work that has gone into it, as well as the effort to fit it in and provide testcases. But I will have to admit that I have concerns given the impact it will have on the long term maintainability of ASPECT.

@tjhei
Copy link
Member

tjhei commented Jun 16, 2016

I know that you worked hard to minimize the impact of this on the rest of the code base, but there are still a significant number of if-statements in the core files that test for melt.

I agree. I think some things can be improved down the line when we modularize parts of ASPECT better. I have some ideas on how to deal with linear/nonlinear solvers for example. That is a bigger revamp, but should take care of quite a few places.

At first I was hoping we could use signals to hook the melt stuff into the main code without touching anything, but this has two problems:

  1. The macros to register are currently broken if they are used in the main executable (order of construction of static members is not defined). This can probably be fixed somehow, but I gave up after playing with workarounds for a while.
  2. Using signals would interfere with plugins that also want to change things by hooking into the same signals. What order should we subscribe, etc. The logic is much simpler as a plugin writer, if you only have to think about a single entity modifying the code.

We talked about adding assemblers for the BA, for example; will we also have to add BA assemblers for melt variations?

I don't see a way around this. My suggestion here would be to modularize the assemblers further so parts can be reused. Juliane and I have been working on BA and other formulations already, PR incoming soon.

If not, how do we deal with the resulting unsupported combinations of parameters?

I think the only viable option is to assert when we encounter unsupported combinations.

Having opened to the door to one different formulation means that we at least have to significantly think about other people wanting to add other things.

Yes, that is an important question. While I think we shouldn't include everything in the universe, I would rather allow things that are less than ideal to be merged than turning away people. Otherwise we risk forks, fewer contributions, and a splintered community.

@bangerth
Copy link
Contributor

Yes, I agree that we want to include, not turn away. I'm ok with merging as-is. I just wanted to bring up the issues I see.

There are currently regression tester failures. Please make sure everything is ok and merge yourself.

jdannberg and others added 12 commits June 24, 2016 03:31
commit 468a152b587b85ac11e8829cd8df862db6cc8c19
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon May 23 09:33:49 2016 +0100

    update test output

commit 646b09e09e78e59344565ba806181420ece984a0
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon May 23 09:26:46 2016 +0100

    add missing face assemblers for DG

commit f5046c9d959709ef2748111211548435ac3d8bf1
Merge: 560ffeb 9d06ade
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri May 20 17:18:08 2016 +0200

    Merge branch 'master' into melt_assembly

    Conflicts:
    	include/aspect/mesh_refinement/artificial_viscosity.h
    	include/aspect/mesh_refinement/composition_gradient.h
    	include/aspect/mesh_refinement/composition_threshold.h

include/aspect/postprocess/visualization/artificial_viscosity_composition.h
    	source/mesh_refinement/artificial_viscosity.cc
    	source/mesh_refinement/composition_gradient.cc
    	source/mesh_refinement/composition_threshold.cc

source/postprocess/visualization/artificial_viscosity_composition.cc
    	source/simulator/assembly.cc
    	tests/additional_outputs_02/screen-output
    	tests/additional_outputs_03/screen-output
    	tests/artificial_viscosity.prm
    	tests/artificial_viscosity/screen-output
    	tests/artificial_viscosity/solution-00000.0000.gnuplot
    	tests/artificial_viscosity/solution-00001.0000.gnuplot
    	tests/artificial_viscosity/statistics

commit 560ffeb7634a7a9cf305695188c48d98a27ffbf7
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon May 2 12:09:20 2016 +0200

    move is_porosity to melt.cc

commit cea908eb149521e643d589ba9170d816dbf335c3
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun May 1 14:38:36 2016 +0100

    fix warnings

commit 2d6fd94a7debde41927dffb1b9cc3be01228c62f
Merge: d2bba81 4e0d86b
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun May 1 14:15:23 2016 +0100

    Merge remote-tracking branch 'upstream/master' into melt_assembly

    Conflicts:
    	include/aspect/simulator.h
    	include/aspect/simulator_access.h
    	source/simulator/assembly.cc
    	tests/melt_postprocessor_peridotite/statistics
    	tests/melt_postprocessor_pyroxenite/statistics

commit d2bba81facbfbae0f32bed88f421c0608e37a171
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun May 1 12:10:27 2016 +0100

    fix petsc compilation

commit 28df080a8e316295d76ad31fd0b9df1173a03b5a
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun May 1 12:10:03 2016 +0100

    remove unused parameter warning

commit 661f8c777daa9b9a365b45c7272ceb4c5c65e034
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Apr 12 16:39:06 2016 -0500

    update a test

commit a3933af4667f8b3179231570052240bd29f8ad1b
Merge: 2644825 971bbd6
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Apr 9 18:10:01 2016 -0500

    Merge branch 'melt_assembly' of https://github.com/tjhei/aspect into
melt_assembly

commit 971bbd6e5a11f6292aa47dc993ff4db663492b6d
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 10 01:09:48 2016 +0200

    remove unused parameters and variables

commit 264482545acc2002cbd29a7b1ddf2dbca95e3ef7
Merge: 3dd3906 195dec3
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Apr 9 17:52:52 2016 -0500

    Merge branch 'melt_assembly' of https://github.com/tjhei/aspect into
melt_assembly

commit 195dec304e1abdfec6b9debbae8a29bf06f6fa68
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 10 00:52:24 2016 +0200

    fix direct_solver pressure scaling bug

commit 3dd39067f20e84c87538b7127002e2d94bb7107e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Apr 9 17:52:04 2016 -0500

    silence warning

commit f11a65ce19e0c534beb6f2c454ebead4c76e873e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Apr 5 16:22:49 2016 -0500

    make code run faster

commit 02c7adb782b2e33edd0005e7a24cf3458aaa7af6
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Mar 22 16:59:36 2016 -0500

    indent and fix tests

commit c3f5b175b71b1c4efdcee13aaedd5f66f3d0ec2c
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Mar 22 16:51:02 2016 -0500

    add advective heat transport by melt

commit 13fb3083c06da887352d990da0a8e0f9645db5dd
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Mar 21 17:08:05 2016 -0500

    implement dissipation/shear heating of melt

commit d40c92e446a622e916ff37bbdc55ccb2644a5388
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Mar 16 17:09:13 2016 -0500

    make create_additional_material_model_outputs const and add it to
simulator access

    This is needed for calling it in the heating postprocessors, which
need
    all of the additional outputs in case they are used in the
individual
    heating plugins.

commit 3bcb4645b1fefade382da258df25bca2c22d757f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Mar 16 15:34:50 2016 -0500

    use tag_additional_cells in composition threshold mesh refinement
plugin

commit addff209fe1592426ceaf20e7e207887dffb7d1c
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Mar 15 16:16:52 2016 -0500

    fix artificial viscosity test

commit 73ab181dbc4e3a8e947bf166a416e90b28835766
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Mar 14 17:08:43 2016 -0500

    move melt functions into their own namespace

commit 4e0da729666a21d95399b535913e77a3b944557c
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Mar 14 15:44:43 2016 -0500

    fix a test

commit 8b177e1cc0a24829aad3a61d71f5bd83a9a1bd35
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Mar 14 15:44:30 2016 -0500

    move force vectorr to general assembly

commit 9c8426dd32815e14c0fd8f8d193fa1ff96bd546f
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Mar 10 19:19:02 2016 -0500

    fixes

commit 2a3fca9cf678f306931d0d9d754b24a6177bcfb2
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Mar 10 19:18:54 2016 -0500

    add melt introspection test

commit f108fb9e9e55833199ce774394ea04ac150dc4e0
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Feb 23 13:29:06 2016 -0500

    melt introspection changes

    Conflicts:

    	source/simulator/core.cc

commit df9ea9e9ad1caa185e290f2138fdacc133464bbe
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Mar 10 14:29:36 2016 -0500

    remove melt introspection stuff

commit 29d2be744ebeb3c42a312b3f85741119209a01bf
Merge: 4cc8608 cd79be4
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Mar 10 14:20:47 2016 -0500

    Merge remote-tracking branch 'upstream/master' into melt_assembly

    Conflicts:
    	include/aspect/introspection.h
    	include/aspect/material_model/interface.h
    	source/material_model/simpler.cc
    	source/simulator/core.cc
    	source/simulator/introspection.cc

commit 4cc860868906476f8aad44c0bec7574a38a6fcf0
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Mar 10 12:20:47 2016 -0600

    update artficial viscosity visualization plugin and test

commit 67fec054c73b558c1688fdb95ab7e28ee2aa7e8f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Mar 9 14:21:01 2016 -0600

    update manual

commit 3624d74d96dafd579acfa04ab7cc6bb6c510e135
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Mar 8 15:59:36 2016 -0600

    remove input file that was not useful

commit db66a6852c4c55b00f68bff066e1f72af836fb77
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Mar 3 14:19:18 2016 -0600

    update tests

commit 03fe6398d918e714c04f68456cec85d28586786c
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Mar 3 14:13:20 2016 -0600

    run astyle

commit d27661f1b30558b821b23020909ffbe8f964826f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Mar 3 14:09:38 2016 -0600

    update benchmarks to new interface

commit de0b749177cbf0241b629e6dc837085b583dd729
Merge: 7cee5e4 4a4a2ee
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Mar 2 19:00:53 2016 -0600

    Merge branch 'modularize_advection_assembly' into melt_assembly

    Conflicts:
    	source/simulator/assembly.cc

commit 7cee5e4e022c1e9759d8455ae73c6c2fc50e7099
Merge: e6f0ea8 f767894
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Mar 1 11:25:07 2016 -0600

    Merge branch 'modularize_advection_assembly' into melt_assembly

    Conflicts:
    	include/aspect/assembly.h
    	include/aspect/simulator.h
    	source/simulator/assembly.cc
    	source/simulator/helper_functions.cc
    	source/simulator/introspection.cc

commit e6f0ea89dc77807a8b414922aa8f831b0e6b3de7
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Feb 26 11:17:53 2016 -0600

    make plots look nicer

commit e1fe75329bf491544ab7a1401e6f3d3a6f18bc6d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 24 13:51:05 2016 -0600

    extend shear bands benchmark to planar melt bands

commit aede38fe6c425e83975345e728b154315b3be600
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 18 11:52:29 2016 -0600

    make tests run again

commit cb84e1497d8c2247abf41a800917c96081a5f00f
Merge: eff5caa 9bef2f9
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 17 17:13:41 2016 -0600

    Merge branch 'test_melt_create_outputs' into melt_assembly

commit eff5caa408f517d03f00af02ceafb0586d04c72e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 9 19:41:07 2016 -0600

    add freezing rate to melt simple model and fix reaction term in
compressible case

commit 9bef2f9781224d4803214113c7a5830d9b32c17c
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Feb 9 12:31:11 2016 -0500

    introduce create_additional_outputs

commit 2ea4a0eff272a66161f031333e22d7820f12650e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 3 19:30:41 2016 -0600

    replace fluid compressibility by fluid pressure gradient

commit 1761d369612aee0d5acade7cf0a444c98a79873d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 3 16:46:37 2016 -0600

    add documentation

commit 79516097a221edf79c2079f98aa6b9ee3360e72f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 3 16:02:45 2016 -0600

    add averaging for additional outputs

commit fc58cae6e8f5711c70185f3d0334528d5569ea20
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 3 16:02:36 2016 -0600

    fix in solitary wave test

commit 1a4b213615b8e8b78762fb27f96d398a4d557c92
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 3 12:27:57 2016 -0600

    remove melt_interface

commit fd445fbffd0370827c82cbda4768db198614932f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 3 10:47:45 2016 -0600

    run astyle

commit 3bc160d8b1a415ccca53dc0ec10c82617e5fb595
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 2 18:03:09 2016 -0600

    start to put melt functionality into a separate file

commit 0c09c571e9506b402c87c1a8b9c74ffe05eb121f
Merge: 8463af8 87b649e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 2 13:44:10 2016 -0600

    Merge branch 'master' into melt_assembly

    Conflicts:
    	include/aspect/simulator.h
    	source/simulator/assembly.cc

commit 8463af8bbb781a45de2023c87490fe18f93a1633
Merge: b55bdf8 44bb2f6
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 22 11:09:19 2016 -0600

    Merge branch 'add-assembler-properties' into melt_assembly

    Conflicts:
    	include/aspect/simulator.h
    	source/simulator/assembly.cc

commit 44bb2f6d626d5563da9231f7f4c8a0455123dd47
Merge: 51ea653 b5ac404
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 22 09:52:26 2016 -0600

    Merge branch 'add-assembler-properties' of
https://github.com/bangerth/aspect into add-assembler-properties

    Conflicts:
    	source/simulator/assembly.cc

commit b55bdf88c04e7423cd5873f3455c945dcda95f41
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Jan 21 21:16:56 2016 -0600

    make pressure right hand side compatibility modification with melt
its own assembler

commit b5ac404baee2c3de5bf36984c86cdab4210605d5
Author: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date:   Thu Jan 21 13:25:54 2016 -0600

    Provide a way for assemblers to specify update flags.

commit dbbc39f476d4c8878d4afe3ac28b0241e96559a7
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Jan 21 21:00:57 2016 -0600

    remove template argument and fix tests

commit eaacf29a56bfa0575f6b77f2e274e8be14067e3c
Author: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date:   Wed Jan 20 11:02:42 2016 -0600

    Implement the ability to initialize material data on faces.

commit c39a5ca0e28ef30f3122d3c0e5bb30bb91d2e690
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jan 20 22:44:56 2016 -0600

    change structure to use the new face assembler

commit fa49527c9ace073eb123d25523153042beb293f0
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jan 20 22:44:16 2016 -0600

    indentation

commit 4676d0137b58e3d2d3df7b48a6b4a28244df1ade
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jan 20 19:54:05 2016 -0600

    merge from add-assembler-properties

commit 51ea653d6a9fbffbd7d7e88329aaaa72613349ff
Author: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date:   Wed Jan 20 11:02:42 2016 -0600

    Implement the ability to initialize material data on faces.

commit fbfafb45ab90fc0c2e71db58733ef0755b62ebec
Author: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date:   Tue Jan 19 21:57:09 2016 -0600

    Add the possibility of defining assembler properties.

    This isn't used right now, but it will enable us to define things
only
    some of the assemblers require.

commit f26ba12f52aa590ff7899048c0cd93f1f469ff3b
Merge: f677e17 d6041df
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Jan 17 23:31:49 2016 -0600

    change Stokes assembly to new interface

commit f677e17c0e373d9550657fe4f852e5209ebd7c46
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 15 15:49:53 2016 -0600

    update tests with tester results

commit 358b38bf9e74603f25f875fe691e30aa59d00363
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 15 14:22:37 2016 -0600

    use new MeltOutputs interface

commit 54ac7d42aedb3c922716c99631a77c9f3990edbb
Merge: bee0339 fb10a87
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 15 11:33:07 2016 -0600

    Merge branch 'master' into melt_reorder_fields

commit bee033937835943f985a5d284ddde3934be20766
Merge: 69daabc 4557c61
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Jan 14 16:05:27 2016 -0600

    Merge branch 'master' into melt_reorder_fields

    Conflicts:
    	include/aspect/material_model/interface.h
    	source/material_model/interface.cc
    	source/simulator/assembly.cc

commit 69daabca5077a3d3f8c8c98dae496d87c9d840db
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Jan 14 13:43:27 2016 -0600

    fix another FPE and update test

commit fbb325f872e89b622298def58bd61ecc364669dc
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Jan 14 12:33:46 2016 -0600

    update tests with tester results

commit 57a63facfb747551b24af747a812c877c929787e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Jan 14 12:23:15 2016 -0600

    update melting rate test

commit 2d15cd0e2dc8377beee399b00ebf88a823cc7542
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jan 13 18:59:05 2016 -0600

    add structure for additional material model outputs

commit afc8365b5fd7b042de15c8d761a34a7346ed6e3f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Jan 12 10:35:30 2016 -0600

    fix pressure component for conservative elements

commit 24c826a932f871f9482638b1de94a32e7f884400
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Jan 11 14:58:21 2016 -0600

    make a few melt tests run faster

commit 6b5cb3455a81d71a50a1a5785d8b385b3cc46079
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Jan 11 14:32:54 2016 -0600

    fix FPE

commit 2e8b6d5463507f676efe25468d782db2ddb0f993
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Jan 10 17:43:53 2016 -0600

    fix warnings

commit 7ef2a17fbbc2e1e7bcfc5e75cab714957f291bb8
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Jan 10 17:43:48 2016 -0600

    undo solver changes

commit afec9e0c9e6a81402a9dba2dce31645bf5b5e33c
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Jan 10 17:43:41 2016 -0600

    undo broken solver_history stuff

commit b460e04ee67077dbdf2a7dfffbc8bee4a40524a4
Merge: 4937c05 c0d4828
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Jan 10 17:23:03 2016 -0600

    Merge remote-tracking branch 'upstream/master' into
melt_reorder_fields

    Conflicts:
    	source/simulator/assembly.cc
    	source/simulator/solver.cc

commit 4937c05d2d45b1889b55fc41060d1e27a427f1c0
Merge: 596e9a4 5c8157f
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Jan 10 10:25:23 2016 -0600

    Merge remote-tracking branch 'jdannberg/melt_reorder_fields' into
melt_reorder_fields

commit 5c8157f9e85f6a47051370fd327f064758852037
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Dec 19 18:30:52 2015 -0600

    add global melt model as test

commit 922ab3e5b6fec1638f350333396d898ad01e76c8
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Dec 19 00:34:47 2015 -0600

    revert averaging of gravity and velocity divergence

commit 147c718a74fe5ee4317d0015140ed53d072ba8ff
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Dec 18 19:21:35 2015 -0600

    update more tests

commit 7a760d12b8764b2fade96161294f464dbb3bdb09
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Dec 17 20:47:34 2015 -0600

    update some test files we forgot before

commit 596e9a437621c6100c3971b0cc2e6db9ad801c45
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Dec 17 19:13:34 2015 -0500

    indent

commit a654f1f05e01bc74249ad0d664407e9416c3a800
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Dec 17 16:51:54 2015 -0600

    add solitary wave benchmark to manual

commit 2468562843b3ade100438ad36e6dd23008042e1b
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Dec 17 12:04:48 2015 -0600

    add cell reference to heating statistics

commit 0c7326f9837ce26e9c8c3264b7572a4ca0bf2e8e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Dec 4 14:58:23 2015 -0600

    add a plugin for adiabatic heat of migrating melt

commit 8ff7e1c5db8544f8590cce505421ebc6a89cfbc2
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Dec 2 21:53:49 2015 -0600

    add test for solitary wave benchmark

commit e57a293636571a8c097184c701ce7ae765c610e1
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Dec 2 19:37:18 2015 -0600

    fix melt transport test

commit 5eeb21d755efa10db24d51f21645c3d6ee249301
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Dec 2 19:16:03 2015 -0600

    remove a test that we don't need and that did not work

commit 2a333bdca34b595bf830fc891b245b5ed0565b35
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Dec 2 15:09:33 2015 -0600

    fix melt transport convergence tests

commit d631c0783e78879d07d839f97fa5dbb26179fe22
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Dec 2 13:45:22 2015 -0600

    fix melt postprocessor tests

commit 729bfcc4b467c73a16b3dc5937920d2f68b85e86
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Dec 1 22:48:04 2015 -0600

    fix compressible advection test

commit 3fd10d0729d189b87baad8f52ca6ee16dc9ed0bd
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Dec 1 22:02:52 2015 -0600

    fix melting rate test

commit 199037733c7b65f1019664d24ee5bca1703a32dc
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Dec 1 19:15:43 2015 -0600

    fix melt material tests

commit 8276cd8d0c092981b21fa646d68c581fd0623ca9
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Dec 1 15:30:37 2015 -0600

    update melt transport compressible tests to use the version from the
paper

commit 8e0238d90ab4b7ca20a7913be830e5cb6009a6b7
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Dec 1 15:11:36 2015 -0600

    update melt transport adaptive test to the version we use in the
paper

commit 9f96c589c4f84e4b36b1648fe7760b33294fbafe
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Dec 1 13:59:59 2015 -0600

    switch order of stokes and u_f solver screen output

commit 107f6d5a80d697c4844a31d5f9b23f24a960c06d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Dec 1 12:53:06 2015 -0600

    fix linking error

commit 021180e5d4a7cd4845e86a65444083ef35e3352a
Merge: 46cda14 6a8ffc1
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Nov 2 09:55:12 2015 -0500

    Merge remote-tracking branch 'upstream/master' into
melt_reorder_fields

    Conflicts:
    	source/simulator/assembly.cc
    	source/simulator/helper_functions.cc
    	source/simulator/solver.cc

commit 46cda14d4eed3c62f2887fe94ae1570caafeb456
Merge: 6e4afb9 b087a8f
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Nov 1 15:20:55 2015 -0500

    Merge remote-tracking branch 'jdannberg/melt_reorder_fields' into
melt_reorder_fields

commit 6e4afb9639a5f74f2633d921c21bec7e4f5fabca
Author: Timo Heister <timo.heister@gmail.com>
Date:   Fri Oct 16 15:13:02 2015 -0400

    astyle

commit 1aa3e2f90625d545ab311358b7651f82ac1ca7fc
Author: Timo Heister <timo.heister@gmail.com>
Date:   Fri Oct 16 15:11:09 2015 -0400

    redo u_f computation

commit b087a8fdee3f2d532c8d7ccd81d62516b0b79ad3
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Oct 12 14:41:47 2015 -0500

    allow depletion density change to be negative

commit af7d7d01019c9a6f56fa04b313fc0507f78f3aca
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sat Oct 10 09:01:12 2015 -0400

    simplify velocity scaling logic in visualization

commit 8033fabc15c983bfb12400cb760ca923bfbf653d
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sat Oct 10 09:00:23 2015 -0400

    disable pressure dof fixing for now

commit 7c1817f817eb3b399bf417e937bf662d48bd7bfd
Merge: b9ebc43 7be793e
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sat Oct 10 08:53:15 2015 -0400

    Merge remote-tracking branch 'jdannberg/melt_reorder_fields' into
melt_reorder_fields

commit 7be793e4fb2fb923c6940d0fec73c3c552a52c76
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Oct 5 20:09:39 2015 -0500

    small fix to latent heat in melt simple model

commit 3f5d9fe514c513463118644f5f97636b90a449aa
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Oct 4 22:58:50 2015 -0500

    fix depletion advection in melt simple model

commit ab8215c35c974c6a65d7bf009d17087e006e5a52
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Oct 4 22:51:04 2015 -0500

    add fractional melting to simple material model and fix density

commit d4eaf22e630287a709f775e895a567637b824c4d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Oct 4 20:19:29 2015 -0500

    fix advection of depletion field

commit c993edbcf63e5f97c837dc59a441cb821073aef1
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Oct 1 16:45:52 2015 -0500

    add melt statistics postprocessor

commit 329d3a3ef8c3f4496fa5b36cd4120057dbd07c21
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Sep 24 18:57:48 2015 -0500

    add include file for previous commit

commit 5979c0dcf2dd893e18705528f8b7bba7fe85c1ec
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Sep 24 18:54:02 2015 -0500

    limit solidus decrease by depletion

commit b9ebc4347d8f3e9ed395fe6bce4b7db125feb90d
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Sep 24 09:14:55 2015 -0400

    make CompositionGradient work in parallel

commit c4b491c30de418d990da733d3ab7f0e7f9e3e1ee
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Sep 23 13:44:41 2015 -0500

    add test for nonlinear convergence with reacion term depending on
Stokes solution

commit 461d3857c9cde649ce45ef01bcc09443d2248522
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Sep 23 10:39:40 2015 -0500

    add a new material model for global models with melt

commit b21ebf525153b5aaf5bf0b3fb3325b170bd98dff
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Sep 21 16:12:45 2015 -0500

    add threshold for composition residual

commit 3221104cb89a8a548c31a7b4ff10bdad7cf6eb79
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Sep 20 12:29:17 2015 -0400

    fix compress calls

commit c7e909d010ba5e29d55dfc54ae1f9ffe23a6d589
Merge: a89004e 223c29a
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sat Sep 19 14:28:26 2015 -0400

    Merge remote-tracking branch 'jdannberg/melt_reorder_fields' into
melt_reorder_fields

commit 223c29ab7240d1d24d5557ef4f9fcf59e8b51ff8
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Sep 17 18:28:28 2015 -0500

    small naming change

commit 09d95daaa8fc9d39f97525da9d849075d2b406fe
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Sep 17 18:21:14 2015 -0500

    add latent heat of melting for models with melt migration

commit b040dbfb318a2a964ecad5e740b8ad8fc0e86feb
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Sep 15 13:09:06 2015 -0500

    simplify time step size computation with melt

commit e8e1cef15d20f20c913b68ea36fa93b2f3bb06dc
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Sep 10 14:08:04 2015 -0500

    add density change for depleted material in melt simple model

commit a89004eafc922a24abb2f149f0699826f35fcc38
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Aug 24 09:22:58 2015 -0400

    remove warnings

commit 76118134c7235fd734bccc723f6becfdf6cc9897
Merge: 444a210 d7b8a7d
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Aug 24 09:10:09 2015 -0400

    Merge remote-tracking branch 'upstream/master' into
melt_reorder_fields

commit 444a210faa5485ca81da964b768e4ddc0fa82273
Merge: 743d86b 4ec76ee
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Aug 24 09:08:46 2015 -0400

    Merge remote-tracking branch 'jdannberg/melt_reorder_fields' into
melt_reorder_fields

commit e3c54a88f7c6d9dd56ed1d7cabf825656fae0e73
Merge: 4ec76ee 743d86b
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Aug 21 05:45:28 2015 -0500

    Merge branch 'melt_reorder_fields' of
https://github.com/tjhei/aspect into melt_reorder_fields

commit 743d86bf02b3fbe4e91e877df81b81c70a9bef65
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Aug 20 16:29:59 2015 -0400

    make stokes solver robust

    These parameters won't be as performant but they make some test
problems
    work for now.

commit b5dbe7440b25df57b1b01cb3c057742fc30cb1d1
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Aug 20 16:11:26 2015 -0400

    generate solver history

    and dump to file if we don't converge.

commit 4ec76ee80be859984268e145799e36090f264925
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Aug 7 12:21:21 2015 -0500

    implement averaging for gravity and velocity divergence

commit 8a24f6d8dc53f0bfc8ee86418a623c3d0e24e812
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Aug 7 12:19:42 2015 -0500

    make melt test more general

commit b631ce5d425178eb2e4e953d04e684a44d9b9af2
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Aug 3 12:27:47 2015 -0500

    fix one pressure DoF

commit da5b2a5ebb9dfaf8a3788052174b3f3421b8eec2
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sat Aug 1 15:34:48 2015 -0500

    melt averaging

commit 5cfe055016a74d4edd91c84355df39c40ec9bdc9
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jul 31 13:48:06 2015 -0500

    update test

commit f7585c581ffac81e879fd58196a9159e8ef42199
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Jul 30 14:04:27 2015 -0500

    add two new tests

commit 4ecf57048ba9c213668d994cc448ae06a004d895
Author: Timo Heister <timo.heister@gmail.com>
Date:   Fri Jul 31 13:57:44 2015 -0400

    introduce MaterialModelOutputs::force_vector

commit c7398667dc1dda16145d8f98562580521236a78b
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Jul 28 15:34:25 2015 -0400

    fix FPEs in shear_bands

commit 7fec6b2324821cacd0f6cb37c652c475cfa3416c
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Jul 28 15:34:15 2015 -0400

    fix uninitialized strain_rate in compute_time_step

commit db7ff23eb18964cba0f7428d4ae80f063e0da70f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jul 24 22:23:50 2015 -0500

    make shear and compaction viscosity consistent in melt simple model

commit e1d5bc1b7235551fcc3ba78ebeeb60c4e4e29c15
Author: Timo Heister <timo.heister@gmail.com>
Date:   Fri Jul 24 16:35:27 2015 -0400

    couple of fixes for melt_paper/global.prm

commit 6cf34037598b8624fa7f4f3422b6426c4323ef57
Author: Timo Heister <timo.heister@gmail.com>
Date:   Fri Jul 24 09:07:18 2015 -0400

    remove warning

commit 9738d2273711f7751f0a934aaa540dbbf07673c7
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Jul 21 16:16:05 2015 -0400

    fix test

    strain_rate is not always set

commit 7ab356e3c181c824d65d42dc6428666cf10ac0c4
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Jul 21 15:48:47 2015 -0400

    make test run in parallel

commit 4a2723f9ce0e019cec07693dd2a72f1dbed6ecfa
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Jul 21 15:46:46 2015 -0400

    fix tests

    - small changes due to changes in nonlinear solver
    - output changes (residuals)
    - missing reaction_terms in material models
    - made melting_rate quicker

commit 6b46028c227c25e824c2e877f707c544463c680f
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Jul 21 15:13:53 2015 -0400

    fix warning

commit e826bead4a108300c2b690b0f1886407ba14a96e
Merge: 9730585 2443661
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Jul 21 15:13:45 2015 -0400

    Merge branch 'melt_reorder_fields_merge' into melt_reorder_fields

    Conflicts:
    	source/material_model/melt_simple.cc
    	tests/upwelling_melting_peridotite_compressible/statistics

commit 9730585276fa23a1ee80e5468c13a2659db7b635
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Jul 21 14:17:19 2015 -0400

    update melting related tests

    A lot of tests where broken since we reordered the fields. Fix the
tests
    as best as possible (some might not do what they were supposed to do
    though).

commit 24436619a3c5333fa87b76c2bee5cdfa7adb77e2
Merge: 125458c c65d773
Author: Timo Heister <timo.heister@gmail.com>
Date:   Fri Jul 17 15:46:02 2015 -0400

    Merge remote-tracking branch 'upstream/master' into
melt_reorder_fields

    Conflicts:
    	include/aspect/introspection.h
    	include/aspect/material_model/interface.h
    	include/aspect/simulator.h
    	include/aspect/simulator_access.h
    	source/mesh_refinement/density.cc
    	source/mesh_refinement/thermal_energy_density.cc
    	source/mesh_refinement/viscosity.cc
    	source/postprocess/dynamic_topography.cc
    	source/postprocess/heat_flux_statistics.cc
    	source/postprocess/internal_heating_statistics.cc
    	source/postprocess/mass_flux_statistics.cc
    	source/postprocess/table_heat_flux_statistics.cc
    	source/postprocess/viscous_dissipation_statistics.cc
    	source/simulator/assembly.cc
    	source/simulator/helper_functions.cc
    	source/simulator/nullspace.cc
    	source/simulator/parameters.cc

commit 9c8fc5216598101662612c07cbca0726fe4c6830
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jul 17 16:53:01 2015 -0500

    add more refienement criteria

commit 15124980448897b01aea1f3435a04260093062f0
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jul 17 15:38:24 2015 -0500

    more reaslistic viscosity in melt simple model

commit 1f7450c44bc633248a71d8c98e5c8529bc80e198
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jul 15 22:23:39 2015 -0500

    add option to have a different temperature dependence for bulk
viscosity in melt simple model

commit 9250476556517fa852a346933316f258c2794774
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jul 15 21:38:24 2015 -0500

    add test that shows problem with non-zero velocity divergence

commit 125458c1bee1686e207162775b5490bc7f22c9c2
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jul 3 00:25:25 2015 -0500

    add option for compressibility to the melt simple model

commit 186b4d64641266b1bc4c9c9de559e868310e70b9
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Jun 28 22:33:16 2015 -0500

    make melt extraction more general

commit d42a20987ccbce62bdbeb9e4762d9aa2c2530652
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Jun 27 10:30:01 2015 -0500

    make melt generation more general for compressible case

commit e9c5323b909fbc930b2e52429f8d355e6d4e2714
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Jun 23 23:03:04 2015 -0500

    convert melt velocity to m/years

commit 565286b07c45ae10a33032034dc356c74aedc2f0
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Jun 23 22:19:46 2015 -0500

    fix solitary wave

commit 17871761b7db02e9fe8e4a0ba2b72b58dc6ea4c6
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Jun 23 21:09:50 2015 -0500

    make compressible tests work

commit 1e497b69e980dd0d4bb648eda7c9b0fbaacf7d59
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Jun 21 00:31:50 2015 -0500

    update simple melt material model

commit c3608ce0396e6163feb651ea10d1d826d4ba3a4b
Author: Timo Heister <timo.heister@gmail.com>
Date:   Wed Jun 3 18:36:20 2015 +0200

    melt incompressible benchmark. working!

commit 1ca101c99ce22575671e0df8c2a32096f25d6f75
Author: Timo Heister <timo.heister@gmail.com>
Date:   Wed Jun 3 18:35:57 2015 +0200

    fix make_pressure_rhs_compatible

commit cfbf7ceebdf5a0a2d8bed66d06dfd97fe5ff1d43
Author: Timo Heister <timo.heister@gmail.com>
Date:   Wed Jun 3 18:35:05 2015 +0200

    fix stokes residual

commit 82c787590e0ad1f87c69b9c61f3b37a2e0f85982
Author: Timo Heister <timo.heister@gmail.com>
Date:   Fri May 8 13:52:02 2015 -0400

    clean up test

commit 4cf269c3b03341823a9f4e04e47c7ecf76ee1371
Merge: 0751856 85192b1
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu May 7 16:42:15 2015 -0400

    Merge remote-tracking branch 'upstream/master' into
melt_reorder_fields

    Conflicts:
    	doc/manual/manual.tex
    	include/aspect/introspection.h
    	include/aspect/material_model/interface.h
    	include/aspect/parameters.h
    	include/aspect/simulator.h
    	source/simulator/assembly.cc
    	source/simulator/core.cc
    	source/simulator/helper_functions.cc
    	source/simulator/initial_conditions.cc
    	source/simulator/introspection.cc
    	source/simulator/nullspace.cc

commit 07518569dcd9c9abd5f36e2cde40e1e138f8bbb4
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue May 5 10:04:27 2015 -0400

    correct reference solution

commit ed55b7c2b45ed2e36092ebf6101f20796e36e41c
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun May 3 10:32:33 2015 -0400

    fix test error computation

commit fc88d59fbd986b35ba54b73576587de3fe5685a9
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun May 3 10:13:10 2015 -0400

    fix denormalize pressure

commit 2eb9b00efea5624d0b570b18185ad947db466ade
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun May 3 10:05:36 2015 -0400

    make test work

commit ce23307ba11f0dd774032a395725b092d31e7712
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Apr 28 20:54:01 2015 -0500

    add test for adaptive melt transport

commit 2143139c4e7d2a69d2e914b7826f5a2cf1b82ba5
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun May 3 07:51:14 2015 -0400

    add small and boring melting example

commit 7251d0d6a3111a612a0f50f26fc2a0278b8ec99b
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sat Apr 25 15:29:36 2015 -0400

    fix initial conditions

commit ab70ad151e54cac5fb7e57d334f1ce4e7dd205b4
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sat Apr 25 15:29:26 2015 -0400

    fix computation of fluid velocity

commit 2bee081f6e5b72de6dd5b1dfbdbf59fdf95a8ac2
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 19 14:03:16 2015 -0400

    update tests

commit cd27e9bbfd7836a370bb9027a352fc885ed9750a
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 19 13:34:28 2015 -0400

    start on fixing tests

commit f4c236e1f551034ac8f4ea600c560603f3e3562a
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 19 13:26:40 2015 -0400

    We can do rhs modification now. Hopefully.

commit 33ab83361e8621ee075e2dde96f9cd990c574a75
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 19 12:52:53 2015 -0400

    pressure scaling and make_pressure_rhs_compatible

commit 4df960dd75c3fece4d5e80bbec272dd26aa4d841
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 19 12:45:59 2015 -0400

    introduce locally_owned_melt_pressure_dofs

commit e8f49359442cc9d5fe3f1d02120eee936ec90c20
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 16 09:22:03 2015 -0400

    fix compute_melt_variables

commit 1f8277b3dfa557b72b4bde8874d0ff2ea7f21daa
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 16 09:03:17 2015 -0400

    astyle

commit 98b967191437a2394449a4673f6adcf6987faa15
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 16 07:42:57 2015 -0400

    fix tests

commit 7f12756ffe78598b04a65844028cde4ca402bdd0
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 16 07:42:35 2015 -0400

    cleanup

commit 5c08e3afc4eeeb8b144753f4c3e8b8031c766b94
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 16 07:41:14 2015 -0400

    solver for new melt formulaion

commit b691ee50d2dad377df4258cb9ee9312066c76348
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 16 07:40:59 2015 -0400

    more melt fixes

commit 8cc27ead118fa8291f989d1c59a487f32f280b3a
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 16 07:39:41 2015 -0400

    melt assembly

commit c97e9bb26b7a292437902cbbae53bb229ac41f03
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 16 07:39:27 2015 -0400

    clean up indexset creation

commit ffcbcc4647208d048bb1c93a13de7d85d0708755
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 12 18:56:17 2015 -0400

    sparsity pattern fixes

commit e9032ba3be6dd6d23b08c62a6bf32685a7741494
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 12 18:53:33 2015 -0400

    fix compute_initial_stokes_residual

commit 7d2365bbf37835d793a86ec02d6d8efe7d9debe8
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 12 18:53:16 2015 -0400

    implement compute_melt_variables

commit a17d8a3f81cf6eb5fcb8c05f1aa7bc482f84ed6b
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 12 18:50:59 2015 -0400

    correct graphical output

commit 50bd5fa6cae982c5776cbc5d27bda120e26ff94c
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 12 18:49:58 2015 -0400

    fix visualization plugins

commit 29b0e4b7f12611506f735db6a5903e70df71a274
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 12 18:49:47 2015 -0400

    change melt FE layout again

commit 4276778560e07a8d39433dc9ea031e2ce1a3fc26
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Apr 9 14:34:57 2015 -0400

    fix check if not using melt transport

commit 3fb82039aacf35365ed16402f84bb57de00ac133
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Apr 6 17:50:36 2015 -0400

    extract parameters and improve introspection construction

commit 5c9820f9082700a074d8f1512f091f5e71920462
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sun Apr 5 11:28:24 2015 -0400

    solitary waves in parallel

    - make work with MPI
    - fix error norm (and conversion to p_c)
    - simplify logic some
    - adjust solver tolerances

commit 32c92ac9f1e2781ce649ab4748d74b27df906297
Author: Timo Heister <timo.heister@gmail.com>
Date:   Sat Apr 4 15:57:29 2015 -0400

    astyle solitary wave

commit 9d5d827c0f0666841d44960d6c5471c3821c3360
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Apr 8 11:55:02 2015 -0500

    update melt convergence test (does not work yet)

commit 84fee8cb7249b77ed47eaaef2dc49752c699f564
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Apr 6 15:54:40 2015 -0500

    add a simple test for melt transport that demonstrates convergence

commit 0e2f309423122bf0ce32b590f11867c3e279bf47
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Apr 6 15:49:43 2015 -0500

    fix make pressure RHS compatible for melt transport

commit 9971c478d834959db50d3e15af4e689b896216cc
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Apr 5 12:46:05 2015 -0500

    first version of convergence test with adaptive refinement for melt
transport

commit aa3ea863e29eb55d86733bb6b82d305ac8249b06
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Mar 25 11:22:04 2015 -0500

    this should also work with adaptivity now

commit 9ff684cec4392973a3c00ea8da4297d4a89ad39b
Merge: 6e4bf5d b5c56bd
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Mar 24 16:19:53 2015 -0500

    Merge branch 'include_melt_transport' of
https://github.com/jdannberg/aspect into include_melt_transport

commit 6e4bf5d72ebb40f8ec3c0e5ec053a09f3e74b627
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Mar 24 16:18:26 2015 -0500

    add refinement criterion artificial viscosity

commit b5c56bdbfdcda6f079efefd20de6e9a3a934898a
Merge: c59b087 8d8d3b3
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Mar 21 03:58:15 2015 +0100

    Merge branch 'include_melt_transport' of github.com:jdannberg/aspect
into include_melt_transport

commit c59b087d117e9b5ef732e1077f768164d4e94b6c
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Mar 21 03:55:35 2015 +0100

    change interpolation to make script work for adaptive meshes

commit 8d8d3b3a5f8aa3069dddaf305df6755f57611d8b
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Mar 2 18:04:09 2015 +0100

    add a testcase for the artificial viscosity

commit 8d6676e78256320a9102c19a21d6aa48b442a3e3
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Feb 27 18:53:23 2015 +0100

    add cell reference where it was missing and add latent heat to melt
simple model

commit cce912de6b86caaf5277f3f4c21e437d2c23eaf1
Merge: cf02255 7a1520d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Feb 27 15:04:48 2015 +0100

    Merge branch 'cell_in_material_model' of
https://github.com/gassmoeller/aspect into include_melt_transport

    Conflicts:
    	include/aspect/simulator.h
    	source/simulator/assembly.cc

commit 7a1520dd98b4c775dc7c626ca6d4638531267f6f
Author: Rene Gassmoeller <R.Gassmoeller@mailbox.org>
Date:   Mon Feb 9 15:42:46 2015 +0100

    Add cell reference to material model inputs.

    Add cell reference in all possible places.

    An invalid iterator is returned in all cases, in which we do not
know the
    current cell.

commit cf022555e90d0a391dcf86271b316721c3b976b5
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 26 20:37:19 2015 +0100

    fix assembly after merge

commit b7029cfd4926773c784dc17aa5cc0690b3bf89b2
Merge: 99d0117 8489c2f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 26 20:28:07 2015 +0100

    Merge branch 'include_melt_transport' of
https://github.com/tjhei/aspect into include_melt_transport

commit 99d0117033e09334d828d88f718875bcd33c330e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 26 20:25:29 2015 +0100

    indent

commit feef5c6de7473c147173f1d7a91ff45c73712f98
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 26 20:25:14 2015 +0100

    script update

commit 8489c2f6e7b9cd44ee289e6989bd3a3ba9fcf521
Merge: 5dbd775 f9e0dbd
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Feb 26 14:21:48 2015 -0500

    Merge remote-tracking branch 'upstream/master' into
include_melt_transport

    Conflicts:
    	include/aspect/simulator.h
    	source/simulator/assembly.cc
    	source/simulator/core.cc
    	source/simulator/helper_functions.cc
    	tests/composition_reaction/screen-output

commit 5dbd775c2b8df357a25015de9dd28961b8b41686
Author: Timo Heister <timo.heister@gmail.com>
Date:   Thu Feb 26 13:34:39 2015 -0500

    fix assert

commit 4069e6e37b74ca01bd27362e961f8b5f63d8e149
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 26 16:12:22 2015 +0100

    fix script and add lognormal fit

commit 9a24397ab237fa0455c49bf3f9a23da00168377f
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 24 15:34:52 2015 +0100

    leave todo

commit 7e773ee189a8e9dfffc3a843e6be95040d291dae
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 24 15:26:46 2015 +0100

    add missing files

commit 11e2038c73df001d822b61a7a7984b1c2068f1c2
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 24 15:17:35 2015 +0100

    cleanup

commit db6b3ea6a66418b18261b256d1cc3ea6749b78f7
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 24 14:42:30 2015 +0100

    second try

commit 07a0de00c6da84117b9a08ad2d5c156f50aeb484
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 24 14:34:52 2015 +0100

    fix simulator access

commit ea812ecdea64754e458b273b593b0feb23f4f2b7
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 24 13:46:31 2015 +0100

    update script

commit 96c86a8c4a135911b10fb867bcaaef2118422fe2
Merge: 2196411 aa731b1
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 23 12:11:22 2015 +0100

    Merge branch 'include_melt_transport' of
https://github.com/tjhei/aspect into include_melt_transport

commit 21964116438decf68fcd872f6f38705896a98464
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 23 12:07:37 2015 +0100

    first try of adding compositional terms to the artificial viscosity
calculation and provide the option to output artificial viscosity for
compositional fields

commit a2607104f700ad05e87868bc6077c6956045d550
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Feb 20 14:42:18 2015 +0100

    add a test for the porosity advection equation with compressible
mterial models

commit aa731b1635ccd7048f345ce29a97cba047d9f6d8
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Feb 17 10:53:12 2015 -0500

    make shear bands work in parallel, add script

commit 1319947c1e18a7be244e7eb53575d7774093d007
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 17 16:13:19 2015 +0100

    update solitary wave model

commit c381a014dc55bf3475bbf931eb8953ac5a71d3c1
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 17 16:12:34 2015 +0100

    update compositional fields after all of them have been solved

commit 1e38fd2e311c59d9a5d596740ee33d87b0c52777
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 16 17:51:12 2015 +0100

    move porosity-term in advection equation to LHS

commit 3a59340fb316b1ced5a7ad4d340bba44bc783cb7
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 12 14:07:57 2015 +0100

    fix

commit ba052f16e86c3f69ae544ba21eadd7ee1b5e5832
Author: Timo Heister <timo.heister@gmail.com>
Date:   Wed Feb 11 18:26:09 2015 -0500

    fix denormalize_pressure()

commit 02d6a0a1544fe7eea5e91505cd3240b024b01e93
Author: Timo Heister <timo.heister@gmail.com>
Date:   Wed Feb 11 18:22:53 2015 -0500

    fix compute_initial_stokes_residual()

commit f68cead37591769e51d69037b32f93fd38d52e60
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 11 16:27:51 2015 +0100

    add shear bands postprocessor that writes equidistant porosity
output

commit dbef220e955c61c63334667bbb559e763cbc01a1
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 9 19:23:08 2015 +0100

    only compute melt RHS when we use melt transport, in other cases use
the reaction term for the porosity field instead

commit dd8fcef39ec26e78e57b5a0b7be2f49245d2cabd
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 9 18:52:35 2015 +0100

    fix a bug in the initial stokes residual that occurred without melt
transport

commit 4cbb301d00bd03d0ca1830159198c06dadd42e74
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Feb 6 15:43:28 2015 +0100

    simplify calculation of initial stokes residual

commit 46b57047d353060d74587e9ec5e59574be1f5a56
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 5 20:52:04 2015 +0100

    update test output

commit 93313cf4b0b211813a3d08f6afd50bc30466264e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 5 20:39:34 2015 +0100

    fix the initial Stokes residual for the direct solver

commit e0815d6dd7c072a3e0cace0055697e33b0daa100
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 5 16:40:49 2015 +0100

    add a comment

commit 11ce5a76090282791cf35644a91ef63106b7abdf
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 5 16:40:25 2015 +0100

    use fixed number as seed for random number generator

commit bdd1a5211f6d34ef5ec2a5518af3af90bc294b02
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Feb 5 13:55:08 2015 +0100

    fix a bug regarding the pressure conversion

commit 9f683c31866e0b7807ea4e1f2a863f2a983af9a1
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 4 18:51:51 2015 +0100

    use rhs to calculate initial residuals

commit cc8b52b1aab8a672e07d1f3cf8ddab69e3f6fefa
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Feb 4 16:08:21 2015 +0100

    make index const

commit 05c4803174502638ca2e9c109502a6a49de30eb8
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Feb 3 13:26:06 2015 -0500

    fix make_pressure_rhs_compatible

    We accidentally touched pressure unknowns more than once, which
    obviously produces wrong results.

commit 593d0cd6ff7b3ecd6982b2600b7ce9256b90252e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 3 15:42:19 2015 +0100

    this should also work for the direct solver now

commit c31f34cabc5e1b007ca825ce3eb7d9dd70f2ec4c
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 3 15:39:53 2015 +0100

    make pressure rhs compatible when melt transport is computed

commit 8ff37545122875414daa6976b9e95ca586892dcb
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Feb 3 08:58:30 2015 -0500

    fix bug in convert_pressure_blocks

commit db7809e9e32336d83faca125c556c3a2dbb541fb
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Feb 3 08:56:05 2015 -0500

    make_rhs_compatible if we have melt

commit 9cc50acf57d4c7360a410a91d39b8b8324bd6a9d
Merge: deee192 4acc5f7
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Feb 3 08:40:08 2015 -0500

    Merge remote-tracking branch 'upstream/master' into
include_melt_transport

    Conflicts:
    	include/aspect/introspection.h
    	source/simulator/core.cc
    	tests/passive_comp/screen-output

commit deee192619272d85bd6654f8d6bd1aeed4178ead
Merge: 98d1461 d3f0e34
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Feb 3 11:42:57 2015 +0100

    Merge branch 'include_melt_transport' of
https://github.com/tjhei/aspect into include_melt_transport

commit d3f0e3461337f346193e033814b00ce1a78766b9
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Feb 2 15:23:16 2015 -0500

    cleanup convert_pressure_blocks

commit 6b3fad8f0368c878c7c72fc5d9ae70056f812760
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Feb 2 15:15:35 2015 -0500

    fix parallel denormalize_pressure()

commit 98d1461a52a3b2d1c46a85223607274ad08a323d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 2 20:53:28 2015 +0100

    update test output

commit 5209cce8401b3ed5b3d75faa7ba79a6ee251d3d4
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 2 20:26:25 2015 +0100

    add pressure conversion to iterative solver

commit f4fb4ab55528f3849405cb02939125abf45ebd2e
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 2 18:35:30 2015 +0100

    transfer the pressure conversion (p_s, p_f) <--> (p_f, p_c) to
helper_functions.cc

commit 8ccc1fac86d7e360447658c6432dd674c0552c0d
Merge: 7874381 df7f2a0
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Feb 2 14:48:59 2015 +0100

    Merge branch 'include_melt_transport' of
https://github.com/tjhei/aspect into include_melt_transport

commit 7874381a1d3c638b268b17884d711c6dccdfeee5
Merge: f9848c3 564341b
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 30 22:32:02 2015 +0100

    Merge branch 'include_melt_transport' of github.com:jdannberg/aspect
into include_melt_transport

commit f9848c36f948ae8a09f46a81ed9103258d126d92
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 30 22:31:47 2015 +0100

    fix a typo

commit 564341b1b8abab0aaf29392f882994ebfc3a19b7
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 30 22:25:34 2015 +0100

    add interpolation to shear band white noise initial condition

commit df7f2a015822e6894ed20dd73fa3f3821a6451d4
Author: Timo Heister <timo.heister@gmail.com>
Date:   Fri Jan 30 14:52:45 2015 -0500

    first working iterative solver with melt

commit 9cadf5ee8bd82771e50d152a485ea257f800c2ef
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jan 30 15:24:33 2015 +0100

    add a test that produces magmatic shear bands

commit aa356262019bf71f069c0f89a9d14dc94196ef69
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jan 28 16:40:46 2015 +0100

    change the output of the pressure boundary to density * gravity
instead of just the density

commit d27818e0f75370da9f96f1f13957f6007c5be978
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jan 28 12:05:54 2015 +0100

    add some comments

commit 6d4ca0e087e441aef10530b6a0380e011970c4ea
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Jan 27 20:56:48 2015 +0100

    first shot at adding fluid velocity and compaction pressure error to
the compressible melt transport test

commit ffff7689953e9c2a5cd8a076560787ce80e7f998
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Jan 27 16:05:58 2015 +0100

    renaming and comments added to fluid pressure boundary conditions

commit a29aadf003d48746070c26a4ce89cf52818f5eb8
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Jan 26 22:47:44 2015 -0500

    port test

commit 9c77109f7ab50638557456d527cc9cffbb6ec0b8
Author: Timo Heister <timo.heister@gmail.com>
Date:   Mon Jan 26 22:43:42 2015 -0500

    first shot at FluidPressureBoundary

commit aa63d50eebbc42c34860873b2eefec6be555f2bf
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Dec 19 15:30:55 2014 +0100

    switch of pressure RHS compatibility for melt transport

commit d4810292c7b8ed9dcba88c5b1513f27d51ca2258
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Dec 19 15:16:10 2014 +0100

    update solitary wave benchmark

commit f822e0f0d04a35d353346904d967b2a622848c50
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Dec 18 15:26:26 2014 +0100

    add error calculation to melt compressible test

commit 563faf5cc89a936eadfef21f21f2651aa584bdb9
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Dec 17 18:01:06 2014 +0100

    add a test for compressible melt transport

commit dceaec64a04bdbd7923b9a920e1069be0b4250c9
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Dec 5 14:51:14 2014 +0100

    preliminary BC for new test

commit 2ba8b33545df3d977015b6d86a180481497bfd57
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Dec 5 14:50:43 2014 +0100

    start to add a test for compressible melt transport -- does not work
yet

commit 2eb77c23b5e5215584fcb5ee8e792bfedd4ecc5d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Dec 5 14:50:10 2014 +0100

    update output message

commit 0796c76108da3b9a3c49dba46d4bb9252f73305b
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Nov 27 19:40:12 2014 +0100

    remove the boundary integral from the LHS and use the boundary
integral on the RHS for a boundary condition grad p_f = rho_s g

commit 3946520dc2cdd42ad61ddf7195339a0b51e86a69
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Nov 27 19:38:42 2014 +0100

    use the phase shift to calculate the shape error of the solitary
wave

commit e8b7c7b9fadbf525b01061fd178aab24411b726d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Nov 21 20:43:43 2014 +0100

    fixes in the melt_material_4 test

commit 48d5829c2fcf73b25280d04b09124a3b0419b23c
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Nov 21 20:43:08 2014 +0100

    comments

commit f7afe41b5352b0ad2e12bd235172cfad4f23186d
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Nov 21 20:42:26 2014 +0100

    solitary wave benchmark updates

commit e985e49fac812e734f2ba9b73589bd4f6dc2eb76
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Nov 11 20:41:58 2014 +0100

    update test

commit b9711b2a9bc1838fa620252501dacb1c34a66345
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Nov 11 20:41:47 2014 +0100

    change material model

commit 452c82bb4aed705532aa5ab829de2239c53bacdd
Merge: cd635d6 9a9fdd2
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Nov 11 20:41:30 2014 +0100

    Merge branch 'iterated_IMPES_fix' into include_melt_transport

    Conflicts:
    	include/aspect/simulator_access.h
    	source/simulator/simulator_access.cc
    	tests/multicomponent_arithmetic/screen-output
    	tests/multicomponent_geometric/screen-output
    	tests/multicomponent_max_composition/screen-output

commit cd635d62818f5912311a51653e9d7697587b5e0b
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Nov 11 14:33:26 2014 +0100

    change output order of residuum in iterated IMPES

commit 86b4367f2c25189e7c8d5016b2d05e44ab94c3b3
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Nov 11 14:31:55 2014 +0100

    some more fixes for zero melt limit

commit e352a16109018cdfafa893f1e5ec8b66c27d1cfc
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Nov 7 20:48:56 2014 +0100

    bugfix in melt simple material model

commit 4544ff9e39476b0fd53ea9b02911a7557532b9d6
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Nov 7 20:26:50 2014 +0100

    use the zero porosity limit in some other places

commit 0fc9b20a6b5a913aaff52baba18b239f0c6fae03
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Nov 7 17:04:20 2014 +0100

    add a test for the melting rate

commit 7750a585b67f13b79502620260f84db75b98f97a
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Nov 6 11:51:55 2014 +0100

    add a simple material model for melt migration

commit 2688d899fc24c4e3da57cf20678294248e82c1a1
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Nov 6 11:51:33 2014 +0100

    introduce a minimum porosity for the melt migration

commit 11f81798636c5940fc23de670af1d1f22d43c740
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Nov 4 16:17:24 2014 +0100

    add the option to read the solitary wave from an input file

commit f08f0bcff6f040e7618403a33cbb9e2346d48489
Merge: f577d35 a57fdd0
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Oct 15 17:45:22 2014 +0200

    Merge branch 'include_melt_transport' of
https://github.com/tjhei/aspect into include_melt_transport

commit f577d3598bf9f51abc5124dc8f24e347707cb500
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Oct 15 17:43:41 2014 +0200

    make sure that the melt fraction postprocessor uses the right field
to calculate the melt fraction

commit a57fdd01e4ae3723a24e4afbfd7dbe73f69d948f
Author: Timo Heister <timo.heister@gmail.com>
Date:   Wed Oct 15 10:08:57 2014 -0400

    undo melt transport pressure transformation to compute correct
residual

commit b8f22f4ef8879fea00d95c1c7ce04cf56bcb81e0
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Tue Oct 14 17:03:31 2014 +0200

    improve method to calculate phase shift

commit 66199b81b3130f8d99fbc993d79dd7a83a67baae
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Oct 13 18:11:00 2014 +0200

    some smaller fixes of indices and initialization

commit b09e8a3ee43da874e43349d5ea58d064897b7917
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Sep 19 18:43:18 2014 +0200

    change some parameters

commit 86e50d5586d73b5354f8a88235b36c76eb3cc484
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Sep 15 19:27:18 2014 +0200

    fix pressure in solitary wave benchmark

commit a3646f0de650abd29ef6ce6443cc6924b37d3816
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Sep 14 16:19:04 2014 +0200

    add error for pressure

commit 871d6bc8ff50988599e357c948f20569542cd928
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Sep 8 19:01:42 2014 +0200

    add functions to access the material model and initial conditions
parameters

commit 27c960dc9f25a483603b7bfdd874a0f7bd7afe59
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Aug 21 13:57:28 2014 +0200

    change documentation and minimum porosity

commit a62cc9448f2fab7dbdb3537f57cb9957a43eb8b7
Merge: d733ef1 75e7500
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Aug 17 22:18:25 2014 +0200

    Merge branch 'include_melt_transport' of github.com:jdannberg/aspect
into include_melt_transport

commit d733ef1fc0a0462d72ffd588ad317f8c208e85d8
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Aug 17 22:13:04 2014 +0200

    fix solitary wave benchmark

commit 75e75008b4e365b4826ca08e47de75d86fa1bf55
Merge: 5f65268 b355272
Author: jdannberg <dannberg@gfz-potsdam.de>
Date:   Tue Aug 12 17:46:18 2014 +0200

    Merge pull request #7 from tjhei/pr_make_melt_pp_run_in_parallel

    make postprocessor in test run in parallel

commit b355272570e96f29f644afdf33487842677bb4af
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Aug 12 11:42:51 2014 -0400

    make postprocessor in test run in parallel

commit 5f652682bee3eafa1c1d943f261fc13db1804851
Merge: cd7ef85 f30d86a
Author: jdannberg <dannberg@gfz-potsdam.de>
Date:   Tue Aug 12 16:40:09 2014 +0200

    Merge pull request #6 from tjhei/fix_petsc_melt_stuff

    fix broken write access to ghost vector

commit f30d86af8d2071953927de243f8eb4b3b39a70bb
Author: Timo Heister <timo.heister@gmail.com>
Date:   Tue Aug 12 10:30:58 2014 -0400

    fix broken write access to ghost vector

commit cd7ef85249eba414f9a028107b12d1e6d9a9f03c
Merge: a031956 0cde46a
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Aug 11 15:01:27 2014 +0200

    Merge branch 'master' into include_melt_transport

    Conflicts:
    	doc/manual/manual.tex

commit a0319567ea7bad89affa2df12731407b2c806001
Merge: 8c07697 1d87013
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Mon Aug 11 12:26:20 2014 +0200

    Merge branch 'include_melt_transport' of github.com:jdannberg/aspect
into include_melt_transport

commit 1d8701379d593f4efdabddb5b87921dbce205583
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sun Jul 13 12:34:33 2014 -0700

    make material properties in the test porosity dependent

commit 9c82e70360704255f9428a7cc775497017c9980c
Merge: 760bf56 eaead54
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jul 11 22:52:07 2014 -0700

    Merge branch 'include_melt_transport' of github.com:jdannberg/aspect
into include_melt_transport

commit 760bf5627b8a704ec059a2d152a76357e9fba09a
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Fri Jul 11 22:50:46 2014 -0700

    start to add a better test for steady state melt transport

commit eaead54654adf28ee70e02abe5fb5ac4d8b174e0
Merge: b319e25 22191c2
Author: jdannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jul 9 21:27:07 2014 -0700

    Merge pull request #2 from tjhei/include_melt_transport

    improve melt_material_4 test to somehow converge for small timestep

commit 22191c24db31212f11f3b17d06bda84fc47035a2
Author: Timo Heister <timo.heister@gmail.com>
Date:   Wed Jul 9 21:18:53 2014 -0700

    improve melt_material_4 test to somehow converge for small timestep

commit b319e25cf28cc301f7dc7af55e1585c11776c402
Merge: 5833a6a cc14cba
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jul 9 19:32:58 2014 -0700

    Merge branch 'include_melt_transport' of github.com:jdannberg/aspect
into include_melt_transport

commit 5833a6abed1230daff869d2bd39a708e8516a1d0
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Wed Jul 9 19:31:53 2014 -0700

    add a comment

commit 8c07697625b52bd1169f1fef36ce8af5ec354872
Merge: 8ba206e 4dd89bf
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Sat Jun 21 11:49:16 2014 +0200

    Merge branch 'melting_model' of github.com:jdannberg/aspect into
include_melt_transport

commit 8ba206e1f1c9fa380689698ae9082746266beb4b
Merge: cc14cba 9398730
Author: Juliane Dannberg <dannberg@gfz-potsdam.de>
Date:   Thu Jun 19 16:14:42 2014 +0200

    Merge branch 'master' into …
@jdannberg jdannberg changed the title [For review, do not merge] Squashed main melt implementation Squashed main melt implementation Jun 24, 2016
@gassmoeller gassmoeller merged commit 9137688 into geodynamics:master Jun 24, 2016
@jdannberg jdannberg deleted the melt_review branch May 8, 2017 15:18
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