Changeset 2966 in Sophya for trunk/SophyaLib/Samba/lambdaBuilder.cc

Timestamp:

Jun 2, 2006, 6:00:25 PM (19 years ago)

Author:

ansari

Message:

petite optimisation supplementaire par simplification du code ds la boucle du calcul Sum[alm*Plm] ... ds LambdaLMBuilder , Reza 2/6/2006

File:

• trunk/SophyaLib/Samba/lambdaBuilder.cc (modified) (5 diffs)

trunk/SophyaLib/Samba/lambdaBuilder.cc

@@ -134 +134 @@
   
   r_8 lam_mm = 1. / sqrt(4.*Pi) *bignorm2;
-  r_8 lam_0, lam_1, lam_2;
-  register r_8 a_rec, b_rec;
-
-  const complex<r_8>* almp = alm.columnData(0); 
-  r_8* arecp = a_recurrence_.columnData(0); 
-
-  int_4 l, m;
+  register r_8 lam_0, lam_1, lam_2;
+
+  int_4 l, m, k;
 
   for (m=0; m<=mmax;m++)   {
-    //MOV^     const complex<r_8>* almp = alm.columnData(m); 
+    const complex<r_8>* almp = alm.columnData(m); 
     complex<r_8>* bmp = &(bm(m));
-    
-    *bmp = (lam_mm / bignorm2)*(*almp);  almp++;
+    r_8* arecp = a_recurrence_.columnData(m); 
+    *bmp = (lam_mm / bignorm2)*almp[0];  almp++;
 
     lam_0=0.;
     lam_1=1. /bignorm2 ;
     
-    a_rec = *arecp; arecp++; // a_recurrence_(m,m);
-    b_rec = 0.;
-    for (l=m+1; l<=lmax; l++) {
-      lam_2 = (cth*lam_1-b_rec*lam_0)*a_rec;
-      
-      //DEL        lambda_(l,m) = lam_2*lam_mm;
-      *bmp += lam_2*lam_mm*(*almp);   almp++;
-      b_rec=1./a_rec;
-      //           a_rec= LWK->a_recurr(l,m);
-      a_rec= *arecp; arecp++; // a_recurrence_(l,m);
-      lam_0 = lam_1;
+    //    for (l=m+1; l<=lmax; l++) {
+    for (k=0; k<lmax-m; k++) {
+      lam_2 = (cth*lam_1-lam_0)*arecp[k];
+      lam_0 = lam_1/arecp[k];
       lam_1 = lam_2;
+
+      *bmp += (lam_2*lam_mm)*almp[k];  
     }
     lam_mm = -lam_mm*sth* sqrt( (2.*m+3.)/ (2.*m+2.) );
@@ -200 +191 @@
   
   r_8 lam_mm = 1. / sqrt(4.*Pi) *bignorm2;
-  r_8 lam_0, lam_1, lam_2;
-  register r_8 a_rec, b_rec;
-  
-  complex<r_8>* almp = alm.columnData(0); 
-  r_8* arecp = a_recurrence_.columnData(0); 
-
-  int_4 l, m;
+  register r_8 lam_0, lam_1, lam_2;
+  
+  int_4 l, m, k;
+
   for (m=0; m<=mmax;m++)  {
-    //MOV^ complex<r_8>* almp = alm.columnData(m); 
+    complex<r_8>* almp = alm.columnData(m); 
     complex<r_8>  phi = phase(m);
     
@@ -216 +204 @@
     lam_1=1. /bignorm2 ;
     
-    //MOV^ r_8* arecp = a_recurrence_.columnData(m); 
-    a_rec = *arecp; arecp++; // a_recurrence_(m,m);
-    b_rec = 0.;
-    for (l=m+1; l<=lmax; l++)   {
-      lam_2 = (cth*lam_1-b_rec*lam_0)*a_rec;
-      
-      //DEL        lambda_(l,m) = lam_2*lam_mm;
-      *almp += (lam_2*lam_mm) * phi;    almp++;
-      
-      b_rec=1./a_rec;
-      //           a_rec= LWK->a_recurr(l,m);
-      a_rec= *arecp; arecp++; // a_recurrence_(l,m);
-      lam_0 = lam_1;
+    r_8* arecp = a_recurrence_.columnData(m); 
+    //    for (l=m+1; l<=lmax; l++)   {
+    for (k=0; k<lmax-m; k++) {
+      lam_2 = (cth*lam_1-lam_0)*arecp[k];
+      lam_0 = lam_1/arecp[k];
       lam_1 = lam_2;
+
+      almp[k] += (lam_2*lam_mm) * phi; 
     }
     lam_mm = -lam_mm*sth* sqrt( (2.*m+3.)/ (2.*m+2.) );
@@ -250 +232 @@
   
   r_8 lam_mm = 1. / sqrt(4.*Pi) *bignorm2;
-  r_8 lam_0, lam_1, lam_2;
-  register r_8 a_rec, b_rec;
-  register r_4 cff;
-  complex<r_4>* almp = alm.columnData(0); 
-  r_8* arecp = a_recurrence_.columnData(0); 
-
-  int_4 l, m;
+  register r_8 lam_0, lam_1, lam_2;
+  
+  int_4 l, m, k;
+
   for (m=0; m<=mmax;m++)  {
-    //MOV^ complex<r_4>* almp = alm.columnData(m); 
+    complex<r_4>* almp = alm.columnData(m); 
     complex<r_4>  phi = phase(m);
     
-    cff = lam_mm / bignorm2;
-    *almp += cff*phi;  almp++;
+    *almp += ((r_4)(lam_mm / bignorm2))*phi;    almp++;
 
     lam_0=0.;
     lam_1=1. /bignorm2 ;
     
-    //MOV^ r_8* arecp = a_recurrence_.columnData(m); 
-    a_rec = *arecp; arecp++; // a_recurrence_(m,m);
-    b_rec = 0.;
-    for (l=m+1; l<=lmax; l++)   {
-      lam_2 = (cth*lam_1-b_rec*lam_0)*a_rec;
-      
-      //DEL        lambda_(l,m) = lam_2*lam_mm;
-      cff = (lam_2*lam_mm);
-      *almp += cff * phi;    almp++;
-      
-      b_rec=1./a_rec;
-      //           a_rec= LWK->a_recurr(l,m);
-      a_rec= *arecp; arecp++; // a_recurrence_(l,m);
-      lam_0 = lam_1;
+    r_8* arecp = a_recurrence_.columnData(m); 
+    //    for (l=m+1; l<=lmax; l++)   {
+    for (k=0; k<lmax-m; k++) {
+      lam_2 = (cth*lam_1-lam_0)*arecp[k];
+      lam_0 = lam_1/arecp[k];
       lam_1 = lam_2;
+
+      almp[k] += ((r_4)(lam_2*lam_mm)) * phi; 
     }
     lam_mm = -lam_mm*sth* sqrt( (2.*m+3.)/ (2.*m+2.) );
   }
-}
+
+}
+
 
 
@@ -292 +265 @@
  compute a static array of coefficients independant from theta (common to all instances of the LambdaBuilder Class 
 */
+
 void  LambdaLMBuilder::updateArrayRecurrence(int_4 lmax)
    {