Changeset 3285 in Sophya for trunk/Cosmo/SimLSS/cmvtuniv.cc

Timestamp:

Jul 29, 2007, 9:01:31 PM (18 years ago)

Author:

cmv

Message:

update logique Init_Spline de CosmoCalc cmv 29/07/07

File:

• trunk/Cosmo/SimLSS/cmvtuniv.cc (modified) (5 diffs)

trunk/Cosmo/SimLSS/cmvtuniv.cc

@@ -42 +42 @@
  cout<<"z1="<<z1<<"  z2="<<z2<<"  dz="<<dz<<endl;
 
- double perc=0.01,dzinc=-1.,dzmax=5.; unsigned short glorder=4;
+ double perc=0.01,dzinc=-1.,dzmax=-1.; unsigned short glorder=4;
  if(narg>2) sscanf(arg[2],"%lf,%lf,%lf,%hu",&perc,&dzinc,&dzmax,&glorder);
- if(dzinc<=0.) dzinc = dz/2.;
  cout<<" perc="<<perc<<" dzinc="<<dzinc<<" dzmax="<<dzmax<<" glorder="<<glorder<<endl;
 
@@ -50 +49 @@
  univ.SetInteg(perc,dzinc,dzmax,glorder);
  univ.SetDynParam(h100,om0,or0,ol0,w0);
+ univ.PrtInteg();
  univ.Print();
 
@@ -55 +55 @@
  univ1.SetInteg(perc,dzinc,dzmax,glorder);
  univ1.SetDynParam(h100,om0,or0,ol0,w0);
+ univ1.PrtInteg();
  univ1.Print();
 
@@ -202 +203 @@
  vector<double> Dinterp;
  double zmin = Z[0], zmax = Z[0];
- for(int i=0;i<Z.size();i+=ninc) {
+ for(unsigned int i=0;i<Z.size();i+=ninc) {
    Dinterp.push_back(D[i]);
    zmax = Z[i];
@@ -214 +215 @@
  double xnt[n];
    
- for(int i=0;i<Z.size();i++) {
+ for(unsigned int i=0;i<Z.size();i++) {
    if(Z[i]>zmax) break;
    xnt[0] = Z[i];