Changeset 833 in Sophya

Timestamp:

Apr 7, 2000, 12:28:03 PM (25 years ago)

Author:

ansari

Message:

Compil SGI-CC (Pb for(int i; i redeclare)) Reza 7/4/2000

Location:

trunk

Files:

• SophyaExt/FitsIOServer/fitsioserver.cc (modified) (3 diffs)
• SophyaLib/Samba/alm.cc (modified) (2 diffs)
• SophyaLib/Samba/sphericaltransformserver.cc (modified) (16 diffs)
• SophyaProg/PMixer/easyTest.cc (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fitsioserver.cc

@@ -328 +328 @@
   long repeat;
   int ntest= 0;
-  for(int ii = 0; ii < ncols; ii++)
+  int ii;
+  for(ii = 0; ii < ncols; ii++)
     {
       int DTYPE;
@@ -353 +354 @@
   char **clname;
   clname= new char*[tfields.size()];
-  for(int ii = 0; ii < tfields.size(); ii++)
+  for(ii = 0; ii < tfields.size(); ii++)
     {
       //  ostringstream ne passe pas sur tous les compilos .. Reza 23/12/99
@@ -366 +367 @@
   // create a NTuple
   NTuple nt0(tfields.size(),clname);
-  for(int ii = 0; ii < tfields.size(); ii++)
+  for(ii = 0; ii < tfields.size(); ii++)
     delete [] clname[ii];
   delete [] clname;

trunk/SophyaLib/Samba/alm.cc

@@ -29 +29 @@
   //    --- smoothes the initial power spectrum ---
   TVector<T> cl=clin;
-  for (int l=0;l<n_l;l++)
+  int l;
+  for (l=0;l<n_l;l++)
     {
       r_8 gauss=exp(-l*(l+1.)*sig_smooth*sig_smooth);
@@ -39 +40 @@
   r_8 hsqrt2 = 1.0 / Rac2;
 
-  for (int l=0;l<n_l;l++)
+  for (l=0;l<n_l;l++)
     {
       T rms=sqrt(cl(l));

trunk/SophyaLib/Samba/sphericaltransformserver.cc

@@ -80 +80 @@
       LambdaLMBuilder lb(theta,nlmax,nmmax);
       //  somme sur m de 0 a l'infini
-      for (int m = 0; m <= nmmax; m++)
+      int m;
+      for (m = 0; m <= nmmax; m++)
         {
           //  somme sur l de m a l'infini
@@ -104 +105 @@
     //        obtains the negative m of b(m,theta) (= complex conjugate)
 
-      for (int m=1;m<=nmmax;m++)
+      for (m=1;m<=nmmax;m++)
         {
           //compiler doesn't have conj()
@@ -169 +170 @@
 
   for (int kk=0; kk<bw.NElts(); kk++) bw(kk)=(T)0.;
-  for (int m=-b_m.Mmax();m<=-1;m++)
+  int m;
+  for (m=-b_m.Mmax();m<=-1;m++)
     {
       int maux=m;
@@ -177 +179 @@
       bw(iw) += b_m(m) * complex<T>( (T)cos(aux),(T)sin(aux) )  ;
     }
-  for (int m=0;m<=b_m.Mmax();m++)
+  for (m=0;m<=b_m.Mmax();m++)
     {
       //      int iw=((m % nph) +nph) % nph; //between 0 and nph = m'
@@ -248 +250 @@
 
   for (int kk=0; kk<bw.NElts(); kk++) bw(kk)=(T)0.;
-  for (int m=-b_m.Mmax();m<=-1;m++)
+  int m;
+  for (m=-b_m.Mmax();m<=-1;m++)
     {
       int maux=m;
@@ -256 +259 @@
       bw(iw) += b_m(m) * complex<T>( (T)cos(aux),(T)sin(aux) )  ;
     }
-  for (int m=0;m<=b_m.Mmax();m++)
+  for (m=0;m<=b_m.Mmax();m++)
     {
       //      int iw=((m % nph) +nph) % nph; //between 0 and nph = m'
@@ -365 +368 @@
 
   int im_max=min(nph,nmmax+1);
-  for (int i=0;i< dataout.NElts();i++) dataout(i)=complex<T>((T)0.,(T)0.);
-  for (int i=0;i<im_max;i++) dataout(i)=transformedData(i);
+  int i;
+  for (i=0;i< dataout.NElts();i++) dataout(i)=complex<T>((T)0.,(T)0.);
+  for (i=0;i<im_max;i++) dataout(i)=transformedData(i);
 
 
@@ -373 +377 @@
   //  }
   for (int kk=nph; kk<dataout.NElts(); kk++) dataout(kk)=dataout(kk%nph);
-  for (int i = 0;i <dataout.NElts();i++){
+  for (i = 0;i <dataout.NElts();i++){
     dataout(i)*= (complex<T>)(complex<double>(cos(-i*phi0),sin(-i*phi0)));
   }
@@ -415 +419 @@
   int sizeOfTransformToGet = min(transformedData.NElts(),nmmax+1);
   //  int im_max=min(transformedData.NElts()-1,nmmax);
-  for (int i=0;i<sizeOfTransformToGet;i++) dataout(i)=transformedData(i);
+  int i;
+  for (i=0;i<sizeOfTransformToGet;i++) dataout(i)=transformedData(i);
 
 
@@ -422 +427 @@
   if (sizeOfTransformToGet == (transformedData.NElts()))
     {
-      for (int i=transformedData.NElts(); i<min(nph,dataout.NElts()); i++)
+      for (i=transformedData.NElts(); i<min(nph,dataout.NElts()); i++)
         {
 
@@ -434 +439 @@
         }
     }
-  for (int i = 0;i <dataout.NElts();i++){
+  for (i = 0;i <dataout.NElts();i++){
     dataout(i)*= (complex<T>)(complex<double>(cos(-i*phi0),sin(-i*phi0)));
   }
@@ -640 +645 @@
       phasem(i)=0; 
     }
-
-  for(int kk=0; kk<nph; kk++) datain(kk)=complex<T>(dataq(kk),datau(kk));
+  int kk;
+  for(kk=0; kk<nph; kk++) datain(kk)=complex<T>(dataq(kk),datau(kk));
 
   phasep = CFromFourierAnalysis(nmmax,datain,phi0); 
 
-  for(int kk=0; kk<nph; kk++) datain(kk)=complex<T>(dataq(kk),-datau(kk));
+  for(kk=0; kk<nph; kk++) datain(kk)=complex<T>(dataq(kk),-datau(kk));
   phasem = CFromFourierAnalysis(nmmax,datain,phi0); 
   LambdaPMBuilder lpmb(theta,nlmax,nmmax);
@@ -695 +700 @@
       //      LambdaPMBuilder lpmb(theta,nlmax,nmmax);
       r_8 sqr2inv=1/Rac2;
-      for (int m = 0; m <= nmmax; m++)
+      int m;
+      for (m = 0; m <= nmmax; m++)
         {
           r_8 lambda_w=0.;
@@ -718 +724 @@
         }
       //        obtains the negative m of b(m,theta) (= complex conjugate)
-      for (int m=1;m<=nmmax;m++)
+      for (m=1;m<=nmmax;m++)
         {
           b_m_theta_q(-m) = conj(b_m_theta_q(m));
@@ -764 +770 @@
 
       LambdaPMBuilder lpmb(theta,nlmax,nmmax);
-      for (int m = 0; m <= nmmax; m++)
+      int m;
+      for (m = 0; m <= nmmax; m++)
         {
           r_8 lambda_p=0.;
@@ -784 +791 @@
       
       //        obtains the negative m of b(m,theta) (= complex conjugate)
-      for (int m=1;m<=nmmax;m++)
+      for (m=1;m<=nmmax;m++)
         {
           b_m_theta_p(-m) = conj(b_m_theta_m(m));

trunk/SophyaProg/PMixer/easyTest.cc

@@ -57 +57 @@
   Vector vecOfNu(maxVal);
   Vector vecOfFDeNu(maxVal);
-  for (int i=0; i<maxVal; i++)
+  int i;
+  for (i=0; i<maxVal; i++)
     {
       vecOfNu(i) = (double)i+230.;
@@ -79 +80 @@
   Vector vecOfNuRSV(SRVmaxVal);
   Vector vecOfFDeNuRSV(SRVmaxVal);
-  for (int i=0; i<SRVmaxVal; i++)
+  for (i=0; i<SRVmaxVal; i++)
     {
       vecOfNuRSV(i) = (double)i+130.;