← Back to branch summary

~ubuntu-branches/ubuntu/wily/dolfin/wily-proposed

« back to all changes in this revision

Viewing changes to dolfin/adaptivity/GenericAdaptiveVariationalSolver.cpp

  • Committer: Package Import Robot
  • Author(s): Johannes Ring
  • Date: 2014-09-22 14:35:34 UTC
  • mfrom: (1.1.17) (19.1.23 sid)
  • Revision ID: package-import@ubuntu.com-20140922143534-0yi89jyuqbgdxwm9
Tags: 1.4.0+dfsg-4
http://bugs.debian.org/760658
* debian/control: Disable libcgal-dev on i386, mipsel and sparc.
* debian/rules: Remove bad directives in pkg-config file dolfin.pc
  (closes: #760658).
* Remove debian/libdolfin-dev.lintian-overrides.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dolfin/adaptivity/GenericAdaptiveVariationalSolver.cpp
85
85
    }
86
86
 
87
87
    // Initialize adaptive data
88
 
    boost::shared_ptr<Parameters> datum(new Parameters("adaptive_data"));
 
88
    std::shared_ptr<Parameters> datum(new Parameters("adaptive_data"));
89
89
    _adaptive_data.push_back(datum);
90
90
    const int refinement_level = i;
91
91
    datum->add("refinement_level", refinement_level);
104
104
    //--- Stage 0: Solve primal problem
105
105
    begin(PROGRESS, "Stage %d.0: Solving primal problem...", i);
106
106
    timer.start();
107
 
    boost::shared_ptr<const Function> u = solve_primal();
 
107
    std::shared_ptr<const Function> u = solve_primal();
108
108
    datum->add("time_solve_primal", timer.stop());
109
109
 
110
110
    // Extract views to primal trial space and mesh
189
189
          max_iterations);
190
190
}
191
191
//-----------------------------------------------------------------------------
192
 
std::vector<boost::shared_ptr<Parameters> >
 
192
std::vector<std::shared_ptr<Parameters> >
193
193
GenericAdaptiveVariationalSolver::adaptive_data() const
194
194
{
195
195
  return _adaptive_data;