virtual void assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
virtual void assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
virtual void assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
protected:
const bool use_coefficient;
const Function<dim> &right_hand_side;
void PoissonEquation<2>::assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<2> &fe_values,
- const Triangulation<2>::cell_iterator &) const {
+ const DoFHandler<2>::cell_iterator &) const {
for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
{
const double c = (use_coefficient ?
template <int dim>
void PoissonEquation<dim>::assemble (dFMatrix &,
const FEValues<dim> &,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
template <int dim>
void PoissonEquation<dim>::assemble (dVector &,
const FEValues<dim> &,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
lib-h-files = $(wildcard ../../include/*/*.h)
# list of libraries needed to link with
-libs = ./Obj.a -ldeal_II_2d -llac -lbase
-libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g
+libs = ./Obj.a -ldeal_II_3d -llac -lbase
+libs.g = ./Obj.g.a -ldeal_II_3d.g -llac.g -lbase.g
# check whether we use debug mode or not
void PoissonEquation<1>::assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<1> &fe_values,
- const Triangulation<1>::cell_iterator &) const {
+ const DoFHandler<1>::cell_iterator &) const {
for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
for (unsigned int i=0; i<fe_values.total_dofs; ++i)
{
-#if deal_II_dimension == 2
+//#if deal_II_dimension >= 2
-template <>
-void PoissonEquation<2>::assemble (dFMatrix &cell_matrix,
- dVector &rhs,
- const FEValues<2> &fe_values,
- const Triangulation<2>::cell_iterator &) const {
- const vector<vector<Tensor<1,2> > >&gradients = fe_values.get_shape_grads ();
+template <int dim>
+void PoissonEquation<dim>::assemble (dFMatrix &cell_matrix,
+ dVector &rhs,
+ const FEValues<dim> &fe_values,
+ const DoFHandler<dim>::cell_iterator &) const {
+ const vector<vector<Tensor<1,dim> > >&gradients = fe_values.get_shape_grads ();
const dFMatrix &values = fe_values.get_shape_values ();
vector<double> rhs_values (fe_values.n_quadrature_points);
const vector<double> &weights = fe_values.get_JxW_values ();
};
};
-#endif
+//#endif
template <int dim>
void PoissonEquation<dim>::assemble (dFMatrix &,
const FEValues<dim> &,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
template <int dim>
void PoissonEquation<dim>::assemble (dVector &,
const FEValues<dim> &,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
-template class PoissonEquation<2>;
+template class PoissonEquation<3>;
return 1;
};
- PoissonProblem<2> poisson;
+ PoissonProblem<3> poisson;
MultipleParameterLoop input_data;
poisson.declare_parameters(input_data);
virtual void assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
virtual void assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
virtual void assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
protected:
const Function<dim> &right_hand_side;
};
set Test run = { zoom in | ball | curved line | random | jump | L-region}
-set Global refinement = {{ 2 | 5 | 6 | 0 | 2 | 5 }}
+set Global refinement = {{ 1 | 3 | 3 | 0 | 3 | 3 }} #{{ 2 | 3 | 3 | 1 | 3 | 3 }}
set Right hand side = {{ zero | zero | trigpoly | constant | zero | zero }}
set Boundary values = {{ sine | sine | zero | zero | jump | sine }}
-set Output file = gnuplot.{{ zoom_in | ball | curved_line | random | jump | L-region }}
+set Output file = results/{{ zoom_in | ball | curved_line | random | jump | L-region }}.inp
virtual void assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
/**
* Virtual function which only assembles
*/
virtual void assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
/**
* Virtual function which only assembles
*/
virtual void assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
/**
* Return number of equations for this
virtual void assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const typename Triangulation<dim>::cell_iterator &) const;
+ const typename DoFHandler<dim>::cell_iterator &) const;
/**
* Construct the cell matrix for this cell.
*/
virtual void assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const typename Triangulation<dim>::cell_iterator &) const;
+ const typename DoFHandler<dim>::cell_iterator &) const;
/**
* Only construct the right hand side
*/
virtual void assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const typename Triangulation<dim>::cell_iterator &) const;
+ const typename DoFHandler<dim>::cell_iterator &) const;
/**
* Exception
virtual void assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const typename Triangulation<dim>::cell_iterator &) const;
+ const typename DoFHandler<dim>::cell_iterator &) const;
/**
* Construct the cell matrix for this cell.
*/
virtual void assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const typename Triangulation<dim>::cell_iterator &) const;
+ const typename DoFHandler<dim>::cell_iterator &) const;
/**
* Only construct the right hand side
*/
virtual void assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const typename Triangulation<dim>::cell_iterator &) const;
+ const typename DoFHandler<dim>::cell_iterator &) const;
/**
* Exception
void Equation<dim>::assemble (dFMatrix &,
dVector &,
const FEValues<dim> &,
- const typename Triangulation<dim>::cell_iterator &) const {
+ const typename DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
template <int dim>
void Equation<dim>::assemble (dFMatrix &,
const FEValues<dim> &,
- const typename Triangulation<dim>::cell_iterator &) const {
+ const typename DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
template <int dim>
void Equation<dim>::assemble (dVector &,
const FEValues<dim> &,
- const typename Triangulation<dim>::cell_iterator &) const {
+ const typename DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
template <int dim>
void MassMatrix<dim>::assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const typename Triangulation<dim>::cell_iterator &) const {
+ const typename DoFHandler<dim>::cell_iterator &) const {
const unsigned int total_dofs = fe_values.total_dofs,
n_q_points = fe_values.n_quadrature_points;
void MassMatrix<dim>::assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (right_hand_side != 0, ExcNoRHSSelected());
const unsigned int total_dofs = fe_values.total_dofs,
template <int dim>
void MassMatrix<dim>::assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (right_hand_side != 0, ExcNoRHSSelected());
const unsigned int total_dofs = fe_values.total_dofs,
void LaplaceMatrix<dim>::assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (right_hand_side != 0, ExcNoRHSSelected());
const unsigned int total_dofs = fe_values.total_dofs,
template <int dim>
void LaplaceMatrix<dim>::assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
const unsigned int total_dofs = fe_values.total_dofs,
n_q_points = fe_values.n_quadrature_points;
template <int dim>
void LaplaceMatrix<dim>::assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (right_hand_side != 0, ExcNoRHSSelected());
const unsigned int total_dofs = fe_values.total_dofs,
virtual void assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
virtual void assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
virtual void assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
protected:
const bool use_coefficient;
const Function<dim> &right_hand_side;
void PoissonEquation<2>::assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<2> &fe_values,
- const Triangulation<2>::cell_iterator &) const {
+ const DoFHandler<2>::cell_iterator &) const {
for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
{
const double c = (use_coefficient ?
template <int dim>
void PoissonEquation<dim>::assemble (dFMatrix &,
const FEValues<dim> &,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
template <int dim>
void PoissonEquation<dim>::assemble (dVector &,
const FEValues<dim> &,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
lib-h-files = $(wildcard ../../include/*/*.h)
# list of libraries needed to link with
-libs = ./Obj.a -ldeal_II_2d -llac -lbase
-libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g
+libs = ./Obj.a -ldeal_II_3d -llac -lbase
+libs.g = ./Obj.g.a -ldeal_II_3d.g -llac.g -lbase.g
# check whether we use debug mode or not
void PoissonEquation<1>::assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<1> &fe_values,
- const Triangulation<1>::cell_iterator &) const {
+ const DoFHandler<1>::cell_iterator &) const {
for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
for (unsigned int i=0; i<fe_values.total_dofs; ++i)
{
-#if deal_II_dimension == 2
+//#if deal_II_dimension >= 2
-template <>
-void PoissonEquation<2>::assemble (dFMatrix &cell_matrix,
- dVector &rhs,
- const FEValues<2> &fe_values,
- const Triangulation<2>::cell_iterator &) const {
- const vector<vector<Tensor<1,2> > >&gradients = fe_values.get_shape_grads ();
+template <int dim>
+void PoissonEquation<dim>::assemble (dFMatrix &cell_matrix,
+ dVector &rhs,
+ const FEValues<dim> &fe_values,
+ const DoFHandler<dim>::cell_iterator &) const {
+ const vector<vector<Tensor<1,dim> > >&gradients = fe_values.get_shape_grads ();
const dFMatrix &values = fe_values.get_shape_values ();
vector<double> rhs_values (fe_values.n_quadrature_points);
const vector<double> &weights = fe_values.get_JxW_values ();
};
};
-#endif
+//#endif
template <int dim>
void PoissonEquation<dim>::assemble (dFMatrix &,
const FEValues<dim> &,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
template <int dim>
void PoissonEquation<dim>::assemble (dVector &,
const FEValues<dim> &,
- const Triangulation<dim>::cell_iterator &) const {
+ const DoFHandler<dim>::cell_iterator &) const {
Assert (false, ExcPureVirtualFunctionCalled());
};
-template class PoissonEquation<2>;
+template class PoissonEquation<3>;
return 1;
};
- PoissonProblem<2> poisson;
+ PoissonProblem<3> poisson;
MultipleParameterLoop input_data;
poisson.declare_parameters(input_data);
virtual void assemble (dFMatrix &cell_matrix,
dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
virtual void assemble (dFMatrix &cell_matrix,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
virtual void assemble (dVector &rhs,
const FEValues<dim> &fe_values,
- const Triangulation<dim>::cell_iterator &cell) const;
+ const DoFHandler<dim>::cell_iterator &cell) const;
protected:
const Function<dim> &right_hand_side;
};
set Test run = { zoom in | ball | curved line | random | jump | L-region}
-set Global refinement = {{ 2 | 5 | 6 | 0 | 2 | 5 }}
+set Global refinement = {{ 1 | 3 | 3 | 0 | 3 | 3 }} #{{ 2 | 3 | 3 | 1 | 3 | 3 }}
set Right hand side = {{ zero | zero | trigpoly | constant | zero | zero }}
set Boundary values = {{ sine | sine | zero | zero | jump | sine }}
-set Output file = gnuplot.{{ zoom_in | ball | curved_line | random | jump | L-region }}
+set Output file = results/{{ zoom_in | ball | curved_line | random | jump | L-region }}.inp