From d180f999b8d2156a04596129866aded88ba4e3a1 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 10 Apr 2013 14:02:16 +0000 Subject: [PATCH] Complete the separation of numerics and meshworker and matrix_free and move *.cc and *.inst.in files to their corresponding places git-svn-id: https://svn.dealii.org/trunk@29245 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/matrix_free/CMakeLists.txt | 8 +++++++- .../source/{numerics => matrix_free}/matrix_free.cc | 0 .../{numerics => matrix_free}/matrix_free.inst.in | 0 deal.II/source/meshworker/CMakeLists.txt | 11 ++++++++++- .../source/{numerics => meshworker}/mesh_worker.cc | 0 .../{numerics => meshworker}/mesh_worker_info.cc | 0 .../{numerics => meshworker}/mesh_worker_info.inst.in | 0 .../mesh_worker_vector_selector.cc | 0 .../mesh_worker_vector_selector.inst.in | 0 deal.II/source/numerics/CMakeLists.txt | 9 --------- 10 files changed, 17 insertions(+), 11 deletions(-) rename deal.II/source/{numerics => matrix_free}/matrix_free.cc (100%) rename deal.II/source/{numerics => matrix_free}/matrix_free.inst.in (100%) rename deal.II/source/{numerics => meshworker}/mesh_worker.cc (100%) rename deal.II/source/{numerics => meshworker}/mesh_worker_info.cc (100%) rename deal.II/source/{numerics => meshworker}/mesh_worker_info.inst.in (100%) rename deal.II/source/{numerics => meshworker}/mesh_worker_vector_selector.cc (100%) rename deal.II/source/{numerics => meshworker}/mesh_worker_vector_selector.inst.in (100%) diff --git a/deal.II/source/matrix_free/CMakeLists.txt b/deal.II/source/matrix_free/CMakeLists.txt index 87b061c814..57fc6dfe66 100644 --- a/deal.II/source/matrix_free/CMakeLists.txt +++ b/deal.II/source/matrix_free/CMakeLists.txt @@ -19,6 +19,12 @@ FILE(GLOB _header ) SET(_src + matrix_free.cc ) -DEAL_II_ADD_LIBRARY(obj_matrix_free OBJECT ${_src} ${_header}) +SET(_inst + matrix_free.inst.in + ) + +DEAL_II_ADD_LIBRARY(obj_matrix_free OBJECT ${_src} ${_header} ${_inst}) +EXPAND_INSTANTIATIONS(obj_matrix_free "${_inst}") diff --git a/deal.II/source/numerics/matrix_free.cc b/deal.II/source/matrix_free/matrix_free.cc similarity index 100% rename from deal.II/source/numerics/matrix_free.cc rename to deal.II/source/matrix_free/matrix_free.cc diff --git a/deal.II/source/numerics/matrix_free.inst.in b/deal.II/source/matrix_free/matrix_free.inst.in similarity index 100% rename from deal.II/source/numerics/matrix_free.inst.in rename to deal.II/source/matrix_free/matrix_free.inst.in diff --git a/deal.II/source/meshworker/CMakeLists.txt b/deal.II/source/meshworker/CMakeLists.txt index 888296f13e..e33ac0ef50 100644 --- a/deal.II/source/meshworker/CMakeLists.txt +++ b/deal.II/source/meshworker/CMakeLists.txt @@ -19,6 +19,15 @@ FILE(GLOB _header ) SET(_src + mesh_worker.cc + mesh_worker_info.cc + mesh_worker_vector_selector.cc ) -DEAL_II_ADD_LIBRARY(obj_meshworker OBJECT ${_src} ${_header}) +SET(_inst + mesh_worker_info.inst.in + mesh_worker_vector_selector.inst.in + ) + +DEAL_II_ADD_LIBRARY(obj_meshworker OBJECT ${_src} ${_header} ${_inst}) +EXPAND_INSTANTIATIONS(obj_meshworker "${_inst}") diff --git a/deal.II/source/numerics/mesh_worker.cc b/deal.II/source/meshworker/mesh_worker.cc similarity index 100% rename from deal.II/source/numerics/mesh_worker.cc rename to deal.II/source/meshworker/mesh_worker.cc diff --git a/deal.II/source/numerics/mesh_worker_info.cc b/deal.II/source/meshworker/mesh_worker_info.cc similarity index 100% rename from deal.II/source/numerics/mesh_worker_info.cc rename to deal.II/source/meshworker/mesh_worker_info.cc diff --git a/deal.II/source/numerics/mesh_worker_info.inst.in b/deal.II/source/meshworker/mesh_worker_info.inst.in similarity index 100% rename from deal.II/source/numerics/mesh_worker_info.inst.in rename to deal.II/source/meshworker/mesh_worker_info.inst.in diff --git a/deal.II/source/numerics/mesh_worker_vector_selector.cc b/deal.II/source/meshworker/mesh_worker_vector_selector.cc similarity index 100% rename from deal.II/source/numerics/mesh_worker_vector_selector.cc rename to deal.II/source/meshworker/mesh_worker_vector_selector.cc diff --git a/deal.II/source/numerics/mesh_worker_vector_selector.inst.in b/deal.II/source/meshworker/mesh_worker_vector_selector.inst.in similarity index 100% rename from deal.II/source/numerics/mesh_worker_vector_selector.inst.in rename to deal.II/source/meshworker/mesh_worker_vector_selector.inst.in diff --git a/deal.II/source/numerics/CMakeLists.txt b/deal.II/source/numerics/CMakeLists.txt index bd75841e6c..4b0db0b067 100644 --- a/deal.II/source/numerics/CMakeLists.txt +++ b/deal.II/source/numerics/CMakeLists.txt @@ -29,11 +29,6 @@ SET(_src error_estimator.cc fe_field_function.cc histogram.cc - matrix_free.cc - matrix_tools.cc - mesh_worker.cc - mesh_worker_info.cc - mesh_worker_vector_selector.cc point_value_history.cc solution_transfer.cc solution_transfer_inst2.cc @@ -51,10 +46,6 @@ SET(_inst dof_output_operator.inst.in error_estimator.inst.in fe_field_function.inst.in - matrix_free.inst.in - matrix_tools.inst.in - mesh_worker_info.inst.in - mesh_worker_vector_selector.inst.in point_value_history.inst.in solution_transfer.inst.in time_dependent.inst.in -- 2.39.5