From eb9b0a7803b02591bd81a245f8bfb099465802ed Mon Sep 17 00:00:00 2001 From: benkirk Date: Wed, 23 Oct 2002 14:25:30 +0000 Subject: [PATCH] fixed the Tecplot output support to be compatible with the Table class. Also switched to vectors instead of pointers in the TecplotMacros class git-svn-id: https://svn.dealii.org/trunk@6719 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/data_out_base.cc | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index 8a192e48bb..186c6bee0c 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -2686,8 +2686,8 @@ namespace ~TecplotMacros(); float & nd(const unsigned int i, const unsigned int j); int & cd(const unsigned int i, const unsigned int j); - float* nodalData; - int* connData; + std::vector nodalData; + std::vector connData; private: unsigned int n_nodes; unsigned int n_vars; @@ -2697,7 +2697,7 @@ namespace } - +inline TecplotMacros::TecplotMacros(const unsigned int n_nodes, const unsigned int n_vars, const unsigned int n_cells, @@ -2707,16 +2707,15 @@ TecplotMacros::TecplotMacros(const unsigned int n_nodes, n_cells(n_cells), n_vert(n_vert) { - nodalData = new float[n_nodes*n_vars]; - connData = new int[n_cells*n_vert]; + nodalData.resize(n_nodes*n_vars); + connData.resize(n_cells*n_vert); }; +inline TecplotMacros::~TecplotMacros() { - delete [] nodalData; - delete [] connData; }; @@ -2896,7 +2895,7 @@ void DataOutBase::write_tecplot_binary (const std::vector > Threads::ThreadManager thread_manager; void (*fun_ptr) (const std::vector > &, - Table<2,dim> &) + Table<2,double> &) = &DataOutBase::template write_gmv_reorder_data_vectors; Threads::spawn (thread_manager, Threads::encapsulate (fun_ptr) @@ -3099,12 +3098,12 @@ void DataOutBase::write_tecplot_binary (const std::vector > int total = (vars_per_node*num_nodes); ierr = TECDAT (&total, - tm.nodalData, + &tm.nodalData[0], &is_double); Assert (ierr == 0, ExcTecplotAPIError()); - ierr = TECNOD (tm.connData); + ierr = TECNOD (&tm.connData[0]); Assert (ierr == 0, ExcTecplotAPIError()); -- 2.39.5