Changeset 4061 in Sophya

Timestamp:

Apr 17, 2012, 11:21:23 AM (12 years ago)

Author:

cmv

Message:

cmv, 17/04/2012

Location:

trunk/Cosmo/SimLSS

Files:

• cmvtstpk.cc (modified) (3 diffs)
• genefluct3d.cc (modified) (3 diffs)

trunk/Cosmo/SimLSS/cmvtstpk.cc

@@ -80 +80 @@
  if(optind<narg) zval = atof(arg[optind]);
 
- cout<<"h100="<<h100<<" Om0="<<Om0<<" Ob0="<<Ob0<<" Ol0="<<Ol0<<" w0="<<w0<<endl;
+ cout<<"h100="<<h100<<" Om0="<<Om0<<" Ob0="<<Ob0<<" Ocdm="<<Om0-Ob0<<" Ol0="<<Ol0<<" w0="<<w0<<endl;
  cout<<"lkmin="<<lkmin<<" lkmax="<<lkmax<<" npt="<<npt<<" dlk="<<dlk<<endl;
  cout<<"scale="<<scale<<endl;
@@ -91 +91 @@
 
  TransfertEisenstein tf(h100,Om0-Ob0,Ob0,T_CMB_Par,false);
- cout<<"kpeak="<<tf.KPeak()<<endl;
+   double tf0 = tf(0);
+   cout<<"kpeak="<<tf.KPeak()<<endl;
  TransfertEisenstein tfnosc2(tf); tfnosc2.SetNoOscEnv(2);
+   double tfnosc20 = tfnosc2(0);
  TransfertEisenstein tfnosc1(tf); tfnosc1.SetNoOscEnv(1);
+   double tfnosc10 = tfnosc1(0);
  TransfertEisenstein tfnob(h100,Om0,0.,T_CMB_Par,true);
+   double tfnob0 = tfnob(0);
+ cout<<"tf(0)="<<tf0<<" tfnosc2(0)="<<tfnosc20<<" tfnosc1(0)="<<tfnosc10<<" tfnob(0)="<<tfnob0<<endl;
 
  GrowthEisenstein d1(Om0,Ol0);
- cout<<"GrowthFactor: "<<d1(zval)<<endl;
+ cout<<"GrowthFactor: D1(0)="<<d1(0.)<<" D1("<<zval<<") = "<<d1(zval)<<endl;
 
  PkSpecCalc pk0(pkini,tf,d1,0.);
@@ -173 +178 @@
    fprintf(fdata,"# z= %g : k(Mpc^-1) pkini, tf pk0 pkz, tfnosc2 pk0nosc2 pkznosc2, ",zval);
    fprintf(fdata,"tfnosc1 pk0nosc1 pkznosc1, tfnob pk0nob pkznob\n");
+   int n = 0;
    for(double lk=lkmin;lk<lkmax+dlk/2.;lk+=dlk) {
      double k = pow(10.,lk);
-     fprintf(fdata,"%e %e %e %e %e %e %e %e %e %e %e %e %e %e\n",
-             k,pkini(k),
+     fprintf(fdata,"%d %e %e %e %e %e %e %e %e %e %e %e %e %e %e\n",
+             n,k,pkini(k),
              tf(k),pk0(k),pkz(k,zval),
              tfnosc2(k),pk0nosc2(k),pkznosc2(k,zval),
              tfnosc1(k),pk0nosc1(k),pkznosc1(k,zval),
              tfnob(k),pk0nob(k),pkznob(k,zval));
+     n++;
    }
    fclose(fdata);

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -810 +810 @@
    for(long jj=0;jj<2;jj++) { // selon j
      long j=0;
-     if(jj==1) {if( Ny_%2!=0) continue; else j = Ny_/2;}
+     if(jj==1) {if(Ny_%2!=0) continue; else j = Ny_/2;}
      for(long i=1;i<(Nx_+1)/2;i++) {
        int_8 ip = IndexC(i,j,k);
@@ -820 +820 @@
    for(long ii=0;ii<2;ii++) {
      long i=0;
-     if(ii==1) {if( Nx_%2!=0) continue; else i = Nx_/2;}
+     if(ii==1) {if(Nx_%2!=0) continue; else i = Nx_/2;}
      for(long j=1;j<(Ny_+1)/2;j++) {
        int_8 ip = IndexC(i,j,k);
@@ -884 +884 @@
 // Gestion divergence en 0: sin(y)/y = 1 - y^2/6*(1-y^2/20)
 //                          avec y = k_x*dx/2
+//--- Ex a 1D: TF(k) = sinc(k D/2) = sin(k D/2) / (k D/2)
+// Le premier zero du sinc, cad k1 tq TF(k1)=0 est a: k1 D/2 = Pi -> k1 = 2Pi/D
+// Avec un echantillonage de pas D, on a: k_nyq = Pi/D = k1/2
+//   donc pour la frequence de Nyquist: TF(k_nyq) = sinc(Pi/2) = 2/Pi ~= 0.6366
+//---
 {
  if(lp_>0) cout<<"--- FilterByPixel ---"<<endl;