Changeset 1a191e4 in sasview for sansmodels/src


Ignore:
Timestamp:
Dec 8, 2011 4:04:43 PM (13 years ago)
Author:
Mathieu Doucet <doucetm@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
0438933
Parents:
8969521
Message:

Re #7 testing openmp on one model

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/c_models/CCylinderModel.cpp

    r2605da22 r1a191e4  
    177177                return NULL; 
    178178        } 
     179#pragma omp parallel for 
    179180         for (int i = 0; i < q->dimensions[0]; i++){ 
    180181      double q_value  = *(double *)(q->data + i*q->strides[0]); 
     
    283284                if (PyArray_Check(pars)) { 
    284285                        return evaluateOneDim(self->model, (PyArrayObject*)pars);  
    285                     } 
    286                 }else{ 
     286                } 
     287            }else{ 
    287288                    PyErr_SetString(CCylinderModelError,  
    288289                   "CCylinderModel.evalDistribution expect numpy array of one dimension."); 
    289290                return NULL; 
    290                 } 
     291            } 
    291292    }else if( PyList_Check(pars)==1) { 
    292293        // Length of list should be 2 for I(qx,qy) 
Note: See TracChangeset for help on using the changeset viewer.