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.

Sign up for GitHub

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

Piro fix for building with Clang 6 #3248

Merged
merged 2 commits into from
Aug 8, 2018
Merged

Piro fix for building with Clang 6 #3248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a058692
ROL: fix typo in ThyraProductME_Objective constructor, '==' --> '='.
Aug 7, 2018
53e0cd6
Piro: use template keyword when calling memeber function (fix issue #…
Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/piro/src/Piro_NOXSolver_Def.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void Piro::NOXSolver<Scalar>::evalModelImpl(
if(analysisParams.isSublist("Optimization Status")){
auto optimizationParams = analysisParams.sublist("Optimization Status");
if(optimizationParams.isParameter("Optimizer Iteration Number")) {
int iteration = optimizationParams.get<int>("Optimizer Iteration Number");
int iteration = optimizationParams.template get<int>("Optimizer Iteration Number");
int write_interval = analysisParams.get("Write Interval",1);
Teuchos::RCP<Teuchos::ParameterList> writeParams = Teuchos::rcp(new Teuchos::ParameterList());
if (write_interval > 0) {
Expand Down
2 changes: 1 addition & 1 deletion packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Objective.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class ThyraProductME_Objective : public Objective<Real> {
thyra_model(thyra_model_), g_index(g_index_), p_indices(p_indices_), params(params_) {
valueUpdated = gradientUpdated = false;
value_ = 0;
x_ptr == Teuchos::null;
x_ptr = Teuchos::null;
grad_ptr = Teuchos::null;
if(params != Teuchos::null)
params->set<int>("Optimizer Iteration Number", -1);
Expand Down