Changeset 961b75 for pcp/src/pseudo.c


Ignore:
Timestamp:
Apr 21, 2008, 2:19:24 PM (17 years ago)
Author:
Frederik Heber <heber@…>
Children:
b74e5e
Parents:
e00f47
git-author:
Frederik Heber <heber@…> (04/18/08 15:15:13)
git-committer:
Frederik Heber <heber@…> (04/21/08 14:19:24)
Message:

ParseForParameter() has new parameter repetition, which reads the repetition-th occurence of the given keyword

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pcp/src/pseudo.c

    re00f47 r961b75  
    506506        if (P->Call.out[ReadOut]) fprintf(stderr,"%s was found\n",cpiInputFileName);
    507507    int zeile = 1;
    508     ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &PP->zval[it], critical);
    509     ParseForParameter(0,cpiInputFile, NULL, 1, 2, zeile, int_type, &PP->nang[it], critical);
     508    ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &PP->zval[it], 1, critical);
     509    ParseForParameter(0,cpiInputFile, NULL, 1, 2, zeile, int_type, &PP->nang[it], 1, critical);
    510510    I->TotalZval += PP->zval[it]*(I->I[it].Max_IonsOfType);
    511511    PP->core[it] = (double *) Malloc(sizeof(double)*2, "InitPseudoRead: ");
    512512    PP->rc[it] = (double *) Malloc(sizeof(double)*2, "InitPseudoRead: ");
    513     ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &PP->core[it][0], critical);
    514     ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &PP->rc[it][0], critical);
    515     ParseForParameter(0,cpiInputFile, NULL, 0, 3, zeile, double_type, &PP->core[it][1], critical);
    516     ParseForParameter(0,cpiInputFile, NULL, 1, 4, zeile, double_type, &PP->rc[it][1], critical);
     513    ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &PP->core[it][0], 1, critical);
     514    ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &PP->rc[it][0], 1, critical);
     515    ParseForParameter(0,cpiInputFile, NULL, 0, 3, zeile, double_type, &PP->core[it][1], 1, critical);
     516    ParseForParameter(0,cpiInputFile, NULL, 1, 4, zeile, double_type, &PP->rc[it][1], 1, critical);
    517517    PP->rcl[it] = (double **) Malloc(sizeof(double*)*3, "InitPseudoRead: ");
    518518    PP->al[it] =  (double **) Malloc(sizeof(double*)*3, "InitPseudoRead: ");
    … …  
    526526      PP->bl[it][il] = (double *) Malloc(sizeof(double)*3, "InitPseudoRead: ");
    527527      for (ib = 0; ib < 3; ib++) {
    528                     ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &PP->rcl[it][il][ib], critical);
    529                     ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &PP->al[it][il][ib], critical);
    530                     ParseForParameter(0,cpiInputFile, NULL, 1, 3, zeile, double_type, &PP->bl[it][il][ib], critical);
     528                    ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &PP->rcl[it][il][ib], 1, critical);
     529                    ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &PP->al[it][il][ib], 1, critical);
     530                    ParseForParameter(0,cpiInputFile, NULL, 1, 3, zeile, double_type, &PP->bl[it][il][ib], 1, critical);
    531531                                if (PP->rcl[it][il][ib] < MYEPSILON)
    532532                                  PP->rcl[it][il][ib] = 0.0;
    … …  
    535535      }
    536536    }
    537     ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, int_type, &PP->mmax[it], critical);
    538     ParseForParameter(0,cpiInputFile, NULL, 1, 2, zeile, double_type, &PP->clog[it], critical);
     537    ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, int_type, &PP->mmax[it], 1, critical);
     538    ParseForParameter(0,cpiInputFile, NULL, 1, 2, zeile, double_type, &PP->clog[it], 1, critical);
    539539    if (PP->mmax[it] > PP->Mmax) PP->Mmax = PP->mmax[it];
    540540    PP->clog[it] = log(PP->clog[it]);
    … …  
    547547      PP->v_loc[it][il] = (double *) Malloc(sizeof(double)*PP->mmax[it], "InitPseudoRead: ");
    548548      for (j=0;j< PP->mmax[it];j++) {
    549                     ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, int_type, &m, critical);
    550                     ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &PP->r[it][j], critical);
    551                     ParseForParameter(0,cpiInputFile, NULL, 0, 3, zeile, double_type, &PP->R[it][il][j], critical);
    552                     ParseForParameter(0,cpiInputFile, NULL, 1, 4, zeile, double_type, &PP->v_loc[it][il][j], critical);
     549                    ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, int_type, &m, 1, critical);
     550                    ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &PP->r[it][j], 1, critical);
     551                    ParseForParameter(0,cpiInputFile, NULL, 0, 3, zeile, double_type, &PP->R[it][il][j], 1, critical);
     552                    ParseForParameter(0,cpiInputFile, NULL, 1, 4, zeile, double_type, &PP->v_loc[it][il][j], 1, critical);
    553553      }
    554554      if (il < PP->nang[it]-1) {
    555                     ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, int_type, &PP->mmax[it], critical);
    556                     ParseForParameter(0,cpiInputFile, NULL, 1, 2, zeile, double_type, &PP->clog[it], critical);
     555                    ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, int_type, &PP->mmax[it], 1, critical);
     556                    ParseForParameter(0,cpiInputFile, NULL, 1, 2, zeile, double_type, &PP->clog[it], 1, critical);
    557557                                PP->clog[it] = log(PP->clog[it]);
    558558      }
    … …  
    560560    I->I[it].corecorr = NotCoreCorrected;
    561561    count = 0;
    562     count += ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &dummyr, optional);
    563     count += ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &dummycorewave, optional);
     562    count += ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &dummyr, 1, optional);
     563    count += ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &dummycorewave, 1, optional);
    564564    //fprintf(stderr,"(%i) %lg %lg\n",P->Par.me,dummyr,dummycorewave);
    565565    if (count == 2) {
    … …  
    570570      PP->corecorr = CoreCorrected;
    571571      PP->corewave[it][0] = dummycorewave/(4.*PI);
    572             ParseForParameter(0,cpiInputFile, NULL, 0, 3, zeile, double_type, &dummyr, critical);
    573             ParseForParameter(0,cpiInputFile, NULL, 1, 4, zeile, double_type, &dummycorewave, critical);
     572            ParseForParameter(0,cpiInputFile, NULL, 0, 3, zeile, double_type, &dummyr, 1, critical);
     573            ParseForParameter(0,cpiInputFile, NULL, 1, 4, zeile, double_type, &dummycorewave, 1, critical);
    574574      for (j=1;j < PP->mmax[it]; j++) {
    575                     ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &PP->r[it][j], critical);
    576                     ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &PP->corewave[it][j], critical);
    577                     ParseForParameter(0,cpiInputFile, NULL, 0, 3, zeile, double_type, &dummyr, critical);
    578                     ParseForParameter(0,cpiInputFile, NULL, 1, 4, zeile, double_type, &dummycorewave, critical);
     575                    ParseForParameter(0,cpiInputFile, NULL, 0, 1, zeile, double_type, &PP->r[it][j], 1, critical);
     576                    ParseForParameter(0,cpiInputFile, NULL, 0, 2, zeile, double_type, &PP->corewave[it][j], 1, critical);
     577                    ParseForParameter(0,cpiInputFile, NULL, 0, 3, zeile, double_type, &dummyr, 1, critical);
     578                    ParseForParameter(0,cpiInputFile, NULL, 1, 4, zeile, double_type, &dummycorewave, 1, critical);
    579579                                PP->corewave[it][j] /= (4.*PI);
    580580      }
Note: See TracChangeset for help on using the changeset viewer.