diff --git a/src/dg/dg_base.cpp b/src/dg/dg_base.cpp index 30c453d48..f3821a8ca 100644 --- a/src/dg/dg_base.cpp +++ b/src/dg/dg_base.cpp @@ -460,14 +460,14 @@ void DGBase::assemble_cell_residual ( dealii::hp::FEFaceValues &fe_values_collection_face_ext, dealii::hp::FESubfaceValues &fe_values_collection_subface, dealii::hp::FEValues &fe_values_collection_volume_lagrange, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::mapping_shape_functions &mapping_basis, const bool compute_auxiliary_right_hand_side, dealii::LinearAlgebra::distributed::Vector &rhs, std::array,dim> &rhs_aux) @@ -1046,14 +1046,14 @@ void DGBase::reinit_operators_for_cell_residual_loop( const unsigned int poly_degree_int, const unsigned int poly_degree_ext, const unsigned int /*grid_degree*/, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis) + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::mapping_shape_functions &mapping_basis) { soln_basis_int.build_1D_volume_operator(oneD_fe_collection_1state[poly_degree_int], oneD_quadrature_collection[poly_degree_int]); soln_basis_int.build_1D_gradient_operator(oneD_fe_collection_1state[poly_degree_int], oneD_quadrature_collection[poly_degree_int]); @@ -1214,14 +1214,14 @@ void DGBase::assemble_residual (const bool compute_dRdW, cons dealii::hp::FEValues fe_values_collection_volume_lagrange (mapping_collection, fe_collection_lagrange, volume_quadrature_collection, this->volume_update_flags); const unsigned int init_grid_degree = high_order_grid->fe_system.tensor_degree(); - OPERATOR::basis_functions soln_basis_int(1, max_degree, init_grid_degree); - OPERATOR::basis_functions soln_basis_ext(1, max_degree, init_grid_degree); - OPERATOR::basis_functions flux_basis_int(1, max_degree, init_grid_degree); - OPERATOR::basis_functions flux_basis_ext(1, max_degree, init_grid_degree); - OPERATOR::local_basis_stiffness flux_basis_stiffness(1, max_degree, init_grid_degree, true); - OPERATOR::vol_projection_operator soln_basis_projection_oper_int(1, max_degree, init_grid_degree); - OPERATOR::vol_projection_operator soln_basis_projection_oper_ext(1, max_degree, init_grid_degree); - OPERATOR::mapping_shape_functions mapping_basis(1, init_grid_degree, init_grid_degree); + OPERATOR::basis_functions soln_basis_int(1, max_degree, init_grid_degree); + OPERATOR::basis_functions soln_basis_ext(1, max_degree, init_grid_degree); + OPERATOR::basis_functions flux_basis_int(1, max_degree, init_grid_degree); + OPERATOR::basis_functions flux_basis_ext(1, max_degree, init_grid_degree); + OPERATOR::local_basis_stiffness flux_basis_stiffness(1, max_degree, init_grid_degree, true); + OPERATOR::vol_projection_operator soln_basis_projection_oper_int(1, max_degree, init_grid_degree); + OPERATOR::vol_projection_operator soln_basis_projection_oper_ext(1, max_degree, init_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, init_grid_degree, init_grid_degree); reinit_operators_for_cell_residual_loop( max_degree, max_degree, init_grid_degree, @@ -2022,12 +2022,12 @@ template void DGBase::reinit_operators_for_mass_matrix( const bool Cartesian_element, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::mapping_shape_functions &mapping_basis, - OPERATOR::basis_functions &basis, - OPERATOR::local_mass &reference_mass_matrix, - OPERATOR::local_Flux_Reconstruction_operator &reference_FR, - OPERATOR::local_Flux_Reconstruction_operator_aux &reference_FR_aux, - OPERATOR::derivative_p &deriv_p) + OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::basis_functions &basis, + OPERATOR::local_mass &reference_mass_matrix, + OPERATOR::local_Flux_Reconstruction_operator &reference_FR, + OPERATOR::local_Flux_Reconstruction_operator_aux &reference_FR_aux, + OPERATOR::derivative_p &deriv_p) { using FR_enum = Parameters::AllParameters::Flux_Reconstruction; const FR_enum FR_Type = this->all_parameters->flux_reconstruction_type; @@ -2112,12 +2112,12 @@ void DGBase::evaluate_mass_matrices (bool do_inverse_mass_mat // setup 1D operators for ONE STATE. We loop over states in assembly for speedup. const unsigned int init_grid_degree = high_order_grid->fe_system.tensor_degree(); - OPERATOR::mapping_shape_functions mapping_basis(1, max_degree, init_grid_degree);//first set at max degree - OPERATOR::basis_functions basis(1, max_degree, init_grid_degree); - OPERATOR::local_mass reference_mass_matrix(1, max_degree, init_grid_degree);//first set at max degree - OPERATOR::local_Flux_Reconstruction_operator reference_FR(1, max_degree, init_grid_degree, FR_Type); - OPERATOR::local_Flux_Reconstruction_operator_aux reference_FR_aux(1, max_degree, init_grid_degree, FR_Type_Aux); - OPERATOR::derivative_p deriv_p(1, max_degree, init_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, max_degree, init_grid_degree);//first set at max degree + OPERATOR::basis_functions basis(1, max_degree, init_grid_degree); + OPERATOR::local_mass reference_mass_matrix(1, max_degree, init_grid_degree);//first set at max degree + OPERATOR::local_Flux_Reconstruction_operator reference_FR(1, max_degree, init_grid_degree, FR_Type); + OPERATOR::local_Flux_Reconstruction_operator_aux reference_FR_aux(1, max_degree, init_grid_degree, FR_Type_Aux); + OPERATOR::derivative_p deriv_p(1, max_degree, init_grid_degree); auto first_cell = dof_handler.begin_active(); const bool Cartesian_first_element = (first_cell->manifold_id() == dealii::numbers::flat_manifold_id); @@ -2231,11 +2231,11 @@ void DGBase::evaluate_local_metric_dependent_mass_matrix_and_ const unsigned int n_dofs_cell, const std::vector dofs_indices, OPERATOR::metric_operators &metric_oper, - OPERATOR::basis_functions &basis, - OPERATOR::local_mass &reference_mass_matrix, - OPERATOR::local_Flux_Reconstruction_operator &reference_FR, - OPERATOR::local_Flux_Reconstruction_operator_aux &reference_FR_aux, - OPERATOR::derivative_p &deriv_p) + OPERATOR::basis_functions &basis, + OPERATOR::local_mass &reference_mass_matrix, + OPERATOR::local_Flux_Reconstruction_operator &reference_FR, + OPERATOR::local_Flux_Reconstruction_operator_aux &reference_FR_aux, + OPERATOR::derivative_p &deriv_p) { using FR_enum = Parameters::AllParameters::Flux_Reconstruction; const FR_enum FR_Type = this->all_parameters->flux_reconstruction_type; @@ -2456,13 +2456,13 @@ void DGBase::apply_inverse_global_mass_matrix( const FR_Aux_enum FR_Type_Aux = this->all_parameters->flux_reconstruction_aux_type; const unsigned int init_grid_degree = high_order_grid->fe_system.tensor_degree(); - OPERATOR::mapping_shape_functions mapping_basis(1, init_grid_degree, init_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, init_grid_degree, init_grid_degree); - OPERATOR::FR_mass_inv mass_inv(1, max_degree, init_grid_degree, FR_Type); - OPERATOR::FR_mass_inv_aux mass_inv_aux(1, max_degree, init_grid_degree, FR_Type_Aux); + OPERATOR::FR_mass_inv mass_inv(1, max_degree, init_grid_degree, FR_Type); + OPERATOR::FR_mass_inv_aux mass_inv_aux(1, max_degree, init_grid_degree, FR_Type_Aux); - OPERATOR::vol_projection_operator_FR projection_oper(1, max_degree, init_grid_degree, FR_Type, true); - OPERATOR::vol_projection_operator_FR_aux projection_oper_aux(1, max_degree, init_grid_degree, FR_Type_Aux, true); + OPERATOR::vol_projection_operator_FR projection_oper(1, max_degree, init_grid_degree, FR_Type, true); + OPERATOR::vol_projection_operator_FR_aux projection_oper_aux(1, max_degree, init_grid_degree, FR_Type_Aux, true); mapping_basis.build_1D_shape_functions_at_volume_flux_nodes(high_order_grid->oneD_fe_system, oneD_quadrature_collection[max_degree]); @@ -2629,12 +2629,12 @@ void DGBase::apply_global_mass_matrix( const FR_Aux_enum FR_Type_Aux = this->all_parameters->flux_reconstruction_aux_type; const unsigned int init_grid_degree = high_order_grid->fe_system.tensor_degree(); - OPERATOR::mapping_shape_functions mapping_basis(1, max_degree, init_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, max_degree, init_grid_degree); - OPERATOR::FR_mass mass(1, max_degree, init_grid_degree, FR_Type); - OPERATOR::FR_mass_aux mass_aux(1, max_degree, init_grid_degree, FR_Type_Aux); + OPERATOR::FR_mass mass(1, max_degree, init_grid_degree, FR_Type); + OPERATOR::FR_mass_aux mass_aux(1, max_degree, init_grid_degree, FR_Type_Aux); - OPERATOR::vol_projection_operator projection_oper(1, max_degree, init_grid_degree); + OPERATOR::vol_projection_operator projection_oper(1, max_degree, init_grid_degree); mapping_basis.build_1D_shape_functions_at_volume_flux_nodes(high_order_grid->oneD_fe_system, oneD_quadrature_collection[max_degree]); @@ -3052,14 +3052,14 @@ DGBase>::assemble_cell_resid dealii::hp::FEFaceValues &fe_values_collection_face_ext, dealii::hp::FESubfaceValues &fe_values_collection_subface, dealii::hp::FEValues &fe_values_collection_volume_lagrange, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::mapping_shape_functions &mapping_basis, const bool compute_auxiliary_right_hand_side, dealii::LinearAlgebra::distributed::Vector &rhs, std::array,PHILIP_DIM> &rhs_aux); @@ -3074,14 +3074,14 @@ DGBase &fe_values_collection_face_ext, dealii::hp::FESubfaceValues &fe_values_collection_subface, dealii::hp::FEValues &fe_values_collection_volume_lagrange, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::mapping_shape_functions &mapping_basis, const bool compute_auxiliary_right_hand_side, dealii::LinearAlgebra::distributed::Vector &rhs, std::array,PHILIP_DIM> &rhs_aux); @@ -3096,14 +3096,14 @@ DGBase>::a dealii::hp::FEFaceValues &fe_values_collection_face_ext, dealii::hp::FESubfaceValues &fe_values_collection_subface, dealii::hp::FEValues &fe_values_collection_volume_lagrange, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::mapping_shape_functions &mapping_basis, const bool compute_auxiliary_right_hand_side, dealii::LinearAlgebra::distributed::Vector &rhs, std::array,PHILIP_DIM> &rhs_aux); diff --git a/src/dg/dg_base.hpp b/src/dg/dg_base.hpp index a183989e7..fbc2b84e2 100644 --- a/src/dg/dg_base.hpp +++ b/src/dg/dg_base.hpp @@ -217,47 +217,48 @@ class DGBase /// Builds needed operators for cell residual loop. void reinit_operators_for_cell_residual_loop( - const unsigned int poly_degree_int, - const unsigned int poly_degree_ext, - const unsigned int grid_degree, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis); + const unsigned int poly_degree_int, + const unsigned int poly_degree_ext, + const unsigned int grid_degree, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::mapping_shape_functions &mapping_basis); /// Builds needed operators to compute mass matrices/inverses efficiently. void reinit_operators_for_mass_matrix( - const bool Cartesian_element, - const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::mapping_shape_functions &mapping_basis, - OPERATOR::basis_functions &basis, - OPERATOR::local_mass &reference_mass_matrix, - OPERATOR::local_Flux_Reconstruction_operator &reference_FR, - OPERATOR::local_Flux_Reconstruction_operator_aux &reference_FR_aux, - OPERATOR::derivative_p &deriv_p); + const bool Cartesian_element, + const unsigned int poly_degree, + const unsigned int grid_degree, + OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::basis_functions &basis, + OPERATOR::local_mass &reference_mass_matrix, + OPERATOR::local_Flux_Reconstruction_operator &reference_FR, + OPERATOR::local_Flux_Reconstruction_operator_aux &reference_FR_aux, + OPERATOR::derivative_p &deriv_p); /// Allocates and evaluates the mass matrices for the entire grid void evaluate_mass_matrices (bool do_inverse_mass_matrix = false); /// Evaluates the metric dependent local mass matrices and inverses, then sets them in the global matrices. void evaluate_local_metric_dependent_mass_matrix_and_set_in_global_mass_matrix( - const bool Cartesian_element,//Flag if cell is Cartesian - const bool do_inverse_mass_matrix, - const unsigned int poly_degree, - const unsigned int curr_grid_degree, - const unsigned int n_quad_pts, - const unsigned int n_dofs_cell, - const std::vector dofs_indices, - OPERATOR::metric_operators &metric_oper, - OPERATOR::basis_functions &basis, - OPERATOR::local_mass &reference_mass_matrix, - OPERATOR::local_Flux_Reconstruction_operator &reference_FR, - OPERATOR::local_Flux_Reconstruction_operator_aux &reference_FR_aux, - OPERATOR::derivative_p &deriv_p); + const bool Cartesian_element,//Flag if cell is Cartesian + const bool do_inverse_mass_matrix, + const unsigned int poly_degree, + const unsigned int curr_grid_degree, + const unsigned int n_quad_pts, + const unsigned int n_dofs_cell, + const std::vector dofs_indices, + OPERATOR::metric_operators &metric_oper, + OPERATOR::basis_functions &basis, + OPERATOR::local_mass &reference_mass_matrix, + OPERATOR::local_Flux_Reconstruction_operator &reference_FR, + OPERATOR::local_Flux_Reconstruction_operator_aux &reference_FR_aux, + OPERATOR::derivative_p &deriv_p); /// Applies the inverse of the local metric dependent mass matrices when the global is not stored. /** We use matrix-free methods to apply the inverse of the local mass matrix on-the-fly @@ -566,21 +567,21 @@ class DGBase const DoFCellAccessorType1 ¤t_cell, const DoFCellAccessorType2 ¤t_metric_cell, const bool compute_dRdW, const bool compute_dRdX, const bool compute_d2R, - dealii::hp::FEValues &fe_values_collection_volume, - dealii::hp::FEFaceValues &fe_values_collection_face_int, - dealii::hp::FEFaceValues &fe_values_collection_face_ext, - dealii::hp::FESubfaceValues &fe_values_collection_subface, - dealii::hp::FEValues &fe_values_collection_volume_lagrange, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, - const bool compute_auxiliary_right_hand_side,//flag on whether computing the Auxiliary variable's equations' residuals - dealii::LinearAlgebra::distributed::Vector &rhs, + dealii::hp::FEValues &fe_values_collection_volume, + dealii::hp::FEFaceValues &fe_values_collection_face_int, + dealii::hp::FEFaceValues &fe_values_collection_face_ext, + dealii::hp::FESubfaceValues &fe_values_collection_subface, + dealii::hp::FEValues &fe_values_collection_volume_lagrange, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::mapping_shape_functions &mapping_basis, + const bool compute_auxiliary_right_hand_side,//flag on whether computing the Auxiliary variable's equations' residuals + dealii::LinearAlgebra::distributed::Vector &rhs, std::array,dim> &rhs_aux); /// Finite Element Collection for p-finite-element to represent the solution @@ -671,13 +672,13 @@ class DGBase const std::vector &metric_dof_indices, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEValues &fe_values_collection_volume, dealii::hp::FEValues &fe_values_collection_volume_lagrange, @@ -698,13 +699,13 @@ class DGBase const std::vector &metric_dof_indices, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &fe_values_collection_face_int, const dealii::FESystem ¤t_fe_ref, @@ -730,16 +731,16 @@ class DGBase const unsigned int poly_degree_ext, const unsigned int grid_degree_int, const unsigned int grid_degree_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper_int, OPERATOR::metric_operators &metric_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &fe_values_collection_face_int, dealii::hp::FEFaceValues &fe_values_collection_face_ext, @@ -769,16 +770,16 @@ class DGBase const unsigned int poly_degree_ext, const unsigned int grid_degree_int, const unsigned int grid_degree_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper_int, OPERATOR::metric_operators &metric_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &fe_values_collection_face_int, dealii::hp::FESubfaceValues &fe_values_collection_subface, diff --git a/src/dg/strong_dg.cpp b/src/dg/strong_dg.cpp index b08255c6e..903b2d8d9 100644 --- a/src/dg/strong_dg.cpp +++ b/src/dg/strong_dg.cpp @@ -42,13 +42,13 @@ void DGStrong::assemble_volume_term_and_build_operator const std::vector &metric_dof_indices, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEValues &/*fe_values_collection_volume*/, dealii::hp::FEValues &/*fe_values_collection_volume_lagrange*/, @@ -132,13 +132,13 @@ void DGStrong::assemble_boundary_term_and_build_operat const std::vector &/*metric_dof_indices*/, const unsigned int poly_degree, const unsigned int /*grid_degree*/, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &metric_oper, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &/*fe_values_collection_face_int*/, const dealii::FESystem &/*current_fe_ref*/, @@ -199,16 +199,16 @@ void DGStrong::assemble_face_term_and_build_operators( const unsigned int poly_degree_ext, const unsigned int /*grid_degree_int*/, const unsigned int grid_degree_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper_int, OPERATOR::metric_operators &metric_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &/*fe_values_collection_face_int*/, dealii::hp::FEFaceValues &/*fe_values_collection_face_ext*/, @@ -327,16 +327,16 @@ void DGStrong::assemble_subface_term_and_build_operato const unsigned int poly_degree_ext, const unsigned int grid_degree_int, const unsigned int grid_degree_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper_int, OPERATOR::metric_operators &metric_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &fe_values_collection_face_int, dealii::hp::FESubfaceValues &/*fe_values_collection_subface*/, @@ -423,14 +423,14 @@ void DGStrong::assemble_auxiliary_residual() dealii::hp::FEValues fe_values_collection_volume_lagrange (mapping_collection, this->fe_collection_lagrange, this->volume_quadrature_collection, this->volume_update_flags); - OPERATOR::basis_functions soln_basis_int(1, this->max_degree, this->max_grid_degree); - OPERATOR::basis_functions soln_basis_ext(1, this->max_degree, this->max_grid_degree); - OPERATOR::basis_functions flux_basis_int(1, this->max_degree, this->max_grid_degree); - OPERATOR::basis_functions flux_basis_ext(1, this->max_degree, this->max_grid_degree); - OPERATOR::local_basis_stiffness flux_basis_stiffness(1, this->max_degree, this->max_grid_degree); - OPERATOR::mapping_shape_functions mapping_basis(1, this->max_grid_degree, this->max_grid_degree); - OPERATOR::vol_projection_operator soln_basis_projection_oper_int(1, this->max_degree, this->max_grid_degree); - OPERATOR::vol_projection_operator soln_basis_projection_oper_ext(1, this->max_degree, this->max_grid_degree); + OPERATOR::basis_functions soln_basis_int(1, this->max_degree, this->max_grid_degree); + OPERATOR::basis_functions soln_basis_ext(1, this->max_degree, this->max_grid_degree); + OPERATOR::basis_functions flux_basis_int(1, this->max_degree, this->max_grid_degree); + OPERATOR::basis_functions flux_basis_ext(1, this->max_degree, this->max_grid_degree); + OPERATOR::local_basis_stiffness flux_basis_stiffness(1, this->max_degree, this->max_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, this->max_grid_degree, this->max_grid_degree); + OPERATOR::vol_projection_operator soln_basis_projection_oper_int(1, this->max_degree, this->max_grid_degree); + OPERATOR::vol_projection_operator soln_basis_projection_oper_ext(1, this->max_degree, this->max_grid_degree); this->reinit_operators_for_cell_residual_loop( this->max_degree, this->max_degree, this->max_grid_degree, @@ -501,8 +501,8 @@ template void DGStrong::assemble_volume_term_auxiliary_equation( const std::vector ¤t_dofs_indices, const unsigned int poly_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, OPERATOR::metric_operators &metric_oper, std::vector> &local_auxiliary_RHS) { @@ -578,7 +578,7 @@ void DGStrong::assemble_boundary_term_auxiliary_equati const unsigned int poly_degree, const unsigned int boundary_id, const std::vector &dofs_indices, - OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &soln_basis, OPERATOR::metric_operators &metric_oper, std::vector> &local_auxiliary_RHS) { @@ -726,8 +726,8 @@ void DGStrong::assemble_face_term_auxiliary_equation( const unsigned int poly_degree_ext, const std::vector &dof_indices_int, const std::vector &dof_indices_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, OPERATOR::metric_operators &metric_oper_int, std::vector> &local_auxiliary_RHS_int, std::vector> &local_auxiliary_RHS_ext) @@ -881,10 +881,10 @@ void DGStrong::assemble_volume_term_strong( const dealii::types::global_dof_index current_cell_index, const std::vector &cell_dofs_indices, const unsigned int poly_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper, OPERATOR::metric_operators &metric_oper, dealii::Vector &local_rhs_int_cell) { @@ -1316,9 +1316,9 @@ void DGStrong::assemble_boundary_term_strong( const unsigned int poly_degree, const real penalty, const std::vector &dof_indices, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::vol_projection_operator &soln_basis_projection_oper, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::vol_projection_operator &soln_basis_projection_oper, OPERATOR::metric_operators &metric_oper, dealii::Vector &local_rhs_cell) { @@ -1814,12 +1814,12 @@ void DGStrong::assemble_face_term_strong( const real penalty, const std::vector &dof_indices_int, const std::vector &dof_indices_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper_int, OPERATOR::metric_operators &metric_oper_ext, dealii::Vector &local_rhs_int_cell, diff --git a/src/dg/strong_dg.hpp b/src/dg/strong_dg.hpp index 522e9a593..35c295555 100644 --- a/src/dg/strong_dg.hpp +++ b/src/dg/strong_dg.hpp @@ -55,13 +55,13 @@ class DGStrong: public DGBaseState const std::vector &metric_dof_indices, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEValues &/*fe_values_collection_volume*/, dealii::hp::FEValues &/*fe_values_collection_volume_lagrange*/, @@ -82,13 +82,13 @@ class DGStrong: public DGBaseState const std::vector &metric_dof_indices, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &/*fe_values_collection_face_int*/, const dealii::FESystem &/*current_fe_ref*/, @@ -114,16 +114,16 @@ class DGStrong: public DGBaseState const unsigned int poly_degree_ext, const unsigned int grid_degree_int, const unsigned int grid_degree_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper_int, OPERATOR::metric_operators &metric_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &/*fe_values_collection_face_int*/, dealii::hp::FEFaceValues &/*fe_values_collection_face_ext*/, @@ -155,16 +155,16 @@ class DGStrong: public DGBaseState const unsigned int poly_degree_ext, const unsigned int grid_degree_int, const unsigned int grid_degree_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper_int, OPERATOR::metric_operators &metric_oper_ext, - OPERATOR::mapping_shape_functions &mapping_basis, + OPERATOR::mapping_shape_functions &mapping_basis, std::array,dim> &mapping_support_points, dealii::hp::FEFaceValues &fe_values_collection_face_int, dealii::hp::FESubfaceValues &/*fe_values_collection_subface*/, @@ -185,8 +185,8 @@ class DGStrong: public DGBaseState void assemble_volume_term_auxiliary_equation( const std::vector ¤t_dofs_indices, const unsigned int poly_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, OPERATOR::metric_operators &metric_oper, std::vector> &local_auxiliary_RHS); @@ -198,7 +198,7 @@ class DGStrong: public DGBaseState const unsigned int poly_degree, const unsigned int boundary_id, const std::vector &dofs_indices, - OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &soln_basis, OPERATOR::metric_operators &metric_oper, std::vector> &local_auxiliary_RHS); @@ -218,8 +218,8 @@ class DGStrong: public DGBaseState const unsigned int poly_degree_ext, const std::vector &dof_indices_int, const std::vector &dof_indices_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, OPERATOR::metric_operators &metric_oper_int, std::vector> &local_auxiliary_RHS_int, std::vector> &local_auxiliary_RHS_ext); @@ -248,10 +248,10 @@ class DGStrong: public DGBaseState const dealii::types::global_dof_index current_cell_index, const std::vector &cell_dofs_indices, const unsigned int poly_degree, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::local_basis_stiffness &flux_basis_stiffness, - OPERATOR::vol_projection_operator &soln_basis_projection_oper, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::local_basis_stiffness &flux_basis_stiffness, + OPERATOR::vol_projection_operator &soln_basis_projection_oper, OPERATOR::metric_operators &metric_oper, dealii::Vector &local_rhs_int_cell); @@ -263,9 +263,9 @@ class DGStrong: public DGBaseState const unsigned int poly_degree, const real penalty, const std::vector &dof_indices, - OPERATOR::basis_functions &soln_basis, - OPERATOR::basis_functions &flux_basis, - OPERATOR::vol_projection_operator &soln_basis_projection_oper, + OPERATOR::basis_functions &soln_basis, + OPERATOR::basis_functions &flux_basis, + OPERATOR::vol_projection_operator &soln_basis_projection_oper, OPERATOR::metric_operators &metric_oper, dealii::Vector &local_rhs_cell); @@ -288,12 +288,12 @@ class DGStrong: public DGBaseState const real penalty, const std::vector &dof_indices_int, const std::vector &dof_indices_ext, - OPERATOR::basis_functions &soln_basis_int, - OPERATOR::basis_functions &soln_basis_ext, - OPERATOR::basis_functions &flux_basis_int, - OPERATOR::basis_functions &flux_basis_ext, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, - OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, + OPERATOR::basis_functions &soln_basis_int, + OPERATOR::basis_functions &soln_basis_ext, + OPERATOR::basis_functions &flux_basis_int, + OPERATOR::basis_functions &flux_basis_ext, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_int, + OPERATOR::vol_projection_operator &soln_basis_projection_oper_ext, OPERATOR::metric_operators &metric_oper_int, OPERATOR::metric_operators &metric_oper_ext, dealii::Vector &local_rhs_int_cell, diff --git a/src/dg/weak_dg.cpp b/src/dg/weak_dg.cpp index 55d7f2d64..d60c4c9c1 100644 --- a/src/dg/weak_dg.cpp +++ b/src/dg/weak_dg.cpp @@ -3635,13 +3635,13 @@ void DGWeak::assemble_volume_term_and_build_operators( const std::vector &metric_dof_indices, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::basis_functions &/*soln_basis*/, - OPERATOR::basis_functions &/*flux_basis*/, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &/*soln_basis*/, + OPERATOR::basis_functions &/*flux_basis*/, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &/*metric_oper*/, - OPERATOR::mapping_shape_functions &/*mapping_basis*/, + OPERATOR::mapping_shape_functions &/*mapping_basis*/, std::array,dim> &/*mapping_support_points*/, dealii::hp::FEValues &fe_values_collection_volume, dealii::hp::FEValues &fe_values_collection_volume_lagrange, @@ -3694,13 +3694,13 @@ void DGWeak::assemble_boundary_term_and_build_operator const std::vector &metric_dof_indices, const unsigned int /*poly_degree*/, const unsigned int /*grid_degree*/, - OPERATOR::basis_functions &/*soln_basis*/, - OPERATOR::basis_functions &/*flux_basis*/, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &/*soln_basis*/, + OPERATOR::basis_functions &/*flux_basis*/, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &/*metric_oper*/, - OPERATOR::mapping_shape_functions &/*mapping_basis*/, + OPERATOR::mapping_shape_functions &/*mapping_basis*/, std::array,dim> &/*mapping_support_points*/, dealii::hp::FEFaceValues &fe_values_collection_face_int, const dealii::FESystem ¤t_fe_ref, @@ -3743,16 +3743,16 @@ void DGWeak::assemble_face_term_and_build_operators( const unsigned int /*poly_degree_ext*/, const unsigned int /*grid_degree_int*/, const unsigned int /*grid_degree_ext*/, - OPERATOR::basis_functions &/*soln_basis_int*/, - OPERATOR::basis_functions &/*soln_basis_ext*/, - OPERATOR::basis_functions &/*flux_basis_int*/, - OPERATOR::basis_functions &/*flux_basis_ext*/, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &/*soln_basis_int*/, + OPERATOR::basis_functions &/*soln_basis_ext*/, + OPERATOR::basis_functions &/*flux_basis_int*/, + OPERATOR::basis_functions &/*flux_basis_ext*/, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &/*metric_oper_int*/, OPERATOR::metric_operators &/*metric_oper_ext*/, - OPERATOR::mapping_shape_functions &/*mapping_basis*/, + OPERATOR::mapping_shape_functions &/*mapping_basis*/, std::array,dim> &/*mapping_support_points*/, dealii::hp::FEFaceValues &fe_values_collection_face_int, dealii::hp::FEFaceValues &fe_values_collection_face_ext, @@ -3836,16 +3836,16 @@ void DGWeak::assemble_subface_term_and_build_operators const unsigned int /*poly_degree_ext*/, const unsigned int /*grid_degree_int*/, const unsigned int /*grid_degree_ext*/, - OPERATOR::basis_functions &/*soln_basis_int*/, - OPERATOR::basis_functions &/*soln_basis_ext*/, - OPERATOR::basis_functions &/*flux_basis_int*/, - OPERATOR::basis_functions &/*flux_basis_ext*/, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &/*soln_basis_int*/, + OPERATOR::basis_functions &/*soln_basis_ext*/, + OPERATOR::basis_functions &/*flux_basis_int*/, + OPERATOR::basis_functions &/*flux_basis_ext*/, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &/*metric_oper_int*/, OPERATOR::metric_operators &/*metric_oper_ext*/, - OPERATOR::mapping_shape_functions &/*mapping_basis*/, + OPERATOR::mapping_shape_functions &/*mapping_basis*/, std::array,dim> &/*mapping_support_points*/, dealii::hp::FEFaceValues &fe_values_collection_face_int, dealii::hp::FESubfaceValues &fe_values_collection_subface, diff --git a/src/dg/weak_dg.hpp b/src/dg/weak_dg.hpp index f05eb83e8..d53d77b51 100644 --- a/src/dg/weak_dg.hpp +++ b/src/dg/weak_dg.hpp @@ -38,13 +38,13 @@ class DGWeak : public DGBaseState const std::vector &metric_dof_indices, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::basis_functions &/*soln_basis*/, - OPERATOR::basis_functions &/*flux_basis*/, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &/*soln_basis*/, + OPERATOR::basis_functions &/*flux_basis*/, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &/*metric_oper*/, - OPERATOR::mapping_shape_functions &/*mapping_basis*/, + OPERATOR::mapping_shape_functions &/*mapping_basis*/, std::array,dim> &/*mapping_support_points*/, dealii::hp::FEValues &fe_values_collection_volume, dealii::hp::FEValues &fe_values_collection_volume_lagrange, @@ -65,13 +65,13 @@ class DGWeak : public DGBaseState const std::vector &metric_dof_indices, const unsigned int poly_degree, const unsigned int grid_degree, - OPERATOR::basis_functions &/*soln_basis*/, - OPERATOR::basis_functions &/*flux_basis*/, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &/*soln_basis*/, + OPERATOR::basis_functions &/*flux_basis*/, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &/*metric_oper*/, - OPERATOR::mapping_shape_functions &/*mapping_basis*/, + OPERATOR::mapping_shape_functions &/*mapping_basis*/, std::array,dim> &/*mapping_support_points*/, dealii::hp::FEFaceValues &fe_values_collection_face_int, const dealii::FESystem ¤t_fe_ref, @@ -97,16 +97,16 @@ class DGWeak : public DGBaseState const unsigned int /*poly_degree_ext*/, const unsigned int /*grid_degree_int*/, const unsigned int /*grid_degree_ext*/, - OPERATOR::basis_functions &/*soln_basis_int*/, - OPERATOR::basis_functions &/*soln_basis_ext*/, - OPERATOR::basis_functions &/*flux_basis_int*/, - OPERATOR::basis_functions &/*flux_basis_ext*/, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &/*soln_basis_int*/, + OPERATOR::basis_functions &/*soln_basis_ext*/, + OPERATOR::basis_functions &/*flux_basis_int*/, + OPERATOR::basis_functions &/*flux_basis_ext*/, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &/*metric_oper_int*/, OPERATOR::metric_operators &/*metric_oper_ext*/, - OPERATOR::mapping_shape_functions &/*mapping_basis*/, + OPERATOR::mapping_shape_functions &/*mapping_basis*/, std::array,dim> &/*mapping_support_points*/, dealii::hp::FEFaceValues &fe_values_collection_face_int, dealii::hp::FEFaceValues &fe_values_collection_face_ext, @@ -136,16 +136,16 @@ class DGWeak : public DGBaseState const unsigned int /*poly_degree_ext*/, const unsigned int /*grid_degree_int*/, const unsigned int /*grid_degree_ext*/, - OPERATOR::basis_functions &/*soln_basis_int*/, - OPERATOR::basis_functions &/*soln_basis_ext*/, - OPERATOR::basis_functions &/*flux_basis_int*/, - OPERATOR::basis_functions &/*flux_basis_ext*/, - OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, - OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, + OPERATOR::basis_functions &/*soln_basis_int*/, + OPERATOR::basis_functions &/*soln_basis_ext*/, + OPERATOR::basis_functions &/*flux_basis_int*/, + OPERATOR::basis_functions &/*flux_basis_ext*/, + OPERATOR::local_basis_stiffness &/*flux_basis_stiffness*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_int*/, + OPERATOR::vol_projection_operator &/*soln_basis_projection_oper_ext*/, OPERATOR::metric_operators &/*metric_oper_int*/, OPERATOR::metric_operators &/*metric_oper_ext*/, - OPERATOR::mapping_shape_functions &/*mapping_basis*/, + OPERATOR::mapping_shape_functions &/*mapping_basis*/, std::array,dim> &/*mapping_support_points*/, dealii::hp::FEFaceValues &fe_values_collection_face_int, dealii::hp::FESubfaceValues &fe_values_collection_subface, diff --git a/src/flow_solver/flow_solver_cases/periodic_entropy_tests.cpp b/src/flow_solver/flow_solver_cases/periodic_entropy_tests.cpp index dd13bd194..e41a10a75 100644 --- a/src/flow_solver/flow_solver_cases/periodic_entropy_tests.cpp +++ b/src/flow_solver/flow_solver_cases/periodic_entropy_tests.cpp @@ -70,8 +70,8 @@ double PeriodicEntropyTests::compute_integrated_quantities(DGBasefe_system.tensor_degree(); const unsigned int poly_degree = dg.max_degree; // Construct the basis functions and mapping shape functions. - OPERATOR::basis_functions soln_basis(1, poly_degree, grid_degree); - OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, grid_degree); + OPERATOR::basis_functions soln_basis(1, poly_degree, grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, grid_degree); // Build basis function volume operator and gradient operator from 1D finite element for 1 state. soln_basis.build_1D_volume_operator(dg.oneD_fe_collection_1state[poly_degree], quad_extra_1D); soln_basis.build_1D_gradient_operator(dg.oneD_fe_collection_1state[poly_degree], quad_extra_1D); diff --git a/src/flow_solver/flow_solver_cases/periodic_turbulence.cpp b/src/flow_solver/flow_solver_cases/periodic_turbulence.cpp index da75b43d1..7b5672497 100644 --- a/src/flow_solver/flow_solver_cases/periodic_turbulence.cpp +++ b/src/flow_solver/flow_solver_cases/periodic_turbulence.cpp @@ -199,12 +199,12 @@ void PeriodicTurbulence::output_velocity_field( dealii::FE_DGQArbitraryNodes<1,1> equidistant_finite_element(vol_quad_equidistant_1D); const unsigned int init_grid_degree = dg->high_order_grid->fe_system.tensor_degree(); - OPERATOR::basis_functions soln_basis(1, dg->max_degree, init_grid_degree); + OPERATOR::basis_functions soln_basis(1, dg->max_degree, init_grid_degree); soln_basis.build_1D_volume_operator(dg->oneD_fe_collection_1state[dg->max_degree], vol_quad_equidistant_1D); soln_basis.build_1D_gradient_operator(dg->oneD_fe_collection_1state[dg->max_degree], vol_quad_equidistant_1D); // mapping basis for the equidistant node set because we output the physical coordinates - OPERATOR::mapping_shape_functions mapping_basis_at_equidistant(1, dg->max_degree, init_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis_at_equidistant(1, dg->max_degree, init_grid_degree); mapping_basis_at_equidistant.build_1D_shape_functions_at_grid_nodes(dg->high_order_grid->oneD_fe_system, dg->high_order_grid->oneD_grid_nodes); mapping_basis_at_equidistant.build_1D_shape_functions_at_flux_nodes(dg->high_order_grid->oneD_fe_system, vol_quad_equidistant_1D, dg->oneD_face_quadrature); @@ -355,7 +355,7 @@ void PeriodicTurbulence::update_maximum_local_wave_speed(DGBase quad_extra(dg.max_degree+1+overintegrate); const unsigned int n_quad_pts = quad_extra.size(); dealii::QGauss<1> quad_extra_1D(dg.max_degree+1+overintegrate); - OPERATOR::basis_functions soln_basis(1, poly_degree, grid_degree); + OPERATOR::basis_functions soln_basis(1, poly_degree, grid_degree); soln_basis.build_1D_volume_operator(dg.oneD_fe_collection_1state[poly_degree], quad_extra_1D); const unsigned int n_dofs = dg.fe_collection[poly_degree].n_dofs_per_cell(); @@ -418,8 +418,8 @@ void PeriodicTurbulence::compute_and_update_integrated_quantities(D const unsigned int grid_degree = dg.high_order_grid->fe_system.tensor_degree(); const unsigned int poly_degree = dg.max_degree; // Construct the basis functions and mapping shape functions. - OPERATOR::basis_functions soln_basis(1, poly_degree, grid_degree); - OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, grid_degree); + OPERATOR::basis_functions soln_basis(1, poly_degree, grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, grid_degree); // Build basis function volume operator and gradient operator from 1D finite element for 1 state. soln_basis.build_1D_volume_operator(dg.oneD_fe_collection_1state[poly_degree], quad_extra_1D); soln_basis.build_1D_gradient_operator(dg.oneD_fe_collection_1state[poly_degree], quad_extra_1D); @@ -632,14 +632,14 @@ double PeriodicTurbulence::get_numerical_entropy( const unsigned int n_quad_pts = dg->volume_quadrature_collection[poly_degree].size(); const unsigned int n_shape_fns = n_dofs_cell / nstate; - OPERATOR::vol_projection_operator vol_projection(1, poly_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(1, poly_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); // Construct the basis functions and mapping shape functions. - OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); soln_basis.build_1D_volume_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); - OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, dg->max_grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(dg->high_order_grid->oneD_fe_system, dg->high_order_grid->oneD_grid_nodes); mapping_basis.build_1D_shape_functions_at_flux_nodes(dg->high_order_grid->oneD_fe_system, dg->oneD_quadrature_collection[poly_degree], dg->oneD_face_quadrature); diff --git a/src/flow_solver/flow_solver_cases/periodic_turbulence.h b/src/flow_solver/flow_solver_cases/periodic_turbulence.h index ed60e5bac..58eb46296 100644 --- a/src/flow_solver/flow_solver_cases/periodic_turbulence.h +++ b/src/flow_solver/flow_solver_cases/periodic_turbulence.h @@ -17,7 +17,6 @@ class PeriodicTurbulence : public PeriodicCubeFlow * Corresponds to the number of items in IntegratedQuantitiesEnum * */ static const int NUMBER_OF_INTEGRATED_QUANTITIES = 5; - public: /// Constructor. explicit PeriodicTurbulence(const Parameters::AllParameters *const parameters_input); diff --git a/src/operators/operators.cpp b/src/operators/operators.cpp index 4d24741a2..e84c8a800 100644 --- a/src/operators/operators.cpp +++ b/src/operators/operators.cpp @@ -38,8 +38,8 @@ namespace PHiLiP { namespace OPERATOR { //Constructor -template -OperatorsBase::OperatorsBase( +template +OperatorsBase::OperatorsBase( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) @@ -51,8 +51,8 @@ OperatorsBase::OperatorsBase( , pcout(std::cout, dealii::Utilities::MPI::this_mpi_process(mpi_communicator)==0) {} -template -dealii::FullMatrix OperatorsBase::tensor_product( +template +dealii::FullMatrix OperatorsBase::tensor_product( const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z) @@ -102,8 +102,8 @@ dealii::FullMatrix OperatorsBase::tensor_product( } } -template -dealii::FullMatrix OperatorsBase::tensor_product_state( +template +dealii::FullMatrix OperatorsBase::tensor_product_state( const int nstate, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, @@ -169,8 +169,8 @@ dealii::FullMatrix OperatorsBase::tensor_product_state( return tens_prod; } -template -double OperatorsBase::compute_factorial(double n) +template +double OperatorsBase::compute_factorial(double n) { if ((n==0)||(n==1)) return 1; @@ -184,18 +184,18 @@ double OperatorsBase::compute_factorial(double n) * **********************************/ //Constructor -template -SumFactorizedOperators::SumFactorizedOperators( +template +SumFactorizedOperators::SumFactorizedOperators( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : OperatorsBase::OperatorsBase(nstate_input, max_degree_input, grid_degree_input) + : OperatorsBase::OperatorsBase(nstate_input, max_degree_input, grid_degree_input) {} -template -void SumFactorizedOperators::matrix_vector_mult( - const std::vector &input_vect, - std::vector &output_vect, +template +void SumFactorizedOperators::matrix_vector_mult( + const std::vector &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -304,10 +304,10 @@ void SumFactorizedOperators::matrix_vector_mult( } } -template -void SumFactorizedOperators::matrix_vector_mult_1D( - const std::vector &input_vect, - std::vector &output_vect, +template +void SumFactorizedOperators::matrix_vector_mult_1D( + const std::vector &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const bool adding, const double factor) @@ -315,11 +315,11 @@ void SumFactorizedOperators::matrix_vector_mult_1D( this->matrix_vector_mult(input_vect, output_vect, basis_x, basis_x, basis_x, adding, factor); } -template -void SumFactorizedOperators::matrix_vector_mult_surface_1D( +template +void SumFactorizedOperators::matrix_vector_mult_surface_1D( const unsigned int face_number, - const std::vector &input_vect, - std::vector &output_vect, + const std::vector &input_vect, + std::vector &output_vect, const std::array,2> &basis_surf, const dealii::FullMatrix &basis_vol, const bool adding, @@ -340,12 +340,12 @@ void SumFactorizedOperators::matrix_vector_mult_surface_1D( } -template -void SumFactorizedOperators::inner_product_surface_1D( +template +void SumFactorizedOperators::inner_product_surface_1D( const unsigned int face_number, - const std::vector &input_vect, - const std::vector &weight_vect, - std::vector &output_vect, + const std::vector &input_vect, + const std::vector &weight_vect, + std::vector &output_vect, const std::array,2> &basis_surf, const dealii::FullMatrix &basis_vol, const bool adding, @@ -365,10 +365,10 @@ void SumFactorizedOperators::inner_product_surface_1D( this->inner_product(input_vect, weight_vect, output_vect, basis_vol, basis_vol, basis_surf[1], adding, factor); } -template -void SumFactorizedOperators::divergence_matrix_vector_mult_1D( - const dealii::Tensor<1,dim,std::vector> &input_vect, - std::vector &output_vect, +template +void SumFactorizedOperators::divergence_matrix_vector_mult_1D( + const dealii::Tensor<1,dim,std::vector> &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis, const dealii::FullMatrix &gradient_basis) { @@ -377,10 +377,10 @@ void SumFactorizedOperators::divergence_matrix_vector_mult_1D( gradient_basis, gradient_basis, gradient_basis); } -template -void SumFactorizedOperators::divergence_matrix_vector_mult( - const dealii::Tensor<1,dim,std::vector> &input_vect, - std::vector &output_vect, +template +void SumFactorizedOperators::divergence_matrix_vector_mult( + const dealii::Tensor<1,dim,std::vector> &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -410,10 +410,10 @@ void SumFactorizedOperators::divergence_matrix_vector_mult( } } -template -void SumFactorizedOperators::gradient_matrix_vector_mult_1D( - const std::vector &input_vect, - dealii::Tensor<1,dim,std::vector> &output_vect, +template +void SumFactorizedOperators::gradient_matrix_vector_mult_1D( + const std::vector &input_vect, + dealii::Tensor<1,dim,std::vector> &output_vect, const dealii::FullMatrix &basis, const dealii::FullMatrix &gradient_basis) { @@ -422,10 +422,10 @@ void SumFactorizedOperators::gradient_matrix_vector_mult_1D( gradient_basis, gradient_basis, gradient_basis); } -template -void SumFactorizedOperators::gradient_matrix_vector_mult( - const std::vector &input_vect, - dealii::Tensor<1,dim,std::vector> &output_vect, +template +void SumFactorizedOperators::gradient_matrix_vector_mult( + const std::vector &input_vect, + dealii::Tensor<1,dim,std::vector> &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -456,11 +456,11 @@ void SumFactorizedOperators::gradient_matrix_vector_mult( } } -template -void SumFactorizedOperators::inner_product( - const std::vector &input_vect, - const std::vector &weight_vect, - std::vector &output_vect, +template +void SumFactorizedOperators::inner_product( + const std::vector &input_vect, + const std::vector &weight_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -520,11 +520,11 @@ void SumFactorizedOperators::inner_product( this->matrix_vector_mult(new_input_vect, output_vect, basis_x_trans, basis_y_trans, basis_z_trans, adding, factor); } -template -void SumFactorizedOperators::inner_product_1D( - const std::vector &input_vect, - const std::vector &weight_vect, - std::vector &output_vect, +template +void SumFactorizedOperators::inner_product_1D( + const std::vector &input_vect, + const std::vector &weight_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const bool adding, const double factor) @@ -532,11 +532,11 @@ void SumFactorizedOperators::inner_product_1D( this->inner_product(input_vect, weight_vect, output_vect, basis_x, basis_x, basis_x, adding, factor); } -template -void SumFactorizedOperators::divergence_two_pt_flux_Hadamard_product( - const dealii::Tensor<1,dim,dealii::FullMatrix> &input_mat, - std::vector &output_vect, - const std::vector &weights, +template +void SumFactorizedOperators::divergence_two_pt_flux_Hadamard_product( + const dealii::Tensor<1,dim,dealii::FullMatrix> &input_mat, + std::vector &output_vect, + const std::vector &weights, const dealii::FullMatrix &basis, const double scaling) { @@ -598,12 +598,12 @@ void SumFactorizedOperators::divergence_two_pt_flux_Hadamard_produc } } -template -void SumFactorizedOperators::surface_two_pt_flux_Hadamard_product( - const dealii::FullMatrix &input_mat, - std::vector &output_vect_vol, - std::vector &output_vect_surf, - const std::vector &weights, +template +void SumFactorizedOperators::surface_two_pt_flux_Hadamard_product( + const dealii::FullMatrix &input_mat, + std::vector &output_vect_vol, + std::vector &output_vect_surf, + const std::vector &weights, const std::array,2> &surf_basis, const unsigned int iface, const unsigned int dim_not_zero, @@ -678,12 +678,12 @@ void SumFactorizedOperators::surface_two_pt_flux_Hadamard_product( -template -void SumFactorizedOperators::two_pt_flux_Hadamard_product( - const dealii::FullMatrix &input_mat, - dealii::FullMatrix &output_mat, +template +void SumFactorizedOperators::two_pt_flux_Hadamard_product( + const dealii::FullMatrix &input_mat, + dealii::FullMatrix &output_mat, const dealii::FullMatrix &basis, - const std::vector &weights, + const std::vector &weights, const int direction) { assert(input_mat.size() == output_mat.size()); @@ -791,11 +791,11 @@ void SumFactorizedOperators::two_pt_flux_Hadamard_product( } } -template -void SumFactorizedOperators::Hadamard_product( - const dealii::FullMatrix &input_mat1, - const dealii::FullMatrix &input_mat2, - dealii::FullMatrix &output_mat) +template +void SumFactorizedOperators::Hadamard_product( + const dealii::FullMatrix &input_mat1, + const dealii::FullMatrix &input_mat2, + dealii::FullMatrix &output_mat) { const unsigned int rows = input_mat1.m(); const unsigned int columns = input_mat1.n(); @@ -810,8 +810,8 @@ void SumFactorizedOperators::Hadamard_product( } } -template -void SumFactorizedOperators::sum_factorized_Hadamard_sparsity_pattern( +template +void SumFactorizedOperators::sum_factorized_Hadamard_sparsity_pattern( const unsigned int rows_size, const unsigned int columns_size, std::vector> &rows, @@ -875,8 +875,8 @@ void SumFactorizedOperators::sum_factorized_Hadamard_sparsity_patte } } } -template -void SumFactorizedOperators::sum_factorized_Hadamard_basis_assembly( +template +void SumFactorizedOperators::sum_factorized_Hadamard_basis_assembly( const unsigned int rows_size_1D, const unsigned int columns_size_1D, const std::vector> &rows, @@ -928,8 +928,8 @@ void SumFactorizedOperators::sum_factorized_Hadamard_basis_assembly } } -template -void SumFactorizedOperators::sum_factorized_Hadamard_surface_sparsity_pattern( +template +void SumFactorizedOperators::sum_factorized_Hadamard_surface_sparsity_pattern( const unsigned int rows_size, const unsigned int columns_size, std::vector &rows, @@ -996,8 +996,8 @@ void SumFactorizedOperators::sum_factorized_Hadamard_surface_sparsi } } } -template -void SumFactorizedOperators::sum_factorized_Hadamard_surface_basis_assembly( +template +void SumFactorizedOperators::sum_factorized_Hadamard_surface_basis_assembly( const unsigned int rows_size, const unsigned int columns_size_1D, const std::vector &rows, @@ -1067,19 +1067,19 @@ void SumFactorizedOperators::sum_factorized_Hadamard_surface_basis_ * ******************************************/ -template -basis_functions::basis_functions( +template +basis_functions::basis_functions( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void basis_functions::build_1D_volume_operator( +template +void basis_functions::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -1098,8 +1098,8 @@ void basis_functions::build_1D_volume_operator( } } -template -void basis_functions::build_1D_gradient_operator( +template +void basis_functions::build_1D_gradient_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -1118,8 +1118,8 @@ void basis_functions::build_1D_gradient_operator( } } -template -void basis_functions::build_1D_surface_operator( +template +void basis_functions::build_1D_surface_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<0> &face_quadrature) { @@ -1145,8 +1145,8 @@ void basis_functions::build_1D_surface_operator( } } -template -void basis_functions::build_1D_surface_gradient_operator( +template +void basis_functions::build_1D_surface_gradient_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<0> &face_quadrature) { @@ -1172,19 +1172,19 @@ void basis_functions::build_1D_surface_gradient_operator( } } -template -vol_integral_basis::vol_integral_basis( +template +vol_integral_basis::vol_integral_basis( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void vol_integral_basis::build_1D_volume_operator( +template +void vol_integral_basis::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -1204,19 +1204,19 @@ void vol_integral_basis::build_1D_volume_operator( } } -template -local_mass::local_mass( +template +local_mass::local_mass( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void local_mass::build_1D_volume_operator( +template +void local_mass::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -1249,11 +1249,11 @@ void local_mass::build_1D_volume_operator( } } -template -dealii::FullMatrix local_mass::build_dim_mass_matrix( +template +dealii::FullMatrix local_mass::build_dim_mass_matrix( const int nstate, const unsigned int n_dofs, const unsigned int n_quad_pts, - basis_functions &basis, + basis_functions &basis, const std::vector &det_Jac, const std::vector &quad_weights) @@ -1288,21 +1288,21 @@ dealii::FullMatrix local_mass::build_dim_mass_matrix( return mass_matrix_dim; } -template -local_basis_stiffness::local_basis_stiffness( +template +local_basis_stiffness::local_basis_stiffness( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const bool store_skew_symmetric_form_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) , store_skew_symmetric_form(store_skew_symmetric_form_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void local_basis_stiffness::build_1D_volume_operator( +template +void local_basis_stiffness::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -1341,26 +1341,26 @@ void local_basis_stiffness::build_1D_volume_operator( } } -template -modal_basis_differential_operator::modal_basis_differential_operator( +template +modal_basis_differential_operator::modal_basis_differential_operator( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void modal_basis_differential_operator::build_1D_volume_operator( +template +void modal_basis_differential_operator::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; - local_mass mass_matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass mass_matrix(this->nstate, this->max_degree, this->max_grid_degree); mass_matrix.build_1D_volume_operator(finite_element, quadrature); - local_basis_stiffness stiffness(this->nstate, this->max_degree, this->max_grid_degree); + local_basis_stiffness stiffness(this->nstate, this->max_degree, this->max_grid_degree); stiffness.build_1D_volume_operator(finite_element, quadrature); //allocate this->oneD_vol_operator.reinit(n_dofs,n_dofs); @@ -1370,19 +1370,19 @@ void modal_basis_differential_operator::build_1D_volume_operator( inv_mass.mmult(this->oneD_vol_operator, stiffness.oneD_vol_operator); } -template -derivative_p::derivative_p( +template +derivative_p::derivative_p( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void derivative_p::build_1D_volume_operator( +template +void derivative_p::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -1394,7 +1394,7 @@ void derivative_p::build_1D_volume_operator( this->oneD_vol_operator[idof][idof] = 1.0;//set it equal to identity } //get modal basis differential operator - modal_basis_differential_operator diff_oper(this->nstate, this->max_degree, this->max_grid_degree); + modal_basis_differential_operator diff_oper(this->nstate, this->max_degree, this->max_grid_degree); diff_oper.build_1D_volume_operator(finite_element, quadrature); //loop and solve for(unsigned int idegree=0; idegree< this->max_degree; idegree++){ @@ -1404,13 +1404,13 @@ void derivative_p::build_1D_volume_operator( } } -template -local_Flux_Reconstruction_operator::local_Flux_Reconstruction_operator( +template +local_Flux_Reconstruction_operator::local_Flux_Reconstruction_operator( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction FR_param_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) , FR_param_type(FR_param_input) { //Initialize to the max degrees @@ -1419,8 +1419,8 @@ local_Flux_Reconstruction_operator::local_Flux_Reconstruction_opera get_FR_correction_parameter(this->max_degree, FR_param); } -template -void local_Flux_Reconstruction_operator::get_Huynh_g2_parameter ( +template +void local_Flux_Reconstruction_operator::get_Huynh_g2_parameter ( const unsigned int curr_cell_degree, double &c) { @@ -1430,8 +1430,8 @@ void local_Flux_Reconstruction_operator::get_Huynh_g2_parameter ( c = 2.0 * (curr_cell_degree+1)/( curr_cell_degree*((2.0*curr_cell_degree+1.0)*(pow(pfact*cp,2)))); c/=2.0;//since orthonormal } -template -void local_Flux_Reconstruction_operator::get_spectral_difference_parameter ( +template +void local_Flux_Reconstruction_operator::get_spectral_difference_parameter ( const unsigned int curr_cell_degree, double &c) { @@ -1441,8 +1441,8 @@ void local_Flux_Reconstruction_operator::get_spectral_difference_pa c = 2.0 * (curr_cell_degree)/( (curr_cell_degree+1.0)*((2.0*curr_cell_degree+1.0)*(pow(pfact*cp,2)))); c/=2.0;//since orthonormal } -template -void local_Flux_Reconstruction_operator::get_c_negative_FR_parameter ( +template +void local_Flux_Reconstruction_operator::get_c_negative_FR_parameter ( const unsigned int curr_cell_degree, double &c) { @@ -1452,16 +1452,16 @@ void local_Flux_Reconstruction_operator::get_c_negative_FR_paramete c = - 2.0 / ( pow((2.0*curr_cell_degree+1.0)*(pow(pfact*cp,2)),1.0)); c/=2.0;//since orthonormal } -template -void local_Flux_Reconstruction_operator::get_c_negative_divided_by_two_FR_parameter ( +template +void local_Flux_Reconstruction_operator::get_c_negative_divided_by_two_FR_parameter ( const unsigned int curr_cell_degree, double &c) { get_c_negative_FR_parameter(curr_cell_degree, c); c/=2.0; } -template -void local_Flux_Reconstruction_operator::get_c_plus_parameter ( +template +void local_Flux_Reconstruction_operator::get_c_plus_parameter ( const unsigned int curr_cell_degree, double &c) { @@ -1482,8 +1482,8 @@ void local_Flux_Reconstruction_operator::get_c_plus_parameter ( c/=pow(pow(2.0,curr_cell_degree),2);//since ref elem [0,1] } -template -void local_Flux_Reconstruction_operator::get_FR_correction_parameter ( +template +void local_Flux_Reconstruction_operator::get_FR_correction_parameter ( const unsigned int curr_cell_degree, double &c) { @@ -1512,8 +1512,8 @@ void local_Flux_Reconstruction_operator::get_FR_correction_paramete get_c_plus_parameter(curr_cell_degree, c); } } -template -void local_Flux_Reconstruction_operator::build_local_Flux_Reconstruction_operator( +template +void local_Flux_Reconstruction_operator::build_local_Flux_Reconstruction_operator( const dealii::FullMatrix &local_Mass_Matrix, const dealii::FullMatrix &pth_derivative, const unsigned int n_dofs, @@ -1528,8 +1528,8 @@ void local_Flux_Reconstruction_operator::build_local_Flux_Reconstru } -template -void local_Flux_Reconstruction_operator::build_1D_volume_operator( +template +void local_Flux_Reconstruction_operator::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -1537,17 +1537,17 @@ void local_Flux_Reconstruction_operator::build_1D_volume_operator( //allocate the volume operator this->oneD_vol_operator.reinit(n_dofs, n_dofs); //build the FR correction operator - derivative_p pth_derivative(this->nstate, this->max_degree, this->max_grid_degree); + derivative_p pth_derivative(this->nstate, this->max_degree, this->max_grid_degree); pth_derivative.build_1D_volume_operator(finite_element, quadrature); - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); //solves build_local_Flux_Reconstruction_operator(local_Mass_Matrix.oneD_vol_operator, pth_derivative.oneD_vol_operator, n_dofs, FR_param, this->oneD_vol_operator); } -template -dealii::FullMatrix local_Flux_Reconstruction_operator::build_dim_Flux_Reconstruction_operator_directly( +template +dealii::FullMatrix local_Flux_Reconstruction_operator::build_dim_Flux_Reconstruction_operator_directly( const int nstate, const unsigned int n_dofs, dealii::FullMatrix &pth_deriv, @@ -1607,8 +1607,8 @@ dealii::FullMatrix local_Flux_Reconstruction_operator::buil return Flux_Reconstruction_operator; } -template -dealii::FullMatrix local_Flux_Reconstruction_operator::build_dim_Flux_Reconstruction_operator( +template +dealii::FullMatrix local_Flux_Reconstruction_operator::build_dim_Flux_Reconstruction_operator( const dealii::FullMatrix &local_Mass_Matrix, const int nstate, const unsigned int n_dofs) @@ -1643,13 +1643,13 @@ dealii::FullMatrix local_Flux_Reconstruction_operator::buil } -template -local_Flux_Reconstruction_operator_aux::local_Flux_Reconstruction_operator_aux( +template +local_Flux_Reconstruction_operator_aux::local_Flux_Reconstruction_operator_aux( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction_Aux FR_param_aux_input) - : local_Flux_Reconstruction_operator::local_Flux_Reconstruction_operator(nstate_input, max_degree_input, grid_degree_input, Parameters::AllParameters::Flux_Reconstruction::cDG) + : local_Flux_Reconstruction_operator::local_Flux_Reconstruction_operator(nstate_input, max_degree_input, grid_degree_input, Parameters::AllParameters::Flux_Reconstruction::cDG) , FR_param_aux_type(FR_param_aux_input) { //Initialize to the max degrees @@ -1658,8 +1658,8 @@ local_Flux_Reconstruction_operator_aux::local_Flux_Reconstruction_o get_FR_aux_correction_parameter(this->max_degree, FR_param_aux); } -template -void local_Flux_Reconstruction_operator_aux::get_FR_aux_correction_parameter ( +template +void local_Flux_Reconstruction_operator_aux::get_FR_aux_correction_parameter ( const unsigned int curr_cell_degree, double &k) { @@ -1686,16 +1686,16 @@ void local_Flux_Reconstruction_operator_aux::get_FR_aux_correction_ this->get_c_plus_parameter(curr_cell_degree, k); } } -template -void local_Flux_Reconstruction_operator_aux::build_1D_volume_operator( +template +void local_Flux_Reconstruction_operator_aux::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; //build the FR correction operator - derivative_p pth_derivative(this->nstate, this->max_degree, this->max_grid_degree); + derivative_p pth_derivative(this->nstate, this->max_degree, this->max_grid_degree); pth_derivative.build_1D_volume_operator(finite_element, quadrature); - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); //allocate the volume operator this->oneD_vol_operator.reinit(n_dofs, n_dofs); @@ -1703,35 +1703,35 @@ void local_Flux_Reconstruction_operator_aux::build_1D_volume_operat this->build_local_Flux_Reconstruction_operator(local_Mass_Matrix.oneD_vol_operator, pth_derivative.oneD_vol_operator, n_dofs, FR_param_aux, this->oneD_vol_operator); } -template -vol_projection_operator::vol_projection_operator( +template +vol_projection_operator::vol_projection_operator( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void vol_projection_operator::compute_local_vol_projection_operator( +template +void vol_projection_operator::compute_local_vol_projection_operator( const dealii::FullMatrix &norm_matrix_inverse, const dealii::FullMatrix &integral_vol_basis, dealii::FullMatrix &volume_projection) { norm_matrix_inverse.mTmult(volume_projection, integral_vol_basis); } -template -void vol_projection_operator::build_1D_volume_operator( +template +void vol_projection_operator::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; const unsigned int n_quad_pts = quadrature.size(); - vol_integral_basis integral_vol_basis(this->nstate, this->max_degree, this->max_grid_degree); + vol_integral_basis integral_vol_basis(this->nstate, this->max_degree, this->max_grid_degree); integral_vol_basis.build_1D_volume_operator(finite_element, quadrature); - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); dealii::FullMatrix mass_inv(n_dofs); mass_inv.invert(local_Mass_Matrix.oneD_vol_operator); @@ -1741,14 +1741,14 @@ void vol_projection_operator::build_1D_volume_operator( compute_local_vol_projection_operator(mass_inv, integral_vol_basis.oneD_vol_operator, this->oneD_vol_operator); } -template -vol_projection_operator_FR::vol_projection_operator_FR( +template +vol_projection_operator_FR::vol_projection_operator_FR( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction FR_param_input, const bool store_transpose_input) - : vol_projection_operator::vol_projection_operator(nstate_input, max_degree_input, grid_degree_input) + : vol_projection_operator::vol_projection_operator(nstate_input, max_degree_input, grid_degree_input) , store_transpose(store_transpose_input) , FR_param_type(FR_param_input) { @@ -1756,16 +1756,16 @@ vol_projection_operator_FR::vol_projection_operator_FR( current_degree = max_degree_input; } -template -void vol_projection_operator_FR::build_1D_volume_operator( +template +void vol_projection_operator_FR::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; const unsigned int n_quad_pts = quadrature.size(); - vol_integral_basis integral_vol_basis(this->nstate, this->max_degree, this->max_grid_degree); + vol_integral_basis integral_vol_basis(this->nstate, this->max_degree, this->max_grid_degree); integral_vol_basis.build_1D_volume_operator(finite_element, quadrature); - FR_mass_inv local_FR_Mass_Matrix_inv(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); + FR_mass_inv local_FR_Mass_Matrix_inv(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); local_FR_Mass_Matrix_inv.build_1D_volume_operator(finite_element, quadrature); //allocate the volume operator this->oneD_vol_operator.reinit(n_dofs, n_quad_pts); @@ -1781,14 +1781,14 @@ void vol_projection_operator_FR::build_1D_volume_operator( } } } -template -vol_projection_operator_FR_aux::vol_projection_operator_FR_aux( +template +vol_projection_operator_FR_aux::vol_projection_operator_FR_aux( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction_Aux FR_param_input, const bool store_transpose_input) - : vol_projection_operator::vol_projection_operator(nstate_input, max_degree_input, grid_degree_input) + : vol_projection_operator::vol_projection_operator(nstate_input, max_degree_input, grid_degree_input) , store_transpose(store_transpose_input) , FR_param_type(FR_param_input) { @@ -1796,16 +1796,16 @@ vol_projection_operator_FR_aux::vol_projection_operator_FR_aux( current_degree = max_degree_input; } -template -void vol_projection_operator_FR_aux::build_1D_volume_operator( +template +void vol_projection_operator_FR_aux::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; const unsigned int n_quad_pts = quadrature.size(); - vol_integral_basis integral_vol_basis(this->nstate, this->max_degree, this->max_grid_degree); + vol_integral_basis integral_vol_basis(this->nstate, this->max_degree, this->max_grid_degree); integral_vol_basis.build_1D_volume_operator(finite_element, quadrature); - FR_mass_inv_aux local_FR_Mass_Matrix_inv(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); + FR_mass_inv_aux local_FR_Mass_Matrix_inv(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); local_FR_Mass_Matrix_inv.build_1D_volume_operator(finite_element, quadrature); //allocate the volume operator this->oneD_vol_operator.reinit(n_dofs, n_quad_pts); @@ -1822,28 +1822,28 @@ void vol_projection_operator_FR_aux::build_1D_volume_operator( } } -template -FR_mass_inv::FR_mass_inv( +template +FR_mass_inv::FR_mass_inv( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction FR_param_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) , FR_param_type(FR_param_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void FR_mass_inv::build_1D_volume_operator( +template +void FR_mass_inv::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); - local_Flux_Reconstruction_operator local_FR_oper(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); + local_Flux_Reconstruction_operator local_FR_oper(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); local_FR_oper.build_1D_volume_operator(finite_element, quadrature); dealii::FullMatrix FR_mass_matrix(n_dofs); FR_mass_matrix.add(1.0, local_Mass_Matrix.oneD_vol_operator, 1.0, local_FR_oper.oneD_vol_operator); @@ -1853,28 +1853,28 @@ void FR_mass_inv::build_1D_volume_operator( this->oneD_vol_operator.invert(FR_mass_matrix); } -template -FR_mass_inv_aux::FR_mass_inv_aux( +template +FR_mass_inv_aux::FR_mass_inv_aux( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction_Aux FR_param_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) , FR_param_type(FR_param_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void FR_mass_inv_aux::build_1D_volume_operator( +template +void FR_mass_inv_aux::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); - local_Flux_Reconstruction_operator_aux local_FR_oper(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); + local_Flux_Reconstruction_operator_aux local_FR_oper(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); local_FR_oper.build_1D_volume_operator(finite_element, quadrature); dealii::FullMatrix FR_mass_matrix(n_dofs); FR_mass_matrix.add(1.0, local_Mass_Matrix.oneD_vol_operator, 1.0, local_FR_oper.oneD_vol_operator); @@ -1883,28 +1883,28 @@ void FR_mass_inv_aux::build_1D_volume_operator( //solves this->oneD_vol_operator.invert(FR_mass_matrix); } -template -FR_mass::FR_mass( +template +FR_mass::FR_mass( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction FR_param_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) , FR_param_type(FR_param_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void FR_mass::build_1D_volume_operator( +template +void FR_mass::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); - local_Flux_Reconstruction_operator local_FR_oper(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); + local_Flux_Reconstruction_operator local_FR_oper(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); local_FR_oper.build_1D_volume_operator(finite_element, quadrature); dealii::FullMatrix FR_mass_matrix(n_dofs); FR_mass_matrix.add(1.0, local_Mass_Matrix.oneD_vol_operator, 1.0, local_FR_oper.oneD_vol_operator); @@ -1913,28 +1913,28 @@ void FR_mass::build_1D_volume_operator( //solves this->oneD_vol_operator.add(1.0, FR_mass_matrix); } -template -FR_mass_aux::FR_mass_aux( +template +FR_mass_aux::FR_mass_aux( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction_Aux FR_param_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) , FR_param_type(FR_param_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void FR_mass_aux::build_1D_volume_operator( +template +void FR_mass_aux::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); - local_Flux_Reconstruction_operator_aux local_FR_oper(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); + local_Flux_Reconstruction_operator_aux local_FR_oper(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); local_FR_oper.build_1D_volume_operator(finite_element, quadrature); dealii::FullMatrix FR_mass_matrix(n_dofs); FR_mass_matrix.add(1.0, local_Mass_Matrix.oneD_vol_operator, 1.0, local_FR_oper.oneD_vol_operator); @@ -1944,19 +1944,19 @@ void FR_mass_aux::build_1D_volume_operator( this->oneD_vol_operator.add(1.0, FR_mass_matrix); } -template -vol_integral_gradient_basis::vol_integral_gradient_basis( +template +vol_integral_gradient_basis::vol_integral_gradient_basis( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void vol_integral_gradient_basis::build_1D_gradient_operator( +template +void vol_integral_gradient_basis::build_1D_gradient_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -1982,19 +1982,19 @@ void vol_integral_gradient_basis::build_1D_gradient_operator( * *************************************/ -template -face_integral_basis::face_integral_basis( +template +face_integral_basis::face_integral_basis( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void face_integral_basis::build_1D_surface_operator( +template +void face_integral_basis::build_1D_surface_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<0> &face_quadrature) { @@ -2022,32 +2022,32 @@ void face_integral_basis::build_1D_surface_operator( } } -template -lifting_operator::lifting_operator( +template +lifting_operator::lifting_operator( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void lifting_operator::build_1D_volume_operator( +template +void lifting_operator::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); //allocate the volume operator this->oneD_vol_operator.reinit(n_dofs, n_dofs); //solves this->oneD_vol_operator.add(1.0, local_Mass_Matrix.oneD_vol_operator); } -template -void lifting_operator::build_local_surface_lifting_operator( +template +void lifting_operator::build_local_surface_lifting_operator( const unsigned int n_dofs, const dealii::FullMatrix &norm_matrix, const dealii::FullMatrix &face_integral, @@ -2057,8 +2057,8 @@ void lifting_operator::build_local_surface_lifting_operator( norm_inv.invert(norm_matrix); norm_inv.mTmult(lifting, face_integral); } -template -void lifting_operator::build_1D_surface_operator( +template +void lifting_operator::build_1D_surface_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<0> &face_quadrature) { @@ -2066,7 +2066,7 @@ void lifting_operator::build_1D_surface_operator( const unsigned int n_dofs = finite_element.dofs_per_cell; const unsigned int n_faces_1D = n_faces / dim; //create surface integral of basis functions - face_integral_basis basis_int_facet(this->nstate, this->max_degree, this->max_grid_degree); + face_integral_basis basis_int_facet(this->nstate, this->max_degree, this->max_grid_degree); basis_int_facet.build_1D_surface_operator(finite_element, face_quadrature); //loop and store for(unsigned int iface=0; iface::build_1D_surface_operator( } } -template -lifting_operator_FR::lifting_operator_FR( +template +lifting_operator_FR::lifting_operator_FR( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input, const Parameters::AllParameters::Flux_Reconstruction FR_param_input) - : lifting_operator::lifting_operator(nstate_input, max_degree_input, grid_degree_input) + : lifting_operator::lifting_operator(nstate_input, max_degree_input, grid_degree_input) , FR_param_type(FR_param_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void lifting_operator_FR::build_1D_volume_operator( +template +void lifting_operator_FR::build_1D_volume_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { const unsigned int n_dofs = finite_element.dofs_per_cell; - local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); + local_mass local_Mass_Matrix(this->nstate, this->max_degree, this->max_grid_degree); local_Mass_Matrix.build_1D_volume_operator(finite_element, quadrature); - local_Flux_Reconstruction_operator local_FR(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); + local_Flux_Reconstruction_operator local_FR(this->nstate, this->max_degree, this->max_grid_degree, FR_param_type); local_FR.build_1D_volume_operator(finite_element, quadrature); //allocate the volume operator this->oneD_vol_operator.reinit(n_dofs, n_dofs); @@ -2105,8 +2105,8 @@ void lifting_operator_FR::build_1D_volume_operator( this->oneD_vol_operator.add(1.0, local_Mass_Matrix.oneD_vol_operator); this->oneD_vol_operator.add(1.0, local_FR.oneD_vol_operator); } -template -void lifting_operator_FR::build_1D_surface_operator( +template +void lifting_operator_FR::build_1D_surface_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<0> &face_quadrature) { @@ -2114,7 +2114,7 @@ void lifting_operator_FR::build_1D_surface_operator( const unsigned int n_dofs = finite_element.dofs_per_cell; const unsigned int n_faces_1D = n_faces / dim; //create surface integral of basis functions - face_integral_basis basis_int_facet(this->nstate, this->max_degree, this->max_grid_degree); + face_integral_basis basis_int_facet(this->nstate, this->max_degree, this->max_grid_degree); basis_int_facet.build_1D_surface_operator(finite_element, face_quadrature); //loop and store for(unsigned int iface=0; iface::build_1D_surface_operator( * ******************************************************************************/ -template -mapping_shape_functions::mapping_shape_functions( +template +mapping_shape_functions::mapping_shape_functions( const int nstate_input, const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) , mapping_shape_functions_grid_nodes(nstate_input, max_degree_input, grid_degree_input) , mapping_shape_functions_flux_nodes(nstate_input, max_degree_input, grid_degree_input) { @@ -2145,8 +2145,8 @@ mapping_shape_functions::mapping_shape_functions( current_grid_degree = grid_degree_input; } -template -void mapping_shape_functions::build_1D_shape_functions_at_grid_nodes( +template +void mapping_shape_functions::build_1D_shape_functions_at_grid_nodes( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -2154,8 +2154,8 @@ void mapping_shape_functions::build_1D_shape_functions_at_grid_node mapping_shape_functions_grid_nodes.build_1D_volume_operator(finite_element, quadrature); mapping_shape_functions_grid_nodes.build_1D_gradient_operator(finite_element, quadrature); } -template -void mapping_shape_functions::build_1D_shape_functions_at_flux_nodes( +template +void mapping_shape_functions::build_1D_shape_functions_at_flux_nodes( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature, const dealii::Quadrature<0> &face_quadrature) @@ -2166,8 +2166,8 @@ void mapping_shape_functions::build_1D_shape_functions_at_flux_node mapping_shape_functions_flux_nodes.build_1D_surface_gradient_operator(finite_element, face_quadrature); } -template -void mapping_shape_functions::build_1D_shape_functions_at_volume_flux_nodes( +template +void mapping_shape_functions::build_1D_shape_functions_at_volume_flux_nodes( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -2189,7 +2189,7 @@ metric_operators::metric_operators( const bool store_vol_flux_nodes_input, const bool store_surf_flux_nodes_input, const bool store_Jacobian_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate_input, max_degree_input, grid_degree_input) , store_Jacobian(store_Jacobian_input) , store_vol_flux_nodes(store_vol_flux_nodes_input) , store_surf_flux_nodes(store_surf_flux_nodes_input) @@ -2268,7 +2268,7 @@ void metric_operators::build_determinant_volume_metric_Jacobia const unsigned int n_quad_pts, const unsigned int /*n_metric_dofs*/,//dofs of metric basis. NOTE: this is the number of mapping support points const std::array,dim> &mapping_support_points, - mapping_shape_functions &mapping_basis) + mapping_shape_functions &mapping_basis) { det_Jac_vol.resize(n_quad_pts); //compute determinant of metric Jacobian @@ -2289,7 +2289,7 @@ void metric_operators::build_volume_metric_operators( const unsigned int n_quad_pts, const unsigned int n_metric_dofs,//dofs of metric basis. NOTE: this is the number of mapping support points const std::array,dim> &mapping_support_points, - mapping_shape_functions &mapping_basis, + mapping_shape_functions &mapping_basis, const bool use_invariant_curl_form) { det_Jac_vol.resize(n_quad_pts); @@ -2347,7 +2347,7 @@ void metric_operators::build_facet_metric_operators( const unsigned int n_quad_pts, const unsigned int n_metric_dofs,//dofs of metric basis. NOTE: this is the number of mapping support points const std::array,dim> &mapping_support_points, - mapping_shape_functions &mapping_basis, + mapping_shape_functions &mapping_basis, const bool use_invariant_curl_form) { det_Jac_surf.resize(n_quad_pts); @@ -2733,25 +2733,25 @@ void metric_operators::compute_local_3D_cofactor( * **********************************/ //Constructor -template -SumFactorizedOperatorsState::SumFactorizedOperatorsState( +template +SumFactorizedOperatorsState::SumFactorizedOperatorsState( const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperators::SumFactorizedOperators(nstate, max_degree_input, grid_degree_input) + : SumFactorizedOperators::SumFactorizedOperators(nstate, max_degree_input, grid_degree_input) {} -template -basis_functions_state::basis_functions_state( +template +basis_functions_state::basis_functions_state( const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperatorsState::SumFactorizedOperatorsState(max_degree_input, grid_degree_input) + : SumFactorizedOperatorsState::SumFactorizedOperatorsState(max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void basis_functions_state::build_1D_volume_state_operator( +template +void basis_functions_state::build_1D_volume_state_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -2774,8 +2774,8 @@ void basis_functions_state::build_1D_volume_state_operator( } } -template -void basis_functions_state::build_1D_gradient_state_operator( +template +void basis_functions_state::build_1D_gradient_state_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -2795,8 +2795,8 @@ void basis_functions_state::build_1D_gradient_state_operator } } } -template -void basis_functions_state::build_1D_surface_state_operator( +template +void basis_functions_state::build_1D_surface_state_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<0> &face_quadrature) { @@ -2822,18 +2822,18 @@ void basis_functions_state::build_1D_surface_state_operator( } } -template -flux_basis_functions_state::flux_basis_functions_state( +template +flux_basis_functions_state::flux_basis_functions_state( const unsigned int max_degree_input, const unsigned int grid_degree_input) - : SumFactorizedOperatorsState::SumFactorizedOperatorsState(max_degree_input, grid_degree_input) + : SumFactorizedOperatorsState::SumFactorizedOperatorsState(max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void flux_basis_functions_state::build_1D_volume_state_operator( +template +void flux_basis_functions_state::build_1D_volume_state_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -2855,8 +2855,8 @@ void flux_basis_functions_state::build_1D_volume_state_opera } } -template -void flux_basis_functions_state::build_1D_gradient_state_operator( +template +void flux_basis_functions_state::build_1D_gradient_state_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -2875,8 +2875,8 @@ void flux_basis_functions_state::build_1D_gradient_state_ope } } } -template -void flux_basis_functions_state::build_1D_surface_state_operator( +template +void flux_basis_functions_state::build_1D_surface_state_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<0> &face_quadrature) { @@ -2900,18 +2900,18 @@ void flux_basis_functions_state::build_1D_surface_state_oper } -template -local_flux_basis_stiffness::local_flux_basis_stiffness( +template +local_flux_basis_stiffness::local_flux_basis_stiffness( const unsigned int max_degree_input, const unsigned int grid_degree_input) - : flux_basis_functions_state::flux_basis_functions_state(max_degree_input, grid_degree_input) + : flux_basis_functions_state::flux_basis_functions_state(max_degree_input, grid_degree_input) { //Initialize to the max degrees current_degree = max_degree_input; } -template -void local_flux_basis_stiffness::build_1D_volume_state_operator( +template +void local_flux_basis_stiffness::build_1D_volume_state_operator( const dealii::FESystem<1,1> &finite_element, const dealii::Quadrature<1> &quadrature) { @@ -2940,39 +2940,39 @@ void local_flux_basis_stiffness::build_1D_volume_state_opera } -template class OperatorsBase ; +template class OperatorsBase ; -template class SumFactorizedOperators ; +template class SumFactorizedOperators ; -template class SumFactorizedOperatorsState ; -template class SumFactorizedOperatorsState ; -template class SumFactorizedOperatorsState ; -template class SumFactorizedOperatorsState ; -template class SumFactorizedOperatorsState ; +template class SumFactorizedOperatorsState ; +template class SumFactorizedOperatorsState ; +template class SumFactorizedOperatorsState ; +template class SumFactorizedOperatorsState ; +template class SumFactorizedOperatorsState ; -template class basis_functions ; -template class vol_integral_basis ; -template class local_mass ; -template class local_basis_stiffness ; -template class modal_basis_differential_operator ; -template class derivative_p ; -template class local_Flux_Reconstruction_operator ; -template class local_Flux_Reconstruction_operator_aux ; -template class vol_projection_operator ; -template class vol_projection_operator_FR ; -template class vol_projection_operator_FR_aux ; -template class FR_mass_inv ; -template class FR_mass_inv_aux ; -template class FR_mass ; -template class FR_mass_aux ; -template class vol_integral_gradient_basis ; +template class basis_functions ; +template class vol_integral_basis ; +template class local_mass ; +template class local_basis_stiffness ; +template class modal_basis_differential_operator ; +template class derivative_p ; +template class local_Flux_Reconstruction_operator ; +template class local_Flux_Reconstruction_operator_aux ; +template class vol_projection_operator ; +template class vol_projection_operator_FR ; +template class vol_projection_operator_FR_aux ; +template class FR_mass_inv ; +template class FR_mass_inv_aux ; +template class FR_mass ; +template class FR_mass_aux ; +template class vol_integral_gradient_basis ; //template class basis_at_facet_cubature ; -template class face_integral_basis ; -template class lifting_operator ; -template class lifting_operator_FR ; +template class face_integral_basis ; +template class lifting_operator ; +template class lifting_operator_FR ; -template class mapping_shape_functions ; +template class mapping_shape_functions ; template class metric_operators ; //template class vol_metric_operators ; @@ -2980,22 +2980,22 @@ template class metric_operators ; //template class vol_metric_cofactor; //template class surface_metric_cofactor; // -template class basis_functions_state ; -template class basis_functions_state ; -template class basis_functions_state ; -template class basis_functions_state ; -template class basis_functions_state ; - -template class flux_basis_functions_state ; -template class flux_basis_functions_state ; -template class flux_basis_functions_state ; -template class flux_basis_functions_state ; -template class flux_basis_functions_state ; -template class local_flux_basis_stiffness ; -template class local_flux_basis_stiffness ; -template class local_flux_basis_stiffness ; -template class local_flux_basis_stiffness ; -template class local_flux_basis_stiffness ; +template class basis_functions_state ; +template class basis_functions_state ; +template class basis_functions_state ; +template class basis_functions_state ; +template class basis_functions_state ; + +template class flux_basis_functions_state ; +template class flux_basis_functions_state ; +template class flux_basis_functions_state ; +template class flux_basis_functions_state ; +template class flux_basis_functions_state ; +template class local_flux_basis_stiffness ; +template class local_flux_basis_stiffness ; +template class local_flux_basis_stiffness ; +template class local_flux_basis_stiffness ; +template class local_flux_basis_stiffness ; } // OPERATOR namespace } // PHiLiP namespace diff --git a/src/operators/operators.h b/src/operators/operators.h index c08430eeb..caabfcd23 100644 --- a/src/operators/operators.h +++ b/src/operators/operators.h @@ -49,7 +49,7 @@ namespace OPERATOR { * (3) Flux Operators: See above. It is important to note that since flux operators are "collocated" on the cubature set, the number of degrees of freedom of the flux basis MUST equal the number of cubature nodes. Importantly on the surface, the flux basis interpolates from the volume to the surface, thus corresponds to volume cubature nodes collocation. * (4) Metric Operators: Since the solution polynomial degree for each state varies, along with the local grid element's polynomial degree varying, the operators distinguish between polynomial degree (for solution or flux) and grid degree (for element). Explicitly, they first go vector of grid_degree, then vector of polynomial degree for the ones that are applied on the flux nodes. The mapping-support-points follow the standard from dealii, where they are always Gauss-Legendre-Lobatto quadrature nodes making the polynomial elements continuous in a sense. */ -template +template class OperatorsBase { public: @@ -99,8 +99,8 @@ class OperatorsBase ///virtual function to be defined. virtual void matrix_vector_mult( - const std::vector &input_vect, - std::vector &output_vect, + const std::vector &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -108,9 +108,9 @@ class OperatorsBase const double factor = 1.0) = 0; ///virtual function to be defined. virtual void inner_product( - const std::vector &input_vect, - const std::vector &weight_vect, - std::vector &output_vect, + const std::vector &input_vect, + const std::vector &weight_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -127,8 +127,8 @@ class OperatorsBase * sum factorization to perform their operations. * Note that we assume tensor product elements in this operators class. */ -template -class SumFactorizedOperators : public OperatorsBase +template +class SumFactorizedOperators : public OperatorsBase { public: /// Precompute 1D operator in constructor @@ -145,8 +145,8 @@ class SumFactorizedOperators : public OperatorsBase * Lastly, the adding allows the result to add onto the previous output_vect scaled by "factor". */ void matrix_vector_mult( - const std::vector &input_vect, - std::vector &output_vect, + const std::vector &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -164,8 +164,8 @@ class SumFactorizedOperators : public OperatorsBase * \f] where we use sum factorization to evaluate each matrix-vector multiplication in each dim direction. */ void divergence_matrix_vector_mult( - const dealii::Tensor<1,dim,std::vector> &input_vect, - std::vector &output_vect, + const dealii::Tensor<1,dim,std::vector> &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -175,15 +175,15 @@ class SumFactorizedOperators : public OperatorsBase ///Computes the divergence using sum-factorization where the basis are the same in each direction. void divergence_matrix_vector_mult_1D( - const dealii::Tensor<1,dim,std::vector> &input_vect, - std::vector &output_vect, + const dealii::Tensor<1,dim,std::vector> &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis, const dealii::FullMatrix &gradient_basis); ///Computes the gradient of a scalar using sum-factorization. void gradient_matrix_vector_mult( - const std::vector &input_vect, - dealii::Tensor<1,dim,std::vector> &output_vect, + const std::vector &input_vect, + dealii::Tensor<1,dim,std::vector> &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -192,8 +192,8 @@ class SumFactorizedOperators : public OperatorsBase const dealii::FullMatrix &gradient_basis_z); ///Computes the gradient of a scalar using sum-factorization where the basis are the same in each direction. void gradient_matrix_vector_mult_1D( - const std::vector &input_vect, - dealii::Tensor<1,dim,std::vector> &output_vect, + const std::vector &input_vect, + dealii::Tensor<1,dim,std::vector> &output_vect, const dealii::FullMatrix &basis, const dealii::FullMatrix &gradient_basis); @@ -201,9 +201,9 @@ class SumFactorizedOperators : public OperatorsBase /** That is, we compute \f$ \int Awu d\mathbf{\Omega}_r = \mathbf{A}^T \text{diag}(w) \mathbf{u}^T \f$. When using this function, pass \f$ \mathbf{A} \f$ and NOT it's transpose--the function transposes it in the first few lines. */ void inner_product( - const std::vector &input_vect, - const std::vector &weight_vect, - std::vector &output_vect, + const std::vector &input_vect, + const std::vector &weight_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const dealii::FullMatrix &basis_y, const dealii::FullMatrix &basis_z, @@ -217,19 +217,19 @@ class SumFactorizedOperators : public OperatorsBase * to be \f$ \mathcal{O}(n^{d+1})\f$. */ void divergence_two_pt_flux_Hadamard_product( - const dealii::Tensor<1,dim,dealii::FullMatrix> &input_mat, - std::vector &output_vect, - const std::vector &weights, + const dealii::Tensor<1,dim,dealii::FullMatrix> &input_mat, + std::vector &output_vect, + const std::vector &weights, const dealii::FullMatrix &basis, const double scaling = 2.0);//the only direction that isn't identity /// Computes the surface cross Hadamard products for skew-symmetric form from Eq. (15) in Chan, Jesse. "Skew-symmetric entropy stable modal discontinuous Galerkin formulations." Journal of Scientific Computing 81.1 (2019): 459-485. void surface_two_pt_flux_Hadamard_product( - const dealii::FullMatrix &input_mat, - std::vector &output_vect_vol, - std::vector &output_vect_surf, - const std::vector &weights, + const dealii::FullMatrix &input_mat, + std::vector &output_vect_vol, + std::vector &output_vect_surf, + const std::vector &weights, const std::array,2> &surf_basis, const unsigned int iface, const unsigned int dim_not_zero, @@ -246,10 +246,10 @@ class SumFactorizedOperators : public OperatorsBase * This is NOT for GENERAL Hadamard products since those are \f$ \mathcal{O}(n^{2d})\f$ . */ void two_pt_flux_Hadamard_product( - const dealii::FullMatrix &input_mat, - dealii::FullMatrix &output_mat, + const dealii::FullMatrix &input_mat, + dealii::FullMatrix &output_mat, const dealii::FullMatrix &basis,//the only direction that isn't identity - const std::vector &weights,//vector storing diagonal entries for case not identity + const std::vector &weights,//vector storing diagonal entries for case not identity const int direction);//direction for the derivative that corresponds to basis @@ -294,8 +294,8 @@ class SumFactorizedOperators : public OperatorsBase * the same 1D operator in each direction */ void matrix_vector_mult_1D( - const std::vector &input_vect, - std::vector &output_vect, + const std::vector &input_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const bool adding = false, const double factor = 1.0); @@ -305,9 +305,9 @@ class SumFactorizedOperators : public OperatorsBase * the same 1D operator in each direction */ void inner_product_1D( - const std::vector &input_vect, - const std::vector &weight_vect, - std::vector &output_vect, + const std::vector &input_vect, + const std::vector &weight_vect, + std::vector &output_vect, const dealii::FullMatrix &basis_x, const bool adding = false, const double factor = 1.0); @@ -321,8 +321,8 @@ class SumFactorizedOperators : public OperatorsBase */ void matrix_vector_mult_surface_1D( const unsigned int face_number, - const std::vector &input_vect, - std::vector &output_vect, + const std::vector &input_vect, + std::vector &output_vect, const std::array,2> &basis_surf,//only 2 faces in 1D const dealii::FullMatrix &basis_vol, const bool adding = false, @@ -331,9 +331,9 @@ class SumFactorizedOperators : public OperatorsBase /// Apply sum-factorization inner product on a surface. void inner_product_surface_1D( const unsigned int face_number, - const std::vector &input_vect, - const std::vector &weight_vect, - std::vector &output_vect, + const std::vector &input_vect, + const std::vector &weight_vect, + std::vector &output_vect, const std::array,2> &basis_surf,//only 2 faces in 1D const dealii::FullMatrix &basis_vol, const bool adding = false, @@ -345,9 +345,9 @@ class SumFactorizedOperators : public OperatorsBase * \f$ A \circ B = C \implies \left( C \right)_{ij} = \left( A \right)_{ij}\left( B \right)_{ij}\f$. */ void Hadamard_product( - const dealii::FullMatrix &input_mat1, - const dealii::FullMatrix &input_mat2, - dealii::FullMatrix &output_mat); + const dealii::FullMatrix &input_mat1, + const dealii::FullMatrix &input_mat2, + dealii::FullMatrix &output_mat); //protected: public: @@ -377,8 +377,8 @@ class SumFactorizedOperators : public OperatorsBase /* This class stores the basis functions evaluated at volume and facet * cubature nodes, as well as it's gradient in REFERENCE space. */ -template -class basis_functions : public SumFactorizedOperators +template +class basis_functions : public SumFactorizedOperators { public: /// Constructor. @@ -412,8 +412,8 @@ class basis_functions : public SumFactorizedOperators }; ///\f$ \mathbf{W}*\mathbf{\chi}(\mathbf{\xi}_v^r) \f$ That is Quadrature Weights multiplies with basis_at_vol_cubature. -template -class vol_integral_basis : public SumFactorizedOperators +template +class vol_integral_basis : public SumFactorizedOperators { public: /// Constructor. @@ -432,8 +432,8 @@ class vol_integral_basis : public SumFactorizedOperators }; ///Local mass matrix without jacobian dependence. -template -class local_mass : public SumFactorizedOperators +template +class local_mass : public SumFactorizedOperators { public: /// Constructor. @@ -457,7 +457,7 @@ class local_mass : public SumFactorizedOperators dealii::FullMatrix build_dim_mass_matrix( const int nstate, const unsigned int n_dofs, const unsigned int n_quad_pts, - basis_functions &basis, + basis_functions &basis, const std::vector &det_Jac, const std::vector &quad_weights); }; @@ -468,8 +468,8 @@ class local_mass : public SumFactorizedOperators (\mathbf{S}_\xi)_{ij} = \int_\mathbf{{\Omega}_r} \mathbf{\chi}_i(\mathbf{\xi}^r) \frac{\mathbf{\chi}_{j}(\mathbf{\xi}^r)}{\partial \xi} d\mathbf{\Omega}_r \f] */ -template -class local_basis_stiffness : public SumFactorizedOperators +template +class local_basis_stiffness : public SumFactorizedOperators { public: /// Constructor. @@ -495,8 +495,8 @@ class local_basis_stiffness : public SumFactorizedOperators }; ///This is the solution basis \f$\mathbf{D}_i\f$, the modal differential opertaor commonly seen in DG defined as \f$\mathbf{D}_i=\mathbf{M}^{-1}*\mathbf{S}_i\f$. -template -class modal_basis_differential_operator : public SumFactorizedOperators +template +class modal_basis_differential_operator : public SumFactorizedOperators { public: /// Constructor. @@ -515,8 +515,8 @@ class modal_basis_differential_operator : public SumFactorizedOperators -class derivative_p : public SumFactorizedOperators +template +class derivative_p : public SumFactorizedOperators { public: /// Constructor. @@ -535,8 +535,8 @@ class derivative_p : public SumFactorizedOperators }; /// ESFR correction matrix without jac dependence -template -class local_Flux_Reconstruction_operator : public SumFactorizedOperators +template +class local_Flux_Reconstruction_operator : public SumFactorizedOperators { public: ///Constructor. @@ -651,8 +651,8 @@ class local_Flux_Reconstruction_operator : public SumFactorizedOperators -class local_Flux_Reconstruction_operator_aux : public local_Flux_Reconstruction_operator +template +class local_Flux_Reconstruction_operator_aux : public local_Flux_Reconstruction_operator { public: ///Constructor. @@ -690,8 +690,8 @@ class local_Flux_Reconstruction_operator_aux : public local_Flux_Reconstruction_ }; ///Projection operator corresponding to basis functions onto M-norm (L2). -template -class vol_projection_operator : public SumFactorizedOperators +template +class vol_projection_operator : public SumFactorizedOperators { public: ///Constructor. @@ -716,8 +716,8 @@ class vol_projection_operator : public SumFactorizedOperators }; ///Projection operator corresponding to basis functions onto \f$(M+K)\f$-norm. -template -class vol_projection_operator_FR : public vol_projection_operator +template +class vol_projection_operator_FR : public vol_projection_operator { public: ///Constructor. @@ -747,8 +747,8 @@ class vol_projection_operator_FR : public vol_projection_operator }; ///Projection operator corresponding to basis functions onto \f$(M+K)\f$-norm for auxiliary equation. -template -class vol_projection_operator_FR_aux : public vol_projection_operator +template +class vol_projection_operator_FR_aux : public vol_projection_operator { public: ///Constructor. @@ -778,8 +778,8 @@ class vol_projection_operator_FR_aux : public vol_projection_operator -class FR_mass_inv : public SumFactorizedOperators +template +class FR_mass_inv : public SumFactorizedOperators { public: ///Constructor. @@ -801,8 +801,8 @@ class FR_mass_inv : public SumFactorizedOperators const dealii::Quadrature<1> &quadrature); }; ///The metric independent inverse of the FR mass matrix for auxiliary equation \f$(M+K)^{-1}\f$. -template -class FR_mass_inv_aux : public SumFactorizedOperators +template +class FR_mass_inv_aux : public SumFactorizedOperators { public: ///Constructor. @@ -824,8 +824,8 @@ class FR_mass_inv_aux : public SumFactorizedOperators const dealii::Quadrature<1> &quadrature); }; ///The metric independent FR mass matrix \f$(M+K)\f$. -template -class FR_mass : public SumFactorizedOperators +template +class FR_mass : public SumFactorizedOperators { public: ///Constructor. @@ -848,8 +848,8 @@ class FR_mass : public SumFactorizedOperators }; ///The metric independent FR mass matrix for auxiliary equation \f$(M+K)\f$. -template -class FR_mass_aux : public SumFactorizedOperators +template +class FR_mass_aux : public SumFactorizedOperators { public: ///Constructor. @@ -879,8 +879,8 @@ class FR_mass_aux : public SumFactorizedOperators * \mathbf{W}\nabla\Big(\chi_i(\mathbf{\xi}^r)\Big) * \f] */ -template -class vol_integral_gradient_basis : public SumFactorizedOperators +template +class vol_integral_gradient_basis : public SumFactorizedOperators { public: ///Constructor. @@ -912,8 +912,8 @@ class vol_integral_gradient_basis : public SumFactorizedOperators *ie/ diag of REFERENCE unit normal times facet quadrature weights times solution basis functions evaluated on that face *in DG surface integral would be transpose(face_integral_basis) times flux_on_face */ -template -class face_integral_basis : public SumFactorizedOperators +template +class face_integral_basis : public SumFactorizedOperators { public: ///Constructor. @@ -937,8 +937,8 @@ class face_integral_basis : public SumFactorizedOperators *NOTE this doesn't have metric Jacobian dependence, for DG solver *we build that using the functions below on the fly! */ -template -class lifting_operator : public SumFactorizedOperators +template +class lifting_operator : public SumFactorizedOperators { public: ///Constructor. @@ -978,8 +978,8 @@ class lifting_operator : public SumFactorizedOperators * L_{FR}:\: _{\mathbf{\Omega}_r} = _{\mathbf{\Gamma}_2}, \forall v\in P^p(\mathbf{\Omega}_r) * \f]. */ -template -class lifting_operator_FR : public lifting_operator +template +class lifting_operator_FR : public lifting_operator { public: ///Constructor. @@ -1022,8 +1022,8 @@ class lifting_operator_FR : public lifting_operator * collocated on the mapping support points. * By default, we use Gauss-Lobatto-Legendre as the mapping support points. */ -template -class mapping_shape_functions: public SumFactorizedOperators +template +class mapping_shape_functions: public SumFactorizedOperators { public: ///Constructor. @@ -1039,10 +1039,10 @@ class mapping_shape_functions: public SumFactorizedOperators unsigned int current_grid_degree; ///Object of mapping shape functions evaluated at grid nodes. - basis_functions mapping_shape_functions_grid_nodes; + basis_functions mapping_shape_functions_grid_nodes; ///Object of mapping shape functions evaluated at flux nodes. - basis_functions mapping_shape_functions_flux_nodes; + basis_functions mapping_shape_functions_flux_nodes; ///Constructs the volume operator and gradient operator. /** @@ -1083,7 +1083,7 @@ class mapping_shape_functions: public SumFactorizedOperators *****************************************************************************/ ///Base metric operators class that stores functions used in both the volume and on surface. template -class metric_operators: public SumFactorizedOperators +class metric_operators: public SumFactorizedOperators { public: ///Constructor. @@ -1134,7 +1134,7 @@ class metric_operators: public SumFactorizedOperators const unsigned int n_quad_pts,//number volume quad pts const unsigned int n_metric_dofs,//dofs of metric basis. NOTE: this is the number of mapping support points const std::array,dim> &mapping_support_points, - mapping_shape_functions &mapping_basis); + mapping_shape_functions &mapping_basis); ///Builds the volume metric operators. /** Builds and stores volume metric cofactor and determinant of metric Jacobian @@ -1145,7 +1145,7 @@ class metric_operators: public SumFactorizedOperators const unsigned int n_quad_pts,//number volume quad pts const unsigned int n_metric_dofs,//dofs of metric basis. NOTE: this is the number of mapping support points const std::array,dim> &mapping_support_points, - mapping_shape_functions &mapping_basis, + mapping_shape_functions &mapping_basis, const bool use_invariant_curl_form = false); ///Builds the facet metric operators. @@ -1158,7 +1158,7 @@ class metric_operators: public SumFactorizedOperators const unsigned int n_quad_pts,//number facet quad pts const unsigned int n_metric_dofs,//dofs of metric basis. NOTE: this is the number of mapping support points const std::array,dim> &mapping_support_points, - mapping_shape_functions &mapping_basis, + mapping_shape_functions &mapping_basis, const bool use_invariant_curl_form = false); ///The volume metric cofactor matrix. @@ -1288,8 +1288,8 @@ class metric_operators: public SumFactorizedOperators /**Note that dofs and quad points aren't templated because they are variable with respect to each polynomial degree. *Also I couldn't template by polynomial degree/grid degree since they aren't compile time constant expressions. */ -template -class SumFactorizedOperatorsState : public SumFactorizedOperators +template +class SumFactorizedOperatorsState : public SumFactorizedOperators { public: ///Constructor. @@ -1312,8 +1312,8 @@ class SumFactorizedOperatorsState : public SumFactorizedOperators };//end of OperatorsBaseState Class ///The basis functions separated by nstate with n shape functions. -template -class basis_functions_state : public SumFactorizedOperatorsState +template +class basis_functions_state : public SumFactorizedOperatorsState { public: ///Constructor. @@ -1344,8 +1344,8 @@ class basis_functions_state : public SumFactorizedOperatorsState -class flux_basis_functions_state : public SumFactorizedOperatorsState +template +class flux_basis_functions_state : public SumFactorizedOperatorsState { public: ///Constructor. @@ -1379,8 +1379,8 @@ class flux_basis_functions_state : public SumFactorizedOperatorsState -class local_flux_basis_stiffness : public flux_basis_functions_state +template +class local_flux_basis_stiffness : public flux_basis_functions_state { public: ///Constructor. diff --git a/src/physics/initial_conditions/set_initial_condition.cpp b/src/physics/initial_conditions/set_initial_condition.cpp index 8a3706b3f..20ee2c509 100644 --- a/src/physics/initial_conditions/set_initial_condition.cpp +++ b/src/physics/initial_conditions/set_initial_condition.cpp @@ -70,7 +70,7 @@ void SetInitialCondition::project_initial_condition( dealii::update_quadrature_points); const unsigned int max_dofs_per_cell = dg->dof_handler.get_fe_collection().max_dofs_per_cell(); std::vector current_dofs_indices(max_dofs_per_cell); - OPERATOR::vol_projection_operator vol_projection(1, dg->max_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(1, dg->max_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection_1state[dg->max_degree], dg->oneD_quadrature_collection[dg->max_degree]); for (auto current_cell = dg->dof_handler.begin_active(); current_cell!=dg->dof_handler.end(); ++current_cell) { if (!current_cell->is_locally_owned()) continue; @@ -174,7 +174,7 @@ void SetInitialCondition::read_values_from_file_and_project( dealii::update_quadrature_points); const unsigned int max_dofs_per_cell = dg->dof_handler.get_fe_collection().max_dofs_per_cell(); std::vector current_dofs_indices(max_dofs_per_cell); - OPERATOR::vol_projection_operator vol_projection(1, dg->max_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(1, dg->max_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection_1state[dg->max_degree], dg->oneD_quadrature_collection[dg->max_degree]); for (auto current_cell = dg->dof_handler.begin_active(); current_cell!=dg->dof_handler.end(); ++current_cell) { if (!current_cell->is_locally_owned()) continue; diff --git a/src/testing/advection_explicit_periodic.cpp b/src/testing/advection_explicit_periodic.cpp index 3de7ba5ee..e45102833 100644 --- a/src/testing/advection_explicit_periodic.cpp +++ b/src/testing/advection_explicit_periodic.cpp @@ -74,7 +74,7 @@ double AdvectionPeriodic::compute_conservation(std::shared_ptr < PH // Projected vector of ones. That is, the interpolation of ones_hat to the volume nodes is 1. std::vector ones_hat(n_dofs_cell); // We have to project the vector of ones because the mass matrix has an interpolation from solution nodes built into it. - OPERATOR::vol_projection_operator vol_projection(dg->nstate, poly_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(dg->nstate, poly_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection[poly_degree], dg->oneD_quadrature_collection[poly_degree]); vol_projection.matrix_vector_mult_1D(ones, ones_hat, vol_projection.oneD_vol_operator); diff --git a/src/testing/burgers_stability.cpp b/src/testing/burgers_stability.cpp index c944b4c20..8b639b70b 100644 --- a/src/testing/burgers_stability.cpp +++ b/src/testing/burgers_stability.cpp @@ -66,7 +66,7 @@ double BurgersEnergyStability::compute_conservation(std::shared_ptr //Projected vector of ones. That is, the interpolation of ones_hat to the volume nodes is 1. std::vector ones_hat(n_dofs_cell); //We have to project the vector of ones because the mass matrix has an interpolation from solution nodes built into it. - OPERATOR::vol_projection_operator vol_projection(dg->nstate, poly_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(dg->nstate, poly_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection[poly_degree], dg->oneD_quadrature_collection[poly_degree]); vol_projection.matrix_vector_mult_1D(ones, ones_hat, vol_projection.oneD_vol_operator); diff --git a/src/testing/convection_diffusion_explicit_periodic.cpp b/src/testing/convection_diffusion_explicit_periodic.cpp index b1ebed179..32bb733b0 100644 --- a/src/testing/convection_diffusion_explicit_periodic.cpp +++ b/src/testing/convection_diffusion_explicit_periodic.cpp @@ -73,7 +73,7 @@ double ConvectionDiffusionPeriodic::compute_conservation(std::share // Projected vector of ones. That is, the interpolation of ones_hat to the volume nodes is 1. std::vector ones_hat(n_dofs_cell); // We have to project the vector of ones because the mass matrix has an interpolation from solution nodes built into it. - OPERATOR::vol_projection_operator vol_projection(dg->nstate, poly_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(dg->nstate, poly_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection[poly_degree], dg->oneD_quadrature_collection[poly_degree]); vol_projection.matrix_vector_mult_1D(ones, ones_hat, vol_projection.oneD_vol_operator); diff --git a/src/testing/euler_split_inviscid_taylor_green_vortex.cpp b/src/testing/euler_split_inviscid_taylor_green_vortex.cpp index db45ed3b6..69ead20ee 100644 --- a/src/testing/euler_split_inviscid_taylor_green_vortex.cpp +++ b/src/testing/euler_split_inviscid_taylor_green_vortex.cpp @@ -20,10 +20,10 @@ std::array EulerTaylorGreen::compute_change_in_entropy(co const unsigned int n_quad_pts = dg->volume_quadrature_collection[poly_degree].size(); const unsigned int n_shape_fns = n_dofs_cell / nstate; //We have to project the vector of entropy variables because the mass matrix has an interpolation from solution nodes built into it. - OPERATOR::vol_projection_operator vol_projection(1, poly_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(1, poly_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); - OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); soln_basis.build_1D_volume_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); dealii::LinearAlgebra::distributed::Vector entropy_var_hat_global(dg->right_hand_side); @@ -106,26 +106,26 @@ double EulerTaylorGreen::compute_volume_term(const std::shared_ptr const unsigned int n_shape_fns = n_dofs_cell / nstate; const unsigned int grid_degree = dg->high_order_grid->fe_system.tensor_degree(); - OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); soln_basis.build_1D_volume_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); soln_basis.build_1D_gradient_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); soln_basis.build_1D_surface_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_face_quadrature); - OPERATOR::basis_functions flux_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::basis_functions flux_basis(1, poly_degree, dg->max_grid_degree); flux_basis.build_1D_volume_operator(dg->oneD_fe_collection_flux[poly_degree], dg->oneD_quadrature_collection[poly_degree]); flux_basis.build_1D_gradient_operator(dg->oneD_fe_collection_flux[poly_degree], dg->oneD_quadrature_collection[poly_degree]); flux_basis.build_1D_surface_operator(dg->oneD_fe_collection_flux[poly_degree], dg->oneD_face_quadrature); - OPERATOR::local_basis_stiffness flux_basis_stiffness(1, poly_degree, dg->max_grid_degree, true); + OPERATOR::local_basis_stiffness flux_basis_stiffness(1, poly_degree, dg->max_grid_degree, true); //flux basis stiffness operator for skew-symmetric form flux_basis_stiffness.build_1D_volume_operator(dg->oneD_fe_collection_flux[poly_degree], dg->oneD_quadrature_collection[poly_degree]); - OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(dg->high_order_grid->oneD_fe_system, dg->high_order_grid->oneD_grid_nodes); mapping_basis.build_1D_shape_functions_at_flux_nodes(dg->high_order_grid->oneD_fe_system, dg->oneD_quadrature_collection[poly_degree], dg->oneD_face_quadrature); const std::vector &oneD_vol_quad_weights = dg->oneD_quadrature_collection[poly_degree].get_weights(); - OPERATOR::vol_projection_operator vol_projection(1, poly_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(1, poly_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); std::vector dofs_indices (n_dofs_cell); @@ -336,10 +336,10 @@ double EulerTaylorGreen::compute_entropy(const std::shared_ptr < DG const unsigned int n_shape_fns = n_dofs_cell / nstate; //We have to project the vector of entropy variables because the mass matrix has an interpolation from solution nodes built into it. - OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); soln_basis.build_1D_volume_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); - OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, dg->max_grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(dg->high_order_grid->oneD_fe_system, dg->high_order_grid->oneD_grid_nodes); mapping_basis.build_1D_shape_functions_at_flux_nodes(dg->high_order_grid->oneD_fe_system, dg->oneD_quadrature_collection[poly_degree], dg->oneD_face_quadrature); @@ -430,10 +430,10 @@ double EulerTaylorGreen::compute_kinetic_energy(const std::shared_p const unsigned int n_shape_fns = n_dofs_cell / nstate; //We have to project the vector of entropy variables because the mass matrix has an interpolation from solution nodes built into it. - OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::basis_functions soln_basis(1, poly_degree, dg->max_grid_degree); soln_basis.build_1D_volume_operator(dg->oneD_fe_collection_1state[poly_degree], dg->oneD_quadrature_collection[poly_degree]); - OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, dg->max_grid_degree); + OPERATOR::mapping_shape_functions mapping_basis(1, poly_degree, dg->max_grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(dg->high_order_grid->oneD_fe_system, dg->high_order_grid->oneD_grid_nodes); mapping_basis.build_1D_shape_functions_at_flux_nodes(dg->high_order_grid->oneD_fe_system, dg->oneD_quadrature_collection[poly_degree], dg->oneD_face_quadrature); @@ -583,7 +583,7 @@ int EulerTaylorGreen::run_test() const // Create DG std::shared_ptr < PHiLiP::DGBase > dg = PHiLiP::DGFactory::create_discontinuous_galerkin(&all_parameters_new, poly_degree, poly_degree, grid_degree, grid); - dg->allocate_system (); + dg->allocate_system (false,false,false); pcout << "Implement initial conditions" << std::endl; std::shared_ptr< InitialConditionFunction > initial_condition_function = diff --git a/tests/unit_tests/flow_variable_tests/auxiliary_equations_int_by_parts.cpp b/tests/unit_tests/flow_variable_tests/auxiliary_equations_int_by_parts.cpp index acba9cd99..df584c82a 100644 --- a/tests/unit_tests/flow_variable_tests/auxiliary_equations_int_by_parts.cpp +++ b/tests/unit_tests/flow_variable_tests/auxiliary_equations_int_by_parts.cpp @@ -28,12 +28,12 @@ const double TOLERANCE = 1E-6; using namespace std; //namespace PHiLiP { -template +template void assemble_weak_auxiliary_volume( std::shared_ptr < PHiLiP::DGStrong > &dg, const std::vector ¤t_dofs_indices, const unsigned int poly_degree, - PHiLiP::OPERATOR::basis_functions &soln_basis, + PHiLiP::OPERATOR::basis_functions &soln_basis, PHiLiP::OPERATOR::metric_operators &metric_oper, std::vector> &local_auxiliary_RHS) { @@ -87,7 +87,7 @@ void assemble_weak_auxiliary_volume( } } } -template +template void assemble_face_term_auxiliary_weak( std::shared_ptr < PHiLiP::DGStrong > &dg, const unsigned int iface, const unsigned int neighbor_iface, @@ -100,8 +100,8 @@ void assemble_face_term_auxiliary_weak( const unsigned int n_face_quad_pts, const std::vector &dof_indices_int, const std::vector &dof_indices_ext, - PHiLiP::OPERATOR::basis_functions &soln_basis_int, - PHiLiP::OPERATOR::basis_functions &soln_basis_ext, + PHiLiP::OPERATOR::basis_functions &soln_basis_int, + PHiLiP::OPERATOR::basis_functions &soln_basis_ext, PHiLiP::OPERATOR::metric_operators &metric_oper_int, std::vector> &local_auxiliary_RHS_int, std::vector> &local_auxiliary_RHS_ext) @@ -327,16 +327,16 @@ int main (int argc, char * argv[]) auto metric_cell = dg->high_order_grid->dof_handler_grid.begin_active(); //build 1D reference operators - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(dg->nstate, poly_degree, 1); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(dg->nstate, poly_degree, 1); mapping_basis.build_1D_shape_functions_at_grid_nodes(dg->high_order_grid->oneD_fe_system, dg->high_order_grid->oneD_grid_nodes); mapping_basis.build_1D_shape_functions_at_flux_nodes(dg->high_order_grid->oneD_fe_system, dg->oneD_quadrature_collection[poly_degree], dg->oneD_face_quadrature); - PHiLiP::OPERATOR::basis_functions basis(dg->nstate, dg->max_degree, dg->max_grid_degree); + PHiLiP::OPERATOR::basis_functions basis(dg->nstate, dg->max_degree, dg->max_grid_degree); basis.build_1D_volume_operator(dg->oneD_fe_collection_1state[dg->max_degree], dg->oneD_quadrature_collection[dg->max_degree]); basis.build_1D_gradient_operator(dg->oneD_fe_collection_1state[dg->max_degree], dg->oneD_quadrature_collection[dg->max_degree]); basis.build_1D_surface_operator(dg->oneD_fe_collection_1state[dg->max_degree], dg->oneD_face_quadrature); - PHiLiP::OPERATOR::basis_functions flux_basis(dg->nstate, dg->max_degree, dg->max_grid_degree); + PHiLiP::OPERATOR::basis_functions flux_basis(dg->nstate, dg->max_degree, dg->max_grid_degree); flux_basis.build_1D_volume_operator(dg->oneD_fe_collection_flux[dg->max_degree], dg->oneD_quadrature_collection[dg->max_degree]); flux_basis.build_1D_gradient_operator(dg->oneD_fe_collection_flux[dg->max_degree], dg->oneD_quadrature_collection[dg->max_degree]); flux_basis.build_1D_surface_operator(dg->oneD_fe_collection_flux[dg->max_degree], dg->oneD_face_quadrature); diff --git a/tests/unit_tests/flow_variable_tests/auxiliary_variable_test.cpp b/tests/unit_tests/flow_variable_tests/auxiliary_variable_test.cpp index 25ca57816..abeaa3ad9 100644 --- a/tests/unit_tests/flow_variable_tests/auxiliary_variable_test.cpp +++ b/tests/unit_tests/flow_variable_tests/auxiliary_variable_test.cpp @@ -148,11 +148,11 @@ int main (int argc, char * argv[]) const unsigned int n_grid_nodes = n_metric_dofs / dim; auto metric_cell = dg->high_order_grid->dof_handler_grid.begin_active(); - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(dg->nstate, poly_degree, 1); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(dg->nstate, poly_degree, 1); mapping_basis.build_1D_shape_functions_at_grid_nodes(dg->high_order_grid->oneD_fe_system, dg->high_order_grid->oneD_grid_nodes); mapping_basis.build_1D_shape_functions_at_flux_nodes(dg->high_order_grid->oneD_fe_system, dg->oneD_quadrature_collection[poly_degree], dg->oneD_face_quadrature); - OPERATOR::vol_projection_operator vol_projection(dg->nstate, dg->max_degree, dg->max_grid_degree); + OPERATOR::vol_projection_operator vol_projection(dg->nstate, dg->max_degree, dg->max_grid_degree); vol_projection.build_1D_volume_operator(dg->oneD_fe_collection[dg->max_degree], dg->oneD_quadrature_collection[dg->max_degree]); for (auto current_cell = dg->dof_handler.begin_active(); current_cell!=dg->dof_handler.end(); ++current_cell, ++metric_cell) { diff --git a/tests/unit_tests/operator_tests/GCL_Collocated_test.cpp b/tests/unit_tests/operator_tests/GCL_Collocated_test.cpp index 845f65e55..3afc487e9 100644 --- a/tests/unit_tests/operator_tests/GCL_Collocated_test.cpp +++ b/tests/unit_tests/operator_tests/GCL_Collocated_test.cpp @@ -293,7 +293,7 @@ int main (int argc, char * argv[]) dealii::QGauss<1> flux_quad(poly_degree +1); dealii::QGauss<0> flux_quad_face(poly_degree +1); - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(fe_sys_grid, grid_quad); mapping_basis.build_1D_shape_functions_at_flux_nodes(fe_sys_grid, flux_quad, flux_quad_face); @@ -335,7 +335,7 @@ int main (int argc, char * argv[]) const dealii::FE_DGQArbitraryNodes<1> fe_poly(flux_quad); const dealii::FESystem<1,1> fe_sys_poly(fe_poly, nstate); - PHiLiP::OPERATOR::basis_functions_state flux_basis_quad(poly_degree, 1); + PHiLiP::OPERATOR::basis_functions_state flux_basis_quad(poly_degree, 1); flux_basis_quad.build_1D_gradient_state_operator(fe_sys_poly, flux_quad); flux_basis_quad.build_1D_volume_state_operator(fe_sys_poly, flux_quad); for(int idim=0; idim flux_quad(poly_degree +1); dealii::QGauss<0> flux_quad_face(poly_degree +1); - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(fe_sys_grid, grid_quad); mapping_basis.build_1D_shape_functions_at_flux_nodes(fe_sys_grid, flux_quad, flux_quad_face); @@ -329,7 +329,7 @@ int main (int argc, char * argv[]) const dealii::FE_DGQArbitraryNodes<1> fe_poly(flux_quad); const dealii::FESystem<1,1> fe_sys_poly(fe_poly, nstate); - PHiLiP::OPERATOR::basis_functions_state flux_basis_quad(poly_degree, 1); + PHiLiP::OPERATOR::basis_functions_state flux_basis_quad(poly_degree, 1); flux_basis_quad.build_1D_gradient_state_operator(fe_sys_poly, flux_quad); flux_basis_quad.build_1D_volume_state_operator(fe_sys_poly, flux_quad); for(int idim=0; idim flux_quad(poly_degree +1); dealii::QGauss<0> flux_quad_face(poly_degree +1); - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(fe_sys_grid, grid_quad); mapping_basis.build_1D_shape_functions_at_flux_nodes(fe_sys_grid, flux_quad, flux_quad_face); @@ -333,7 +333,7 @@ int main (int argc, char * argv[]) const dealii::FE_DGQArbitraryNodes<1> fe_poly(flux_quad); const dealii::FESystem<1,1> fe_sys_poly(fe_poly, nstate); - PHiLiP::OPERATOR::basis_functions_state flux_basis_quad(poly_degree, 1); + PHiLiP::OPERATOR::basis_functions_state flux_basis_quad(poly_degree, 1); flux_basis_quad.build_1D_gradient_state_operator(fe_sys_poly, flux_quad); flux_basis_quad.build_1D_volume_state_operator(fe_sys_poly, flux_quad); for(int idim=0; idim stiffness(1, poly_degree, 1); - PHiLiP::OPERATOR::local_mass mass(1, poly_degree, 1); + PHiLiP::OPERATOR::local_basis_stiffness stiffness(1, poly_degree, 1); + PHiLiP::OPERATOR::local_mass mass(1, poly_degree, 1); dealii::QGauss<1> quad1D (poly_degree+1); const dealii::FE_DGQArbitraryNodes<1> fe_dg(quad1D); const dealii::FESystem<1,1> fe_system(fe_dg, 1); diff --git a/tests/unit_tests/operator_tests/consistent_surface_Hadamard_test.cpp b/tests/unit_tests/operator_tests/consistent_surface_Hadamard_test.cpp index 2b5991975..6b7c3c941 100644 --- a/tests/unit_tests/operator_tests/consistent_surface_Hadamard_test.cpp +++ b/tests/unit_tests/operator_tests/consistent_surface_Hadamard_test.cpp @@ -68,8 +68,8 @@ int main (int argc, char * argv[]) const unsigned int poly_min = 2; for(unsigned int poly_degree=poly_min; poly_degree basis(1, poly_degree, 1); - PHiLiP::OPERATOR::local_mass mass(1, poly_degree, 1); + PHiLiP::OPERATOR::basis_functions basis(1, poly_degree, 1); + PHiLiP::OPERATOR::local_mass mass(1, poly_degree, 1); dealii::QGauss<1> quad1D (poly_degree+1); dealii::QGauss<0> quad1D_surf (poly_degree+1); const dealii::FE_DGQArbitraryNodes<1> fe_dg(quad1D); diff --git a/tests/unit_tests/operator_tests/flux_oper_test.cpp b/tests/unit_tests/operator_tests/flux_oper_test.cpp index a6d659afa..ba479eb8b 100644 --- a/tests/unit_tests/operator_tests/flux_oper_test.cpp +++ b/tests/unit_tests/operator_tests/flux_oper_test.cpp @@ -114,14 +114,14 @@ int main (int argc, char * argv[]) const dealii::FESystem<1,1> fe_system(fe_dg, nstate); const dealii::FE_DGQArbitraryNodes<1> fe_dg_flux(quad1D); const dealii::FESystem<1,1> fe_system_flux(fe_dg_flux, nstate); - PHiLiP::OPERATOR::vol_integral_gradient_basis vol_int_grad_basis(nstate, poly_degree, 1); + PHiLiP::OPERATOR::vol_integral_gradient_basis vol_int_grad_basis(nstate, poly_degree, 1); vol_int_grad_basis.build_1D_gradient_operator(fe_system, quad1D); - PHiLiP::OPERATOR::local_flux_basis_stiffness flux_stiffness(poly_degree, 1); + PHiLiP::OPERATOR::local_flux_basis_stiffness flux_stiffness(poly_degree, 1); flux_stiffness.build_1D_gradient_state_operator(fe_system_flux, quad1D); flux_stiffness.build_1D_volume_state_operator(fe_system, quad1D); - // PHiLiP::OPERATOR::basis_functions_state flux_basis_quad(poly_degree, 1); - PHiLiP::OPERATOR::flux_basis_functions_state flux_basis_quad(poly_degree, 1); + // PHiLiP::OPERATOR::basis_functions_state flux_basis_quad(poly_degree, 1); + PHiLiP::OPERATOR::flux_basis_functions_state flux_basis_quad(poly_degree, 1); flux_basis_quad.build_1D_volume_state_operator(fe_system_flux, quad1D); dealii::FullMatrix vol_int_parts(n_dofs_1D); @@ -132,7 +132,7 @@ int main (int argc, char * argv[]) dealii::QGauss<0> face_quad1D (poly_degree+1); dealii::FullMatrix surf_int_parts(n_dofs_1D); flux_basis_quad.build_1D_surface_state_operator(fe_system_flux, face_quad1D); - PHiLiP::OPERATOR::face_integral_basis surf_int_basis(nstate, poly_degree, 1); + PHiLiP::OPERATOR::face_integral_basis surf_int_basis(nstate, poly_degree, 1); surf_int_basis.build_1D_surface_operator(fe_system, face_quad1D); for(unsigned int iface=0; iface< dealii::GeometryInfo<1>::faces_per_cell; iface++){ const dealii::Tensor<1,1,real> unit_normal_1D = dealii::GeometryInfo<1>::unit_normal_vector[iface]; diff --git a/tests/unit_tests/operator_tests/metric_Jacobian_test.cpp b/tests/unit_tests/operator_tests/metric_Jacobian_test.cpp index de322db16..ba72e620d 100644 --- a/tests/unit_tests/operator_tests/metric_Jacobian_test.cpp +++ b/tests/unit_tests/operator_tests/metric_Jacobian_test.cpp @@ -294,7 +294,7 @@ int main (int argc, char * argv[]) dealii::QGauss<1> flux_quad(poly_degree +1); dealii::QGauss<0> flux_quad_face(poly_degree +1); - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(fe_sys_grid, grid_quad); mapping_basis.build_1D_shape_functions_at_flux_nodes(fe_sys_grid, flux_quad, flux_quad_face); diff --git a/tests/unit_tests/operator_tests/sum_factorization_Hadamard_matrix_assembly_test.cpp b/tests/unit_tests/operator_tests/sum_factorization_Hadamard_matrix_assembly_test.cpp index e6e9d1e19..4df1ffb2c 100644 --- a/tests/unit_tests/operator_tests/sum_factorization_Hadamard_matrix_assembly_test.cpp +++ b/tests/unit_tests/operator_tests/sum_factorization_Hadamard_matrix_assembly_test.cpp @@ -78,7 +78,7 @@ int main (int argc, char * argv[]) std::array time_diff_original; for(unsigned int poly_degree=poly_min; poly_degree basis(nstate,poly_degree, 1); + PHiLiP::OPERATOR::basis_functions basis(nstate,poly_degree, 1); dealii::QGauss<1> quad1D (poly_degree+1); const dealii::FE_DGQArbitraryNodes<1> fe_dg(quad1D); const dealii::FESystem<1,1> fe_system(fe_dg, 1); diff --git a/tests/unit_tests/operator_tests/sum_factorization_Hadamard_surface_matrix_assembly_test.cpp b/tests/unit_tests/operator_tests/sum_factorization_Hadamard_surface_matrix_assembly_test.cpp index aba7dd5e5..28f63e6bb 100644 --- a/tests/unit_tests/operator_tests/sum_factorization_Hadamard_surface_matrix_assembly_test.cpp +++ b/tests/unit_tests/operator_tests/sum_factorization_Hadamard_surface_matrix_assembly_test.cpp @@ -76,8 +76,8 @@ int main (int argc, char * argv[]) std::array time_diff_original; for(unsigned int poly_degree=poly_min; poly_degree basis(1,poly_degree, 1); - PHiLiP::OPERATOR::local_mass mass(1, poly_degree, 1); + PHiLiP::OPERATOR::basis_functions basis(1,poly_degree, 1); + PHiLiP::OPERATOR::local_mass mass(1, poly_degree, 1); dealii::QGauss<1> quad1D (poly_degree+1); dealii::QGauss<0> quad1D_surf (poly_degree+1); const dealii::FE_DGQArbitraryNodes<1> fe_dg(quad1D); diff --git a/tests/unit_tests/operator_tests/sum_factorization_Hadamard_test.cpp b/tests/unit_tests/operator_tests/sum_factorization_Hadamard_test.cpp index fdfde71d3..92e7b90ef 100644 --- a/tests/unit_tests/operator_tests/sum_factorization_Hadamard_test.cpp +++ b/tests/unit_tests/operator_tests/sum_factorization_Hadamard_test.cpp @@ -78,7 +78,7 @@ int main (int argc, char * argv[]) std::array time_diff_sum_dir3; for(unsigned int poly_degree=poly_min; poly_degree basis(nstate,poly_degree, 1); + PHiLiP::OPERATOR::basis_functions basis(nstate,poly_degree, 1); dealii::QGauss<1> quad1D (poly_degree+1); const dealii::FE_DGQArbitraryNodes<1> fe_dg(quad1D); const dealii::FESystem<1,1> fe_system(fe_dg, 1); diff --git a/tests/unit_tests/operator_tests/sum_factorization_test.cpp b/tests/unit_tests/operator_tests/sum_factorization_test.cpp index cc395beb2..47bdf085c 100644 --- a/tests/unit_tests/operator_tests/sum_factorization_test.cpp +++ b/tests/unit_tests/operator_tests/sum_factorization_test.cpp @@ -111,8 +111,8 @@ int main (int argc, char * argv[]) std::array time_diff_mass; std::array time_diff_mass_sum; for(unsigned int poly_degree=poly_min; poly_degree mass_matrix(nstate, poly_degree, 1); - PHiLiP::OPERATOR::basis_functions basis(nstate, poly_degree, 1); + PHiLiP::OPERATOR::local_mass mass_matrix(nstate, poly_degree, 1); + PHiLiP::OPERATOR::basis_functions basis(nstate, poly_degree, 1); dealii::QGauss<1> quad1D (poly_degree+1); const dealii::FE_DGQ<1> fe_dg(poly_degree); const dealii::FESystem<1,1> fe_system(fe_dg, nstate); diff --git a/tests/unit_tests/operator_tests/surface_GCL_Superparametric_test.cpp b/tests/unit_tests/operator_tests/surface_GCL_Superparametric_test.cpp index dfc37bd52..7a9cf18f0 100644 --- a/tests/unit_tests/operator_tests/surface_GCL_Superparametric_test.cpp +++ b/tests/unit_tests/operator_tests/surface_GCL_Superparametric_test.cpp @@ -294,7 +294,7 @@ int main (int argc, char * argv[]) dealii::QGauss<1> flux_quad(poly_degree +1); dealii::QGauss<0> flux_quad_face(poly_degree +1); - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(fe_sys_grid, grid_quad); mapping_basis.build_1D_shape_functions_at_flux_nodes(fe_sys_grid, flux_quad, flux_quad_face); diff --git a/tests/unit_tests/operator_tests/surface_GCL_test.cpp b/tests/unit_tests/operator_tests/surface_GCL_test.cpp index 65e4d8dc0..a9e966ed2 100644 --- a/tests/unit_tests/operator_tests/surface_GCL_test.cpp +++ b/tests/unit_tests/operator_tests/surface_GCL_test.cpp @@ -298,7 +298,7 @@ int main (int argc, char * argv[]) dealii::QGauss<1> flux_quad(poly_degree +1); dealii::QGauss<0> flux_quad_face(poly_degree +1); - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(fe_sys_grid, grid_quad); mapping_basis.build_1D_shape_functions_at_flux_nodes(fe_sys_grid, flux_quad, flux_quad_face); diff --git a/tests/unit_tests/operator_tests/surface_conforming_test.cpp b/tests/unit_tests/operator_tests/surface_conforming_test.cpp index ee25e07e2..5c4105711 100644 --- a/tests/unit_tests/operator_tests/surface_conforming_test.cpp +++ b/tests/unit_tests/operator_tests/surface_conforming_test.cpp @@ -291,7 +291,7 @@ int main (int argc, char * argv[]) dealii::QGauss<1> flux_quad(poly_degree +1); dealii::QGauss<0> flux_quad_face(poly_degree +1); - PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); + PHiLiP::OPERATOR::mapping_shape_functions mapping_basis(nstate,poly_degree,grid_degree); mapping_basis.build_1D_shape_functions_at_grid_nodes(fe_sys_grid, grid_quad); mapping_basis.build_1D_shape_functions_at_flux_nodes(fe_sys_grid, flux_quad, flux_quad_face); diff --git a/tests/unit_tests/operator_tests/surface_oper_test.cpp b/tests/unit_tests/operator_tests/surface_oper_test.cpp index 0765bf207..49ef22ebe 100644 --- a/tests/unit_tests/operator_tests/surface_oper_test.cpp +++ b/tests/unit_tests/operator_tests/surface_oper_test.cpp @@ -112,7 +112,7 @@ int main (int argc, char * argv[]) const unsigned int n_dofs_1D = nstate * (poly_degree+1); // build stiffness 1D - PHiLiP::OPERATOR::local_basis_stiffness stiffness(nstate, poly_degree, 1); + PHiLiP::OPERATOR::local_basis_stiffness stiffness(nstate, poly_degree, 1); dealii::QGauss<1> quad1D (poly_degree+1); const dealii::FE_DGQ<1> fe_dg(poly_degree); const dealii::FESystem<1,1> fe_system(fe_dg, nstate); @@ -126,9 +126,9 @@ int main (int argc, char * argv[]) // compute surface integral dealii::FullMatrix face_int_parts(n_dofs_1D); dealii::QGauss<0> face_quad1D (poly_degree+1); - PHiLiP::OPERATOR::face_integral_basis face_int(nstate, poly_degree, 1); + PHiLiP::OPERATOR::face_integral_basis face_int(nstate, poly_degree, 1); face_int.build_1D_surface_operator(fe_system, face_quad1D); - PHiLiP::OPERATOR::basis_functions face_basis(nstate, poly_degree, 1); + PHiLiP::OPERATOR::basis_functions face_basis(nstate, poly_degree, 1); face_basis.build_1D_surface_operator(fe_system, face_quad1D); const unsigned int n_face_quad_pts = face_quad1D.size(); @@ -158,7 +158,7 @@ int main (int argc, char * argv[]) } } - PHiLiP::OPERATOR::lifting_operator lifting(nstate, poly_degree, 1); + PHiLiP::OPERATOR::lifting_operator lifting(nstate, poly_degree, 1); lifting.build_1D_volume_operator(fe_system, quad1D); lifting.build_1D_surface_operator(fe_system, face_quad1D); std::array,2> surface_int_from_lift; @@ -174,7 +174,7 @@ int main (int argc, char * argv[]) } } } - PHiLiP::OPERATOR::lifting_operator_FR lifting_FR(nstate, poly_degree, 1, FR_enum::cPlus); + PHiLiP::OPERATOR::lifting_operator_FR lifting_FR(nstate, poly_degree, 1, FR_enum::cPlus); lifting_FR.build_1D_volume_operator(fe_system, quad1D); lifting_FR.build_1D_surface_operator(fe_system, face_quad1D); std::array,2> surface_int_from_lift_FR; diff --git a/tests/unit_tests/operator_tests/tensor_product_test.cpp b/tests/unit_tests/operator_tests/tensor_product_test.cpp index 40b43dd92..f28942563 100644 --- a/tests/unit_tests/operator_tests/tensor_product_test.cpp +++ b/tests/unit_tests/operator_tests/tensor_product_test.cpp @@ -91,7 +91,7 @@ int main (int argc, char * argv[]) dealii::QGauss<1> quad_1D (poly_degree+1); const dealii::FE_DGQ<1> fe(poly_degree); const dealii::FESystem<1,1> fe_system(fe, nstate); - PHiLiP::OPERATOR::basis_functions basis_1D(nstate, poly_degree, 1); + PHiLiP::OPERATOR::basis_functions basis_1D(nstate, poly_degree, 1); basis_1D.build_1D_volume_operator(fe, quad_1D); basis_1D.build_1D_gradient_operator(fe, quad_1D); dealii::FullMatrix basis_dim(n_dofs); diff --git a/tests/unit_tests/operator_tests/volume_operators_test.cpp b/tests/unit_tests/operator_tests/volume_operators_test.cpp index 094187a6b..8dc535fd4 100644 --- a/tests/unit_tests/operator_tests/volume_operators_test.cpp +++ b/tests/unit_tests/operator_tests/volume_operators_test.cpp @@ -112,7 +112,7 @@ int main (int argc, char * argv[]) const dealii::FE_DGQ fe_dim(poly_degree); const dealii::FESystem fe_system_dim(fe_dim, nstate); - PHiLiP::OPERATOR::local_mass mass_matrix(nstate, poly_degree, 1); + PHiLiP::OPERATOR::local_mass mass_matrix(nstate, poly_degree, 1); dealii::QGauss<1> quad1D (poly_degree+1); const dealii::FE_DGQ<1> fe_dg(poly_degree); const dealii::FESystem<1,1> fe_system(fe_dg, nstate); @@ -122,7 +122,7 @@ int main (int argc, char * argv[]) mass_matrix.oneD_vol_operator, mass_matrix.oneD_vol_operator,mass_matrix.oneD_vol_operator); - PHiLiP::OPERATOR::local_Flux_Reconstruction_operator local_FR(nstate, poly_degree, 1, FR_enum::cHU); + PHiLiP::OPERATOR::local_Flux_Reconstruction_operator local_FR(nstate, poly_degree, 1, FR_enum::cHU); local_FR.build_1D_volume_operator(fe_system,quad1D); dealii::FullMatrix FR_dim(n_dofs); FR_dim = local_FR.build_dim_Flux_Reconstruction_operator(mass_matrix.oneD_vol_operator, nstate, n_dofs);