← 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_interface.cpp

  • 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_interface.cpp
65
65
        mDumpRawText(false),
66
66
        mDumpRawBinary(false),
67
67
        mDumpRawBinaryZip(true)
 
68
#if PARALLEL==1
 
69
        , mNumOMPThreads(1)
 
70
#endif  // PARALLEL==1
68
71
{
69
72
#if ELBEEM_PLUGIN==1
70
73
        if(gDebugLevel<=1) setSilent(true);
670
673
        mMarkedCells.clear();
671
674
}
672
675
 
 
676
#if PARALLEL==1
 
677
void LbmSolverInterface::setNumOMPThreads(int num_threads) {
 
678
        mNumOMPThreads = num_threads;
 
679
}
 
680
#endif  // PARALLEL==1
 
681
 
673
682
/*******************************************************************************/
674
683
/*! string helper functions */
675
684
/*******************************************************************************/