Changeset 3800 in Sophya for trunk/Cosmo/SimLSS/cmvrvloscor.cc

Timestamp:

Jul 19, 2010, 5:05:40 PM (15 years ago)

Author:

cmv

Message:

reorganisation tres legere du code Vlos, cmv 19/07/2010

File:

• trunk/Cosmo/SimLSS/cmvrvloscor.cc (modified) (4 diffs)

trunk/Cosmo/SimLSS/cmvrvloscor.cc

@@ -107 +107 @@
  long nmax = max(Nx,max(Ny,Nz));
  cout<<"dmin="<<dmin<<" nmax="<<nmax<<endl;
- Histo hmpc(-dmin*nmax,dmin*nmax,4*nmax);
+ Histo hmpc(-dmin*nmax/10.,dmin*nmax/10.,nmax);
 
  POutPersist pos(fnppf.c_str());
@@ -167 +167 @@
  for(int i=0;i<Nx;i++) {
    if(i%(Nx/10)==0) cout<<"   i="<<i<<endl;
-   TMatrix<r_4> M2d, M2dc;
+   TMatrix<r_4> M2d, M2dv, M2dc;
    if(do2d && (i==0 || i==Nx/2 || i==Nx-1)) {
      M2d.ReSize(Ny,Nz); M2d = 0.;
+     M2dv.ReSize(Ny,Nz); M2dv = 0.;
      M2dc.ReSize(Ny,Nz); M2dc = 0.;
    }
@@ -199 +200 @@
    // On remplit eventuellement les matrices 2D
    if(do2d && M2d.Size()>0)
-     for(int l=0;l<Nz;l++) {M2d(j,l) = R(l); M2dc(j,l) = Rdis(l);}
+     for(int l=0;l<Nz;l++) {M2d(j,l) = R(l); M2dv(j,l) = V(l); M2dc(j,l) = Rdis(l);}
    // On remplit le cube avec le champ R redshift distordu
    if(fluct3d) for(int l=0;l<Nz;l++) (*rgen)(l,j,i) += Rdis(l);
@@ -240 +241 @@
      sprintf(str,"mx_%d",i);
      pos.PutObject(M2d,str);
+     sprintf(str,"mxv_%d",i);
+     pos.PutObject(M2dv,str);
      sprintf(str,"mxc_%d",i);
      pos.PutObject(M2dc,str);