← Back to branch summary

~ubuntu-branches/debian/squeeze/gmsh/squeeze

« back to all changes in this revision

Viewing changes to Post/PViewDataList.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Christophe Prud'homme, Christophe Prud'homme
  • Date: 2009-07-13 15:49:21 UTC
  • mfrom: (7.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090713154921-zer07j8wixwa07ig
Tags: 2.3.1.dfsg-4
http://bugs.debian.org/529972
[Christophe Prud'homme]
* Bug fix: "gmsh with cgns write support", thanks to Oliver Borm
  (Closes: #529972).
* debian/rules: make sure that Gmsh is built with occ support on all
  platforms thanks to Denis Barbier (#536435).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Post/PViewDataList.cpp
9
9
#include "GmshMessage.h"
10
10
#include "Context.h"
11
11
 
12
 
extern Context_T CTX;
13
 
 
14
12
PViewDataList::PViewDataList(bool allocate, int numalloc)
15
13
  : PViewData(), DataSize(sizeof(double)), NbTimeStep(0), 
16
14
    Min(VAL_INF), Max(-VAL_INF), Time(0),
118
116
      _index[i] += nb[j];
119
117
  }
120
118
 
121
 
  if(CTX.post.smooth) smooth();
 
119
  if(CTX::instance()->post.smooth) smooth();
122
120
 
123
121
  return PViewData::finalize();
124
122
}
199
197
  int nbval = nbcomp * nbnod;
200
198
 
201
199
  if(haveInterpolationMatrices()){
202
 
    std::vector<Double_Matrix*> im;
 
200
    std::vector<gmshMatrix<double>*> im;
203
201
    if(getInterpolationMatrices(nbedg, im) == 4)
204
202
      nbnod = im[2]->size1();
205
203
    nbval = nbcomp * im[0]->size1();
250
248
                             List_T *list, int nblist)
251
249
{
252
250
  if(haveInterpolationMatrices()){
253
 
    std::vector<Double_Matrix*> im;
 
251
    std::vector<gmshMatrix<double>*> im;
254
252
    if(getInterpolationMatrices(nbedg, im) == 4)
255
253
      nbnod = im[2]->size1();
256
254
  }
627
625
void PViewDataList::smooth()
628
626
{
629
627
  double old_eps = xyzv::eps;
630
 
  xyzv::eps = CTX.lc * 1.e-8;
 
628
  xyzv::eps = CTX::instance()->lc * 1.e-8;
631
629
  smooth_data data;
632
630
 
633
631
  List_T *list = 0;
667
665
 
668
666
    // copy interpolation from first merged dataset, if any
669
667
    if(!i){
670
 
      for(std::map<int, std::vector<Double_Matrix*> >::iterator it = 
 
668
      for(std::map<int, std::vector<gmshMatrix<double>*> >::iterator it = 
671
669
            l->_interpolation.begin(); it != l->_interpolation.end(); it++)
672
670
        for(unsigned int i = 0; i < it->second.size(); i++)
673
 
          _interpolation[it->first].push_back(new Double_Matrix(*it->second[i]));
 
671
          _interpolation[it->first].push_back(new gmshMatrix<double>(*it->second[i]));
674
672
    }
675
673
    
676
674
    // merge elememts
795
793
  }
796
794
  NbT2 = data[0]->NbT2;
797
795
  NbT3 = data[0]->NbT3;
798
 
  for(std::map<int, std::vector<Double_Matrix*> >::iterator it = 
 
796
  for(std::map<int, std::vector<gmshMatrix<double>*> >::iterator it = 
799
797
        data[0]->_interpolation.begin(); it != data[0]->_interpolation.end(); it++)
800
798
    for(unsigned int i = 0; i < it->second.size(); i++)
801
 
      _interpolation[it->first].push_back(new Double_Matrix(*it->second[i]));
 
799
      _interpolation[it->first].push_back(new gmshMatrix<double>(*it->second[i]));
802
800
  
803
801
  // merge values for all element types
804
802
  for(int i = 0; i < 24; i++){