Changeset 3320 in Sophya for trunk/Cosmo/SimLSS/genefluct3d.cc

Timestamp:

Sep 5, 2007, 9:58:05 AM (18 years ago)

Author:

cmv

Message:

intro SchechterMassDist pour accelerer la simulations cmv 05/09/2007

File:

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

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -940 +940 @@
 }
 
+int_8 GeneFluct3D::MinMax(double& xmin,double& xmax,double vmin,double vmax)
+// Calcul des valeurs xmin et xmax dans le cube reel avec valeurs ]vmin,vmax[ extremites exclues
+{
+ bool tstval = (vmax>vmin)? true: false;
+ if(lp_>0) {
+   cout<<"--- MinMax";
+   if(tstval) cout<<"  range=]"<<vmin<<","<<vmax<<"[";
+   cout<<endl;
+ }
+ check_array_alloc();
+
+ int_8 n = 0;
+ xmin = xmax = data_[0];
+
+ for(long i=0;i<Nx_;i++) for(long j=0;j<Ny_;j++) for(long l=0;l<Nz_;l++) {
+   int_8 ip = IndexR(i,j,l);
+   double x = data_[ip];
+   if(tstval && (x<=vmin || x>=vmax)) continue;
+   if(x<xmin) xmin = x;
+   if(x>xmax) xmax = x;
+   n++;
+ }
+
+ if(lp_>0) cout<<"  n="<<n<<" min="<<xmin<<" max="<<xmax<<endl;
+
+ return n;
+}
+
 int_8 GeneFluct3D::MeanSigma2(double& rm,double& rs2,double vmin,double vmax
                              ,bool useout,double vout)
@@ -1114 +1142 @@
        data_[ip] += m;
      }
+     sum += data_[ip];
+   }
+ }
+ if(lp_>0) cout<<sum<<" MSol HI mass put into survey"<<endl;
+
+ return sum;
+}
+
+double GeneFluct3D::TurnNGal2MassQuick(SchechterMassDist& schmdist)
+// idem TurnNGal2Mass mais beaucoup plus rapide
+{
+ if(lp_>0) cout<<"--- TurnNGal2MassQuick ---"<<endl;
+ check_array_alloc();
+
+ double sum = 0.;
+ for(long i=0;i<Nx_;i++) for(long j=0;j<Ny_;j++) for(long l=0;l<Nz_;l++) {
+   int_8 ip = IndexR(i,j,l);
+   double v = data_[ip];
+   if(v>0.) {
+     long ngal = long(v+0.1);
+     data_[ip] = schmdist.TirMass(ngal);
      sum += data_[ip];
    }