Changeset 1a191e4 in sasview for sansmodels/src/sans/models/c_models/CCylinderModel.cpp

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:

• sansmodels/src/sans/models/c_models/CCylinderModel.cpp (modified) (2 diffs)

sansmodels/src/sans/models/c_models/CCylinderModel.cpp

@@ -177 +177 @@
                 return NULL;
         }
+#pragma omp parallel for
          for (int i = 0; i < q->dimensions[0]; i++){
       double q_value  = *(double *)(q->data + i*q->strides[0]);
@@ -283 +284 @@
                 if (PyArray_Check(pars)) {
                         return evaluateOneDim(self->model, (PyArrayObject*)pars); 
-                    }
-                }else{
+                }
+            }else{
                     PyErr_SetString(CCylinderModelError, 
                    "CCylinderModel.evalDistribution expect numpy array of one dimension.");
                 return NULL;
-                }
+            }
     }else if( PyList_Check(pars)==1) {
         // Length of list should be 2 for I(qx,qy)