Capitalized Boussinesq approximation #1639
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bangerth
reviewed
May 13, 2017
| @@ -2005,13 +2005,13 @@ \subsubsection{Combined formulations} | |||
| (Section~\ref{sec:tala}). | |||
|
|
|||
| \item | |||
| ``boussinesq approximation'': This formulation sets the mass conservation approximation to ``incompressible'', | |||
| ``Boussinesq approximation'': This formulation sets the mass conservation approximation to ``incompressible'', | |||
There was a problem hiding this comment.
this occurrence of the word needs to match what is being used in the .prm files. Did you change that as well?
There was a problem hiding this comment.
Yes, that should be changed in all files where it occurs (this PR is just a recursive sed find-replace)
bangerth
reviewed
May 13, 2017
include/aspect/parameters.h
Outdated
| @@ -123,7 +123,7 @@ namespace aspect | |||
| */ | |||
| enum Kind | |||
| { | |||
| boussinesq_approximation, | |||
| Boussinesq_approximation, | |||
There was a problem hiding this comment.
I think we should keep it lower-case here, just like we have functions such as solve_stokes() etc.
include/aspect/parameters.h
Outdated
| else if (input == "boussinesq approximation") | ||
| return Formulation::boussinesq_approximation; | ||
| else if (input == "Boussinesq approximation") | ||
| return Formulation::Boussinesq_approximation; |
There was a problem hiding this comment.
and this changes what we accept in .prm files
| @@ -322,7 +322,7 @@ namespace aspect | |||
| prm.enter_subsection("Formulation"); | |||
| { | |||
| prm.declare_entry ("Formulation", "custom", | |||
| Patterns::Selection ("isothermal compression|custom|anelastic liquid approximation|boussinesq approximation"), | |||
| Patterns::Selection ("isothermal compression|custom|anelastic liquid approximation|Boussinesq approximation"), | |||
There was a problem hiding this comment.
this is an incompatible change -- we should discuss
|
Yes, for this change we should include the sed command to fix it into the |
|
/run-tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses Issue #1623