@@ -470,7 +470,7 @@ namespace aspect
470470 for (unsigned int i=0 ; i<evaluation_flags.size (); ++i)
471471 evaluation_flags_union |= evaluation_flags[i];
472472
473- if (evaluation_flags_union & (update_values | update_gradients ))
473+ if (evaluation_flags_union & (EvaluationFlags::values | EvaluationFlags::gradients ))
474474 {
475475 // Reinitialize and evaluate the requested solution values and gradients
476476 evaluator.reinit (inputs.current_cell ,
@@ -480,20 +480,20 @@ namespace aspect
480480 evaluation_flags);
481481 }
482482
483- if (evaluation_flags_union & update_values )
483+ if (evaluation_flags_union & EvaluationFlags::values )
484484 inputs.solution .resize (n_particles,small_vector<double ,50 >(evaluator.n_components (), numbers::signaling_nan<double >()));
485485
486- if (evaluation_flags_union & update_gradients )
486+ if (evaluation_flags_union & EvaluationFlags::gradients )
487487 inputs.gradients .resize (n_particles,small_vector<Tensor<1 ,dim>,50 >(evaluator.n_components (), numbers::signaling_nan<Tensor<1 ,dim>>()));
488488
489489 for (unsigned int i = 0 ; i<n_particles; ++i)
490490 {
491491 // Evaluate the solution, but only if it is requested in the update_flags
492- if (evaluation_flags_union & update_values )
492+ if (evaluation_flags_union & EvaluationFlags::values )
493493 evaluator.get_solution (i, {&inputs.solution [i][0 ],inputs.solution [i].size ()}, evaluation_flags);
494494
495495 // Evaluate the gradients, but only if they are requested in the update_flags
496- if (evaluation_flags_union & update_gradients )
496+ if (evaluation_flags_union & EvaluationFlags::gradients )
497497 evaluator.get_gradients (i, {&inputs.gradients [i][0 ],inputs.gradients [i].size ()}, evaluation_flags);
498498 }
499499
0 commit comments