← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to intern/elbeem/intern/solver_class.h

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/elbeem/intern/solver_class.h
21
21
#include "ntl_ray.h"
22
22
#include <stdio.h>
23
23
 
 
24
#ifdef WITH_CXX_GUARDEDALLOC
 
25
#  include "MEM_guardedalloc.h"
 
26
#endif
 
27
 
24
28
#if PARALLEL==1
25
29
#include <omp.h>
26
30
#endif // PARALLEL=1
145
149
                        if( x==cid->x && y==cid->y && z==cid->z && level==cid->level ) return true;
146
150
                        return false;
147
151
                }
 
152
 
 
153
private:
 
154
#ifdef WITH_CXX_GUARDEDALLOC
 
155
        MEM_CXX_CLASS_ALLOC_FUNCS("ELBEEM:UniformFsgrCellIdentifier")
 
156
#endif
148
157
};
149
158
 
150
159
//! information needed for each level in the simulation
193
202
        int lSizex, lSizey, lSizez;
194
203
        int lOffsx, lOffsy, lOffsz;
195
204
 
 
205
private:
 
206
#ifdef WITH_CXX_GUARDEDALLOC
 
207
        MEM_CXX_CLASS_ALLOC_FUNCS("ELBEEM:FsgrLevelData")
 
208
#endif
196
209
};
197
210
 
198
211
 
740
753
                static LbmFloat lesCoeffOffdiag[ 2 ][ 9 ];
741
754
 
742
755
#               endif  // LBMDIM==2
 
756
 
 
757
private:
 
758
#ifdef WITH_CXX_GUARDEDALLOC
 
759
        MEM_CXX_CLASS_ALLOC_FUNCS("ELBEEM:LbmFsgrSolver")
 
760
#endif
743
761
};
744
762
 
745
763
#undef STCON