Changeset 79290f for pcp/src/perturbed.c

Timestamp:

Jun 7, 2008, 1:13:29 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

02bc3c

Parents:

a97897

Message:

config.h is included in each and every file. After trying to compile on JUMP (with xlc).

File:

• pcp/src/perturbed.c (modified) (6 diffs)

pcp/src/perturbed.c

@@ -37 +37 @@
 
 */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
@@ -354 +358 @@
   struct RunStruct *R = &P->R;
   struct LatticeLevel *LevS = R->LevS;
-  const int state = R->CurrentMin;
+  const enum PsiTypeTag state = R->CurrentMin;
   const int l_normal = Psi->TypeStartIndex[Occupied] + (l - Psi->TypeStartIndex[state]);  // offset l to \varphi_l^{(0)}
   const int ActNum = l - Psi->TypeStartIndex[state] + Psi->TypeStartIndex[1] * Psi->LocalPsiStatus[l].my_color_comm_ST_Psi;
@@ -1456 +1460 @@
   double result = 0., E0 = 0., Elambda = 0., E1 = 0.;//, E2 = 0.;
   int i,m,j;
-  const int state = R->CurrentMin;
+  const enum PsiTypeTag state = R->CurrentMin;
   //const int l_normal = R->ActualLocalPsiNo - Psi->TypeStartIndex[state] + Psi->TypeStartIndex[Occupied]; 
   const int ActNum =  R->ActualLocalPsiNo - Psi->TypeStartIndex[state] + Psi->TypeStartIndex[1] * Psi->LocalPsiStatus[R->ActualLocalPsiNo].my_color_comm_ST_Psi;
@@ -1665 +1669 @@
  * \note Continuous Set of Damped Gauge Transformations according to Keith and Bader 
  */
-#ifdef HAVE_INLINE
-inline double ShiftGaugeOrigin(struct Problem *P, double r[NDIM], const int index)
-#else
 double ShiftGaugeOrigin(struct Problem *P, double r[NDIM], const int index)
-#endif
 {
   struct Ions *I = &P->Ion;
@@ -1760 +1760 @@
  * \return linearly interpolated value of \a *grid for position \a R[NDIM]
  */
-double LinearInterpolationBetweenGrid(struct Problem *P, struct Lattice *Lat, struct LatticeLevel *Lev, double R[NDIM], fftw_real *grid) 
+double LinearInterpolationBetweenGrid(struct Problem *P, struct Lattice *Lat, struct LatticeLevel *Lev, double R[NDIM], fftw_real *fftgrid) 
 {
   double x[2][NDIM];
@@ -1788 +1788 @@
     if ((k[g][0] >= N0*myPE) && (k[g][0] < N0*(myPE+1))) {
       //fprintf(stderr,"(%i) grid[%i]: sigma = %e\n", P->Par.me,  k[g][2]+N[2]*(k[g][1]+N[1]*(k[g][0]-N0*myPE)), sigma);
-      sigma += (x[g][0]*x[0][1]*x[0][2])*grid[k[0][2]+N[2]*(k[0][1]+N[1]*(k[g][0]-N0*myPE))]*mu0; // if it's local and factor from inverse fft
+      sigma += (x[g][0]*x[0][1]*x[0][2])*fftgrid[k[0][2]+N[2]*(k[0][1]+N[1]*(k[g][0]-N0*myPE))]*mu0; // if it's local and factor from inverse fft
       //fprintf(stderr,"(%i) grid[%i]: sigma += %e * %e \n", P->Par.me,  k[g][2]+N[2]*(k[g][1]+N[1]*(k[g][0]-N0*myPE)), (x[g][0]*x[0][1]*x[0][2]), grid[k[0][2]+N[2]*(k[0][1]+N[1]*(k[g][0]-N0*myPE))]*mu0);
-      sigma += (x[g][0]*x[0][1]*x[1][2])*grid[k[1][2]+N[2]*(k[0][1]+N[1]*(k[g][0]-N0*myPE))]*mu0; // if it's local and factor from inverse fft
+      sigma += (x[g][0]*x[0][1]*x[1][2])*fftgrid[k[1][2]+N[2]*(k[0][1]+N[1]*(k[g][0]-N0*myPE))]*mu0; // if it's local and factor from inverse fft
       //fprintf(stderr,"(%i) grid[%i]: sigma += %e * %e \n", P->Par.me,  k[g][2]+N[2]*(k[g][1]+N[1]*(k[g][0]-N0*myPE)), (x[g][0]*x[0][1]*x[1][2]), grid[k[1][2]+N[2]*(k[0][1]+N[1]*(k[g][0]-N0*myPE))]*mu0);
-      sigma += (x[g][0]*x[1][1]*x[0][2])*grid[k[0][2]+N[2]*(k[1][1]+N[1]*(k[g][0]-N0*myPE))]*mu0; // if it's local and factor from inverse fft
+      sigma += (x[g][0]*x[1][1]*x[0][2])*fftgrid[k[0][2]+N[2]*(k[1][1]+N[1]*(k[g][0]-N0*myPE))]*mu0; // if it's local and factor from inverse fft
       //fprintf(stderr,"(%i) grid[%i]: sigma += %e * %e \n", P->Par.me,  k[g][2]+N[2]*(k[g][1]+N[1]*(k[g][0]-N0*myPE)), (x[g][0]*x[1][1]*x[0][2]), grid[k[0][2]+N[2]*(k[1][1]+N[1]*(k[g][0]-N0*myPE))]*mu0);
-      sigma += (x[g][0]*x[1][1]*x[1][2])*grid[k[1][2]+N[2]*(k[1][1]+N[1]*(k[g][0]-N0*myPE))]*mu0; // if it's local and factor from inverse fft
+      sigma += (x[g][0]*x[1][1]*x[1][2])*fftgrid[k[1][2]+N[2]*(k[1][1]+N[1]*(k[g][0]-N0*myPE))]*mu0; // if it's local and factor from inverse fft
       //fprintf(stderr,"(%i) grid[%i]: sigma += %e * %e \n", P->Par.me,  k[g][2]+N[2]*(k[g][1]+N[1]*(k[g][0]-N0*myPE)), (x[g][0]*x[1][1]*x[1][2]), grid[k[1][2]+N[2]*(k[1][1]+N[1]*(k[g][0]-N0*myPE))]*mu0);
     }