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
Adjust default vs vp values #2189
Adjust default vs vp values #2189
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One question regarding documentation. Looks like it only broke 10% of the tests ;)
a signaling Nan. This ensures every plugin that creates seismic outputs needs | ||
to use a material model that actually fills those outputs. | ||
<br> | ||
(Rene Gassmoeller, 2018/04/27) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be worth adding this documentation to the seismic_anomalies
post-processor description? Alternatively, is there already an assert that produces a similar error message when the values are filled with Nan?
da3a0f0
to
3e35b91
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, makes sense. Let's see what the tester says.
(out.template get_additional_output<MaterialModel::SeismicAdditionalOutputs<dim> >() != 0); | ||
|
||
AssertThrow(material_model_provides_seismic_output, | ||
ExcMessage("You requested the 'Seismic' postprocessor, " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please correct the name of the postprocessor
(out.template get_additional_output<MaterialModel::SeismicAdditionalOutputs<dim> >() != 0); | ||
|
||
AssertThrow(material_model_provides_seismic_output, | ||
ExcMessage("You requested the 'Seismic' postprocessor, " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here
source/postprocess/depth_average.cc
Outdated
variables.push_back("Vp"); | ||
if (std::find( output_variables.begin(), output_variables.end(), "Vs") != output_variables.end()) | ||
{ | ||
AssertThrow(material_model_provides_seismic_output, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you move this assert above line 377 and combine it with the one below?
3e35b91
to
64fdba1
Compare
I addressed the comments and updated the test results. The one issue here is that the column numbers in the depth_average output files will change if no seismic velocities are supplied by the material model. This can break postprocessing scripts (only for columns viscosity and vertical heat flux). I do not see a way to prevent this though. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should also go through all cookbooks and see if they include anything that would need an update in the column number.
Otherwise, this looks good. From my side, this is ready to be merged once you've addressed these small changes.
@@ -0,0 +1,5 @@ | |||
Changed: The default value for AdditionalSeismicOutputs was changed from -1 to | |||
a signaling Nan. This ensures every plugin that creates seismic outputs needs | |||
to use a material model that actually fills those outputs. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If there's no way around changing the change in column number in the depth average file, that should be documented here too.
Also remove seismic velocities from depth average if not provided
a09fd96
to
6c291cd
Compare
I ran the check.sh script in benchmarks and cookbooks, and checked that the seismic velocity columns are not referenced in the manual or somewhere else. Good to go? |
Closes #1562. Lets see how many tests break.