Changeset 3805 in Sophya for trunk/Cosmo/SimLSS/cmvginit3d.cc

Timestamp:

Jul 24, 2010, 12:01:34 AM (15 years ago)

Author:

cmv

Message:

Refonte totale de la structure des classes InitialSpectrum, TransfertFunction, GrowthFactor, PkSpectrum et classes tabulate pour lecture des fichiers CAMB, cmv 24/07/2010

File:

• trunk/Cosmo/SimLSS/cmvginit3d.cc (modified) (2 diffs)

trunk/Cosmo/SimLSS/cmvginit3d.cc

@@ -218 +218 @@
  cout<<endl<<"\n--- Create Spectrum"<<endl;
 
- InitialSpectrum pkini(ns,as);
+ InitialPowerLaw pkini(ns,as);
 
  TransfertEisenstein tf(h100,om0-ob0,ob0,T_CMB_Par,false);
@@ -224 +224 @@
    tfnos.SetNoOscEnv(2);
 
- GrowthFactor growth(om0,ol0);
- // GrowthFactor growth(1.,0.); // D(z) = 1/(1+z)
+ GrowthEisenstein growth(om0,ol0);
+ // GrowthEisenstein growth(1.,0.); // D(z) = 1/(1+z)
  double growth_at_z = growth(zref);
  cout<<"...Growth factor at z="<<zref<<" = "<<growth_at_z<<endl;
 
- PkSpectrum0 pk0(pkini,tf);
- PkSpectrum0 pk0nos(pkini,tfnos);
-
- PkSpectrumZ pkz(pk0,growth,zref);
- PkSpectrumZ pkznos(pk0nos,growth,zref);
+ PkSpecCalc pkz(pkini,tf,growth,zref);
+ PkSpecCalc pkznos(pkini,tfnos,growth,zref);
 
  //-----------------------------------------------------------------