Changeset 6137124 in sasmodels

Timestamp:

Feb 22, 2015 4:00:46 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

664c8e7, 3a45c2c

Parents:

f734e7d

Message:

fix opencl warnings that showed up on mac

Location:

sasmodels

Files:

• generate.py (modified) (1 diff)
• model_test.py (modified) (3 diffs)
• models/bcc.c (modified) (1 diff)
• models/fcc.c (modified) (1 diff)

sasmodels/generate.py

@@ -433 +433 @@
     # Generate form_volume function from body only
     if info['form_volume'] is not None:
+        if volume_parameters:
+            vol_par_decl = ', '.join('double '+p for p in volume_parameters)
+        else:
+            vol_par_decl = 'void'
         defines.append(('VOLUME_PARAMETER_DECLARATIONS',
-                        ', '.join('double '+p for p in volume_parameters)))
+                        vol_par_decl))
         fn = """\
 double form_volume(VOLUME_PARAMETER_DECLARATIONS);

sasmodels/model_test.py

@@ -72 +72 @@
                 test = ModelTestCase(test_name, model_definition,
                                      load_model_cl, tests)
-                print "defining", test_name
+                #print "defining", test_name
                 suite.addTest(test)
 
@@ -80 +80 @@
                 test = ModelTestCase(test_name, model_definition,
                                      load_model_dll, tests)
-                print "defining", test_name
+                #print "defining", test_name
                 suite.addTest(test)
 
@@ -96 +96 @@
 
     def runTest(self):
-        print "running", self.test_name
+        #print "running", self.test_name
         try:
             model = self.loader(self.definition)

sasmodels/models/bcc.c

@@ -112 +112 @@
 
   const double Da = d_factor*dnn;
-  const double qDa_2 = q*q*Da*Da;
   const double s1 = dnn/sqrt(0.75);
 

sasmodels/models/fcc.c

@@ -112 +112 @@
 
   const double Da = d_factor*dnn;
-  const double qDa_2 = q*q*Da*Da;
   const double s1 = dnn/sqrt(0.75);