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

fix deprecation warning #2294

Merged
merged 1 commit into from Jun 16, 2018

Conversation

tjhei
Copy link
Member

@tjhei tjhei commented Jun 15, 2018

fix:

../source/simulator/assemblers/stokes.cc:219:54: warning: ‘Number
dealii::double_contract(const dealii::Tensor<2, dim, Number>&, const
dealii::Tensor<2, dim, Number>&) [with int dim = 2; Number = double]’ is
deprecated [-Wdeprecated-declarations]
                 data.local_rhs(i) +=
(double_contract(elastic_outputs->elastic_force[q],Tensor<2,dim>(scratch.grads_phi_u[i])))

@tjhei
Copy link
Member Author

tjhei commented Jun 15, 2018

I have to admit that I did not check if this is the correct contraction. @bangerth ? :-)

@tjhei
Copy link
Member Author

tjhei commented Jun 15, 2018

or maybe use scalar_product?

@bangerth
Copy link
Contributor

Yes, let's use scalar_product. I think that's clearer.

Pre-approved with that change!

fix:
```
../source/simulator/assemblers/stokes.cc:219:54: warning: ‘Number
dealii::double_contract(const dealii::Tensor<2, dim, Number>&, const
dealii::Tensor<2, dim, Number>&) [with int dim = 2; Number = double]’ is
deprecated [-Wdeprecated-declarations]
                 data.local_rhs(i) +=
(double_contract(elastic_outputs->elastic_force[q],Tensor<2,dim>(scratch.grads_phi_u[i])))
```
@gassmoeller gassmoeller merged commit e50e0a4 into geodynamics:master Jun 16, 2018
@tjhei tjhei deleted the double_contract_warning branch June 16, 2018 21:41
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