[Dune] [Dune-Commit] dune-grid-howto r391 - trunk

[Oliver Sander]

Am 14.06.2012 16:48, schrieb mnolte at dune-project.org:
> Author: mnolte
> Date: 2012-06-14 16:48:47 +0200 (Thu, 14 Jun 2012)
> New Revision: 391
>
> Modified:
>     trunk/adaptiveintegration.cc
>     trunk/elementdata.hh
>     trunk/finiteelements.cc
>     trunk/vertexdata.hh
>     trunk/vtkout.hh
> Log:
> change from VTKOptions::... to VTK::...
>
> I guess this patch belongs into the release, too. However, I leave the
> decision up to the release managers.

The release manager doesn't know the vtk code well enough to decide.
What are the consequences of this patch?  Is it just to avoid deprecated
stuff?
--
Oliver

>
>
> Modified: trunk/adaptiveintegration.cc
> ===================================================================
> --- trunk/adaptiveintegration.cc	2012-06-06 11:01:59 UTC (rev 390)
> +++ trunk/adaptiveintegration.cc	2012-06-14 14:48:47 UTC (rev 391)
> @@ -105,7 +105,7 @@
>
>     // write grid in VTK format
>     Dune::VTKWriter<typename Grid::LeafGridView>  vtkwriter(gridView);
> -  vtkwriter.write("adaptivegrid",Dune::VTKOptions::binaryappended);
> +  vtkwriter.write( "adaptivegrid", Dune::VTK::appendedraw );
>   }
>
>   //! supply functor
>
> Modified: trunk/elementdata.hh
> ===================================================================
> --- trunk/elementdata.hh	2012-06-06 11:01:59 UTC (rev 390)
> +++ trunk/elementdata.hh	2012-06-14 14:48:47 UTC (rev 391)
> @@ -60,7 +60,7 @@
>     // Dune::LeafP0Function<G,double>  cc(grid,c);
>     Dune::VTKWriter<typename G::LeafGridView>  vtkwriter(gridView); /*@\label{edh:vtk0}@*/
>     vtkwriter.addCellData(c,"data");
> -  vtkwriter.write("elementdata",Dune::VTKOptions::binaryappended); /*@\label{edh:vtk1}@*/
> +  vtkwriter.write( "elementdata", Dune::VTK::appendedraw ); /*@\label{edh:vtk1}@*/
>
>     // online visualization with Grape
>   #if HAVE_GRAPE                                         /*@\label{edh:grape0}@*/
>
> Modified: trunk/finiteelements.cc
> ===================================================================
> --- trunk/finiteelements.cc	2012-06-06 11:01:59 UTC (rev 390)
> +++ trunk/finiteelements.cc	2012-06-14 14:48:47 UTC (rev 391)
> @@ -304,7 +304,7 @@
>       std::cout<<  "visualizing..."<<  "\n";
>       Dune::VTKWriter<GridType::LeafGridView>  vtkwriter(grid.leafView());
>       vtkwriter.addVertexData(p1.u, "u");
> -    vtkwriter.write("fem2d", Dune::VTKOptions::binaryappended);
> +    vtkwriter.write("fem2d", Dune::VTK::appendedraw);
>   #else
>       std::cout<<  "for solving and visualizing dune-istl is necessary."<<  "\n";
>   #endif // HAVE_DUNE_ISTL
>
> Modified: trunk/vertexdata.hh
> ===================================================================
> --- trunk/vertexdata.hh	2012-06-06 11:01:59 UTC (rev 390)
> +++ trunk/vertexdata.hh	2012-06-14 14:48:47 UTC (rev 391)
> @@ -53,7 +53,7 @@
>     //   Dune::LeafP1Function<G,double>  cc(grid,c);
>     Dune::VTKWriter<typename G::LeafGridView>  vtkwriter(grid.leafView());
>     vtkwriter.addVertexData(c,"data");
> -  vtkwriter.write("vertexdata",Dune::VTKOptions::binaryappended);
> +  vtkwriter.write( "vertexdata", Dune::VTK::appendedraw );
>
>     // online visualization with Grape
>   #if HAVE_GRAPE
>
> Modified: trunk/vtkout.hh
> ===================================================================
> --- trunk/vtkout.hh	2012-06-06 11:01:59 UTC (rev 390)
> +++ trunk/vtkout.hh	2012-06-14 14:48:47 UTC (rev 391)
> @@ -13,7 +13,7 @@
>     sprintf(fname,"%s-%05d",name,k);
>     sprintf(sername,"%s.series",name);
>     vtkwriter.addCellData(c,"celldata");
> -  vtkwriter.write(fname,Dune::VTKOptions::ascii);
> +  vtkwriter.write( fname, Dune::VTK::ascii );
>
>     if ( rank == 0)
>     {
>
>
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit