Changeset 3c07598 in sasview

Timestamp:

Jan 19, 2012 7:09:19 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

33477fd

Parents:

602645d

Message:

fixed omp problem

File:

• sansmodels/src/c_smearer/smearer2d_helper.cpp (modified) (3 diffs)

sansmodels/src/c_smearer/smearer2d_helper.cpp

@@ -15 +15 @@
 #include <stdio.h>
 #include <math.h>
+//#include <omp.h>
 using namespace std;
 
@@ -51 +52 @@
         double qphi = 0.0;
         double Pi = 4.0*atan(1.0);
+        
         // Loop over q-values and multiply apply matrix
-#pragma omp parallel for
         for(int i=0; i<nrbins; i++){
                 rbin = rbin_size * (double(i) + 0.5);
@@ -58 +59 @@
                         phibin_size =  2.0 * Pi / double(nphibins);
                         phibin = phibin_size * (double(j));
+                        #pragma omp for
                         for(int q_i=0; q_i<npoints; q_i++){
                                 qr = sqrt(qx_values[q_i]*qx_values[q_i] + qy_values[q_i]*qy_values[q_i]);