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

Jump to bottom

Move up linear solver #951

Merged
merged 18 commits into from
Jan 15, 2016
Merged

Move up linear solver #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7513c62
[PL] Move up lin.solver, A, rhs, x in Process.
endJunction Jan 12, 2016
092e7ac
Update ProjectData for tmpl-ed Process.
endJunction Jan 12, 2016
833dee6
[PL] Clang-format Process.
endJunction Jan 11, 2016
614672e
[PL] Move up setting of linear solver options.
endJunction Jan 11, 2016
4787504
[PL] Move up creation of A, x, rhs, lin.solver.
endJunction Jan 11, 2016
7e8d115
[PL] Move up linear solver solve call.
endJunction Jan 11, 2016
adb7d28
[PL] Move up sparsity_pattern to Process.
endJunction Jan 12, 2016
0c43d56
[PL] Split off mesh subsets initialization.
endJunction Jan 12, 2016
3b3ca2d
[PL] Add getLinearSolverName().
endJunction Jan 12, 2016
8d7d87e
[PL] Move up _all_mesh_subsets.
endJunction Jan 12, 2016
c2f75e8
[PL] Move up DOF-table.
endJunction Jan 12, 2016
1467a3b
[PL] Splitting process specific initialization.
endJunction Jan 12, 2016
dc8b788
[PL] GWF: Add component_id to setInitialConditions
endJunction Jan 12, 2016
014df9a
[PL] Move up setInitialConditions.
endJunction Jan 12, 2016
4d0e314
[PL] Move up initializeNeumannBcs().
endJunction Jan 12, 2016
3bb0744
[PL] Move up _global_assembler.
endJunction Jan 12, 2016
d08aabb
Use unique_ptr for ProjectData::_processes.
endJunction Jan 14, 2016
4727502
[PL] Move some methods into private Process' part.
endJunction Jan 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions Applications/ApplicationsLib/ProjectData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ ProjectData::~ProjectData()
{
delete _geoObjects;

for(ProcessLib::Process* p : _processes)
delete p;

for (MeshLib::Mesh* m : _mesh_vec)
delete m;
}
Expand Down
15 changes: 9 additions & 6 deletions Applications/ApplicationsLib/ProjectData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class ProjectData
// TODO at the moment we have only one mesh, later there can be
// several meshes. Then we have to assign the referenced mesh
// here.
_processes.push_back(
_processes.emplace_back(
new ProcessLib::GroundwaterFlowProcess<GlobalSetupType>(
*_mesh_vec[0], _process_variables, _parameters, pc));
}
Expand All @@ -110,24 +110,26 @@ class ProjectData

/// Iterator access for processes.
/// Provides read access to the process container.
std::vector<ProcessLib::Process*>::const_iterator
std::vector<
std::unique_ptr<ProcessLib::Process<GlobalSetupType>>>::const_iterator
processesBegin() const
{
return _processes.begin();
}
std::vector<ProcessLib::Process*>::iterator
std::vector<std::unique_ptr<ProcessLib::Process<GlobalSetupType>>>::iterator
processesBegin()
{
return _processes.begin();
}

/// Iterator access for processes as in processesBegin().
std::vector<ProcessLib::Process*>::const_iterator
std::vector<
std::unique_ptr<ProcessLib::Process<GlobalSetupType>>>::const_iterator
processesEnd() const
{
return _processes.end();
}
std::vector<ProcessLib::Process*>::iterator
std::vector<std::unique_ptr<ProcessLib::Process<GlobalSetupType>>>::iterator
processesEnd()
{
return _processes.end();
Expand Down Expand Up @@ -187,7 +189,8 @@ class ProjectData
private:
GeoLib::GEOObjects *_geoObjects = new GeoLib::GEOObjects();
std::vector<MeshLib::Mesh*> _mesh_vec;
std::vector<ProcessLib::Process*> _processes;
std::vector<std::unique_ptr<ProcessLib::Process<GlobalSetupType>>>
_processes;
std::vector<ProcessLib::ProcessVariable> _process_variables;

/// Buffer for each process' config used in the process building function.
Expand Down