From: kanschat Date: Fri, 12 Mar 2010 22:39:47 +0000 (+0000) Subject: step 38 is now step 12 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90934fcde5b47af96f9fcc9719604f2beb6b4791;p=dealii-svn.git step 38 is now step 12 git-svn-id: https://svn.dealii.org/trunk@20817 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/numerics/mesh_worker_info.inst.in b/deal.II/deal.II/source/numerics/mesh_worker_info.inst.in deleted file mode 100644 index d79ce7b9be..0000000000 --- a/deal.II/deal.II/source/numerics/mesh_worker_info.inst.in +++ /dev/null @@ -1,33 +0,0 @@ -//--------------------------------------------------------------------------- -// $Id: fe_field_function.inst.in 19046 2009-07-08 19:30:23Z bangerth $ -// -// Copyright (C) 2009, 2010 by the deal.II authors -// -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//--------------------------------------------------------------------------- - - -for (FEV : FEVALUES_BASES) -{ -} - -for (FEV : FEVALUES_BASES) -{ -// for (TYPE : DERIVATIVE_TENSORS) -// { -// template void IntegrationInfo::fill_local_data( -// std::vector > >&, bool) const; -// template void IntegrationInfo::fill_local_data( -// std::vector > >&, VectorSelector&, bool) const; -// } -// for (VECTOR : SERIAL_VECTORS) -// { -// } - } - - - diff --git a/deal.II/doc/doxygen/tutorial/steps.pl b/deal.II/doc/doxygen/tutorial/steps.pl index e08b71fc82..d621e0662e 100644 --- a/deal.II/doc/doxygen/tutorial/steps.pl +++ b/deal.II/doc/doxygen/tutorial/steps.pl @@ -59,8 +59,6 @@ my %attribute = ( 23 => $timeapplication, 24 => $timeapplication, 25 => $timeapplication, - - 38 => $unfinished ); # Print a preamble setting common attributes @@ -118,8 +116,6 @@ Step06 -> Step16; Step16 -> Step37; Step05 -> Step37; -Step12 -> Step38; -Step38 -> Step12; Step12 -> Step33; Step06 -> Step13; diff --git a/deal.II/doc/doxygen/tutorial/steps.png b/deal.II/doc/doxygen/tutorial/steps.png index ecdd3b0b98..544f010952 100644 Binary files a/deal.II/doc/doxygen/tutorial/steps.png and b/deal.II/doc/doxygen/tutorial/steps.png differ diff --git a/deal.II/examples/step-38/Makefile b/deal.II/examples/step-12/Makefile similarity index 100% rename from deal.II/examples/step-38/Makefile rename to deal.II/examples/step-12/Makefile diff --git a/deal.II/examples/step-38/doc/intro.dox b/deal.II/examples/step-12/doc/intro.dox similarity index 100% rename from deal.II/examples/step-38/doc/intro.dox rename to deal.II/examples/step-12/doc/intro.dox diff --git a/deal.II/examples/step-38/doc/results.dox b/deal.II/examples/step-12/doc/results.dox similarity index 100% rename from deal.II/examples/step-38/doc/results.dox rename to deal.II/examples/step-12/doc/results.dox diff --git a/deal.II/examples/step-38/doc/step-12.3d-solution.png b/deal.II/examples/step-12/doc/step-12.3d-solution.png similarity index 100% rename from deal.II/examples/step-38/doc/step-12.3d-solution.png rename to deal.II/examples/step-12/doc/step-12.3d-solution.png diff --git a/deal.II/examples/step-38/doc/step-12.grid-5.png b/deal.II/examples/step-12/doc/step-12.grid-5.png similarity index 100% rename from deal.II/examples/step-38/doc/step-12.grid-5.png rename to deal.II/examples/step-12/doc/step-12.grid-5.png diff --git a/deal.II/examples/step-38/doc/step-12.sol-0.png b/deal.II/examples/step-12/doc/step-12.sol-0.png similarity index 100% rename from deal.II/examples/step-38/doc/step-12.sol-0.png rename to deal.II/examples/step-12/doc/step-12.sol-0.png diff --git a/deal.II/examples/step-38/doc/step-12.sol-2.png b/deal.II/examples/step-12/doc/step-12.sol-2.png similarity index 100% rename from deal.II/examples/step-38/doc/step-12.sol-2.png rename to deal.II/examples/step-12/doc/step-12.sol-2.png diff --git a/deal.II/examples/step-38/doc/step-12.sol-5-3d.png b/deal.II/examples/step-12/doc/step-12.sol-5-3d.png similarity index 100% rename from deal.II/examples/step-38/doc/step-12.sol-5-3d.png rename to deal.II/examples/step-12/doc/step-12.sol-5-3d.png diff --git a/deal.II/examples/step-38/doc/step-12.sol-5.png b/deal.II/examples/step-12/doc/step-12.sol-5.png similarity index 100% rename from deal.II/examples/step-38/doc/step-12.sol-5.png rename to deal.II/examples/step-12/doc/step-12.sol-5.png diff --git a/deal.II/examples/step-38/step-38.cc b/deal.II/examples/step-12/step-12.cc similarity index 99% rename from deal.II/examples/step-38/step-38.cc rename to deal.II/examples/step-12/step-12.cc index e672ba2a29..8eff89bddf 100644 --- a/deal.II/examples/step-38/step-38.cc +++ b/deal.II/examples/step-12/step-12.cc @@ -463,7 +463,7 @@ void Step12::integrate_cell_term (DoFInfo& dinfo, CellInfo& info) template void Step12::integrate_boundary_term (DoFInfo& dinfo, FaceInfo& info) { - const FEValuesBase& fe_v = info.fe_values(); + const FEFaceValuesBase& fe_v = info.fe_values(); FullMatrix& local_matrix = dinfo.matrix(0).matrix; Vector& local_vector = dinfo.vector(0).block(0); @@ -514,12 +514,12 @@ void Step12::integrate_face_term (DoFInfo& dinfo1, DoFInfo& dinfo2, // etc., we use the // FEFaceValuesBase object of the // first argument. - const FEValuesBase& fe_v = info1.fe_values(); + const FEFaceValuesBase& fe_v = info1.fe_values(); // For additional shape functions, // we have to ask the neighbors // FEFaceValuesBase. - const FEValuesBase& fe_v_neighbor = info2.fe_values(); + const FEFaceValuesBase& fe_v_neighbor = info2.fe_values(); // Then we get references to the // four local matrices. The letters