Changeset 79290f for pcp/src/output.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • pcp/src/output.c

    ra97897 r79290f  
    3030  $Id: output.c,v 1.51.2.2 2007-04-21 12:55:50 foo Exp $
    3131*/
     32
     33#ifdef HAVE_CONFIG_H
     34#include <config.h>
     35#endif
     36
    3237#include<stdlib.h>
    3338#include<stdio.h>
    … …  
    310315int OutputSrcPsiDensity(struct Problem *P, enum PsiTypeTag type)
    311316{
    312   int i,j,k, Index, zahl, owner;
     317  int i,j,k, Index, owner;
     318  size_t zahl;
    313319  struct Lattice *Lat = &P->Lat;
    314320  //struct RunStruct *R = &P->R;
    … …  
    414420              Error(SomeError, "OutputSrcPsiDensity: MPI_Recv of loaded coefficients failed!");
    415421            MPI_Get_count(&status, MPI_DOUBLE, &zahl);
    416             if (zahl != LevS->Dens->LocalSizeR) // check number of elements
     422            if (zahl != (size_t)LevS->Dens->LocalSizeR) // check number of elements
    417423              fprintf(stderr,"(%i)OutputSrcPsiDensity: MPI_Recv of loaded coefficients of GlobalNo %i, owner %i failed: Too few coefficients - %i instead of %i!\n", P->Par.me, k, i, zahl, LevS->Dens->LocalSizeR);
    418424            //else       
    … …  
    423429                Error(SomeError, "OutputSrcPsiDensity: MPI_Recv of loaded coefficients failed!");
    424430              MPI_Get_count(&status, MPI_DOUBLE, &zahl);
    425               if (zahl != LevS->Dens->LocalSizeR) // check number of elements
     431              if (zahl != (size_t)LevS->Dens->LocalSizeR) // check number of elements
    426432                fprintf(stderr,"(%i)OutputSrcPsiDensity: MPI_Recv of loaded coefficients of GlobalNo %i, owner %i failed: Too few coefficients - %i instead of %i!\n", P->Par.me, k, i, zahl, LevS->Dens->LocalSizeR);
    427433              //else       
    … …  
    445451                  Error(SomeError, "OutputSrcPsiDensity: MPI_Recv of loaded coefficients failed!");
    446452                MPI_Get_count(&status, MPI_DOUBLE, &zahl);
    447                 if (zahl != LevS->Dens->LocalSizeR) // check number of elements
     453                if (zahl != (size_t)LevS->Dens->LocalSizeR) // check number of elements
    448454                  fprintf(stderr,"(%i)OutputSrcPsiDensity: MPI_Recv of loaded coefficients of GlobalNo %i, owner %i failed: Too few coefficients - %i instead of %i!\n", P->Par.me, k, owner, zahl, LevS->Dens->LocalSizeR);
    449455                //else       
    … …  
    570576  int N[NDIM], GlobalNo[2];
    571577  int LevelNo, readnr=0;
    572   int zahl, signal = test ? 1 : 2; // 0 - ok, 1 - test failed, 2 - throw Error
     578  int breaksignal = test ? 1 : 2; // 0 - ok, 1 - test failed, 2 - throw Error
     579  size_t zahl;
    573580  char suffixdat[MAXSTRINGSIZE], suffixdoc[MAXSTRINGSIZE];
    574   int read_type, Num = 0, colorNo = 0;
     581  int Num = 0, colorNo = 0;
     582  enum PsiTypeTag read_type;
    575583  char spin[20];
    576584  double Eps[2];
    … …  
    611619      debug(P,"ReadSrcPsiDensity: doc file pointer NULL\n");
    612620      if (test) {
    613         if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     621        if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    614622          Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    615623        return 0;
    616624      }
    617       if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     625      if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    618626        Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    619627      Error(SomeError,"ReadSrcPsiDensity: cannot open doc file!");
    … …  
    635643      fclose(SrcPsiDoc);
    636644      if (test) {
    637         if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     645        if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    638646          Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    639647        return 0;
    640648      }
    641649      fprintf(stderr,"ReadSrcPsiDensity: Only %i items read!\n",readnr);
    642       if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     650      if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    643651        Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    644652      Error(SomeError, "ReadSrcPsiDensity: read error");
    … …  
    649657      fclose(SrcPsiDoc);
    650658      if (test) {
    651         if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     659        if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    652660          Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    653661        return 0;
    654662      }
    655       if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     663      if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    656664        Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    657665      Error(SomeError,"ReadSrcPsiDensity: Mismatching levels!");
    … …  
    666674      if (test) {
    667675        fprintf(stderr,"(%i) Min\t N(x,y,z)\tPsiNo+AddNo\n file: %s\t %i %i %i\t %i + %i\nsystem: %s\t %d %d %d\t %d + %d\n",P->Par.me, R->MinimisationName[read_type], N[0], N[1], N[2], GlobalNo[0], GlobalNo[1], R->MinimisationName[R->CurrentMin], LevS->N[0] , LevS->N[1], LevS->N[2], Lat->Psi.GlobalNo[PsiMaxNoDouble], Lat->Psi.GlobalNo[PsiMaxAdd]);
    668         if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     676        if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    669677          Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    670678        return 0;
    671679      }
    672680      fprintf(stderr,"ReadSrcPsiDensity: Type %i != CurrentMin %i || N[0] %i != %i || N[1] %i != %i || N[2] %i != %i || %s %i + %i != %i + %i\n", read_type, R->CurrentMin, N[0], LevS->N[0], N[1], LevS->N[1], N[2], LevS->N[2], spin, GlobalNo[0], GlobalNo[1], Num, P->Lat.Psi.GlobalNo[PsiMaxAdd]);
    673       if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     681      if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    674682        Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    675683      Error(SomeError,"ReadSrcPsiDensity: srcpsi file does not fit to system");
    676684    }
    677     signal = 0; // everything went alright, signal ok
    678     if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     685    breaksignal = 0; // everything went alright, signal ok
     686    if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    679687      Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    680688  } else {  // others wait for signal from root process
    681     if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
     689    if (MPI_Bcast(&breaksignal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
    682690      Error(SomeError,"ReadSrcPsiDensity: Bcast of signal failed\n");
    683     if (signal == 1)
     691    if (breaksignal == 1)
    684692      return 0;
    685     else if (signal == 2)
     693    else if (breaksignal == 2)
    686694      Error(SomeError, "ReadSrcPsiDensity: Something went utterly wrong, see root process");
    687695    else if (P->Call.out[PsiOut])
    … …  
    748756                  Error(SomeError, "ReadSrcPsiDensity: MPI_Recv of loaded coefficients failed!");
    749757                MPI_Get_count(&status, MPI_DOUBLE, &zahl);
    750                 if (zahl != LevS->Dens->LocalSizeR) // check number of elements
     758                if (zahl != (size_t)LevS->Dens->LocalSizeR) // check number of elements
    751759                  fprintf(stderr,"(%i)ReadSrcPsiDensity: MPI_Recv from process 0 of loaded coefficients of GlobalNo %i, owner %i failed: Too few coefficients - %i instead of %i!\n", P->Par.me, k, owner, zahl, LevS->Dens->LocalSizeR);
    752760                //else       
    … …  
    766774                Error(SomeError, "ReadSrcPsiDensity: MPI_Recv of loaded coefficients failed!");
    767775              MPI_Get_count(&status, MPI_DOUBLE, &zahl);
    768               if (zahl != LevS->Dens->LocalSizeR) // check number of elements
     776              if (zahl != (size_t)LevS->Dens->LocalSizeR) // check number of elements
    769777                fprintf(stderr,"(%i)ReadSrcPsiDensity: MPI_Recv of loaded coefficients of GlobalNo %i, owner %i failed: Too few coefficients - %i instead of %i!\n", P->Par.me, k, P->Par.me_comm_ST_Psi, zahl, LevS->Dens->LocalSizeR);
    770778              //else       
Note: See TracChangeset for help on using the changeset viewer.