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

allow ascii data reference profile material model to output seismic v… #1570

Merged
merged 1 commit into from May 12, 2017

Conversation

jdannberg
Copy link
Contributor

…elocities

@@ -107,6 +107,11 @@ namespace aspect
* @}
*/

virtual
Copy link
Member

Choose a reason for hiding this comment

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

add a comment "add named outputs for seismic properties"

catch (...)
{
// keep the invalid unsigned int entry if the columns do not exist,
// we'll handle this below when we fill the outputs
Copy link
Member

Choose a reason for hiding this comment

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

so what if some of the columns exist? I guess you would only see them if you find them in the correct order. Hrm, not sure if that is important.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added a new function to utilities that returns an invalid unsigned int if the column does not exist (individually for every column name I use it with).

@@ -0,0 +1,150 @@
# A cookbook for using seismic velocity data
Copy link
Member

Choose a reason for hiding this comment

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

update to say what it is based on and that you test seismic output

-----------------------------------------------------------------------------
-----------------------------------------------------------------------------

Ascii data file coordinates are not equidistant.
Copy link
Member

Choose a reason for hiding this comment

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

this is kind of ugly. :-(

@jdannberg
Copy link
Contributor Author

I think I addressed all of you comments, even the one with the ugly warning 😃

@gassmoeller
Copy link
Member

@tjhei: Your time to press the merge button 😄

1 similar comment
@gassmoeller
Copy link
Member

@tjhei: Your time to press the merge button 😄

@tjhei tjhei merged commit 6b68f22 into geodynamics:master May 12, 2017
@jdannberg jdannberg deleted the burnman_seismic_velocities branch August 18, 2017 15: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

3 participants