Changeset 79290f for pcp/src/wannier.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/wannier.c (modified) (5 diffs)

pcp/src/wannier.c

@@ -14 +14 @@
   $Id: wannier.c,v 1.7 2007-10-12 15:50:38 heber Exp $
 */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <math.h>
@@ -1975 +1979 @@
   double WannierCentre[NDIM+1]; // combined centre and spread
   MPI_Status status;
-  int signal = 0; // 1 - ok, 0 - error
+  int errorsignal = 0; // 1 - ok, 0 - error
 
   switch (Lat->Psi.PsiST) {
@@ -1993 +1997 @@
     tagname = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "ParseWannierFile: *tagname");
     if(!OpenFile(P, &SpreadFile, suffix, "r", P->Call.out[ReadOut])) { // check if file exists
-      if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
+      if (MPI_Bcast(&errorsignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
         Error(SomeError,"ParseWannierFile: Bcast of signal failed\n");
       return 0;
       //Error(SomeError,"ParseWannierFile: Opening failed\n");
     }
-    signal = 1;
-    if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
+    errorsignal = 1;
+    if (MPI_Bcast(&errorsignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
       Error(SomeError,"ParseWannierFile: Bcast of signal failed\n");
   } else {
-    if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
+    if (MPI_Bcast(&errorsignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
       Error(SomeError,"ParseWannierFile: Bcast of signal failed\n");
-    if (signal == 0)
+    if (errorsignal == 0)
       return 0;
   }
@@ -2014 +2018 @@
       if (P->Par.me_comm_ST == 0) { // only process 0 may access the spread file
         sprintf(tagname,"Psi%d_Lev%d",i,R->LevSNo);
-        signal = 0;
+        errorsignal = 0;
         if (!ParseForParameter(0,SpreadFile,tagname,0,3,1,row_double,WannierCentre,1,optional)) {
           //Error(SomeError,"ParseWannierFile: Parsing WannierCentre failed");
-          if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
+          if (MPI_Bcast(&errorsignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
             Error(SomeError,"ParseWannierFile: Bcast of signal failed\n");
           return 0;
@@ -2023 +2027 @@
         if (!ParseForParameter(0,SpreadFile,tagname,0,4,1,double_type,&WannierCentre[NDIM],1,optional)) {
           //Error(SomeError,"ParseWannierFile: Parsing WannierSpread failed");
-          if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
+          if (MPI_Bcast(&errorsignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
             Error(SomeError,"ParseWannierFile: Bcast of signal failed\n");
           return 0;
         }
-        signal = 1;
-        if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
+        errorsignal = 1;
+        if (MPI_Bcast(&errorsignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
           Error(SomeError,"ParseWannierFile: Bcast of signal failed\n");
       } else {
-        if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
+        if (MPI_Bcast(&errorsignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
           Error(SomeError,"ParseWannierFile: Bcast of signal failed\n");
-        if (signal == 0)
+        if (errorsignal == 0)
           return 0;
       }