Changeset 1c6286d in sasmodels

Timestamp:

Mar 3, 2017 4:26:08 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3f853beb

Parents:

5a0b3d7

Message:

lamellar stack/hg-stack caille: code tidying, changing loop terminator from 'i⇐N-1' to the more usual 'i<N'

Location:

sasmodels/models

Files:

• lamellar_hg_stack_caille.c (modified) (2 diffs)
• lamellar_stack_caille.c (modified) (2 diffs)

sasmodels/models/lamellar_hg_stack_caille.c

@@ -28 +28 @@
 
   Sq = 0.0;
-  for(int ii=1; ii<=Nlayers-1; ii++) {
+  for(int ii=1; ii < Nlayers; ii++) {
     temp = 0.0;
     alpha = Cp/4.0/M_PI/M_PI*(log(M_PI*ii) + Euler);
@@ -40 +40 @@
     //if (temp < 0) printf("q=%g: ii=%d, cos(dd*q*ii)=cos(%g) < 0\n",qval,ii,dd*qval*ii);
     //temp *= exp(-1.0*(t2 + t3)/(2.0*(1.0+t1)) );
-    temp *= exp(-t2/2.0 );
+    temp *= exp(-t2/2.0);
     //temp /= sqrt(1.0+t1);
 

sasmodels/models/lamellar_stack_caille.c

@@ -26 +26 @@
 
   Sq = 0.0;
-  // the vital "=" in ii<=  added March 2015
-  for (int ii=1; ii<=Nlayers-1; ii++) {
-
-    //fii = (double)ii;   //do I really need to do this? - unused variable, removed 18Feb2015
-
+  for (int ii=1; ii < Nlayers; ii++) {
     temp = 0.0;
     alpha = Cp/4.0/M_PI/M_PI*(log(M_PI*ii) + Euler);
@@ -41 +37 @@
     temp *= cos(dd*qval*ii);
     //temp *= exp(-1.0*(t2 + t3)/(2.0*(1.0+t1)) );
-    temp *= exp(-t2/2.0 );
+    temp *= exp(-t2/2.0);
     //temp /= sqrt(1.0+t1);