Changeset 3802 in Sophya for trunk/Cosmo

Timestamp:

Jul 22, 2010, 2:49:20 PM (15 years ago)

Author:

cmv

Message:

minor cosmetics, cmv 22/07/2010

Location:

trunk/Cosmo/SimLSS

Files:

• cmvrvloscor.cc (modified) (2 diffs)
• cmvtransf.cc (modified) (1 diff)
• pkspectrum.cc (modified) (3 diffs)
• pkspectrum.h (modified) (2 diffs)

trunk/Cosmo/SimLSS/cmvrvloscor.cc

@@ -368 +368 @@
 n/plot hpkrec2.val%sqrt(x*x+y*y) ! ! "nsta crossmarker3 logx"
 
+# les matrices 2D
+set n 0
+disp mx_$n
+newwin
+disp mxc_$n
+
 defscript tom
 del m2
@@ -376 +382 @@
 endscript
 
-# les matrices 2D
-set n 0
-disp mx_$n
-newwin
-disp mxc_$n
+###### Comparaison avec le spectre initial
+cd /home
+mkdir ok
+mkdir gene
+cd /home
+
+cd /ok
+openppf cmvrvloscor.ppf
+tom
+cd /home
+
+cd /gene
+openppf ginit3d_?_?p?_???.ppf
+tom
+cd /home
+
+h/oper / /ok/m2 /gene/m2 mdiff
+disp mdiff
  */

trunk/Cosmo/SimLSS/cmvtransf.cc

@@ -69 +69 @@
  TransfertEisenstein tfnob(h100,Om0-Ob0,Ob0,tcmb,true);  // No baryons
 
- TransfertTabulate tfcmbfast(h100,Om0-Ob0,Ob0);
+ TransfertTabulate tfcmbfast;
  bool cmbfastOK = false;
  if(fcmbfast.size()>0) {
    cout<<endl<<"TransfertTabulate for CMBfast"<<endl;
-   tfcmbfast.ReadCMBFast(fcmbfast);
+   tfcmbfast.ReadCMBFast(fcmbfast,h100,Om0-Ob0,Ob0);
    tfcmbfast.SetInterpTyp(1);
    if(tfcmbfast.NPoints()>0) cmbfastOK = true;

trunk/Cosmo/SimLSS/pkspectrum.cc

@@ -295 +295 @@
 ///////////////////////////////////////////////////////////
 
-TransfertTabulate::TransfertTabulate(double h100,double OmegaCDM0,double OmegaBaryon0)
-: Oc_(OmegaCDM0) , Ob_(OmegaBaryon0) , h100_(h100) , kmin_(1.) , kmax_(-1.)
-, interptyp_(0)
+TransfertTabulate::TransfertTabulate(void)
+: kmin_(1.) , kmax_(-1.) , interptyp_(0)
 {
 }
 
 TransfertTabulate::TransfertTabulate(TransfertTabulate& tf)
-: Oc_(tf.Oc_) , Ob_(tf.Ob_) , h100_(tf.h100_) , kmin_(tf.kmin_) , kmax_(tf.kmax_)
-, interptyp_(tf.interptyp_) , k_(tf.k_) , tf_(tf.tf_)
+: kmin_(tf.kmin_) , kmax_(tf.kmax_) , interptyp_(tf.interptyp_) , k_(tf.k_) , tf_(tf.tf_)
 {
 }
@@ -323 +321 @@
 }
 
-int TransfertTabulate::ReadCMBFast(string filename)
+int TransfertTabulate::ReadCMBFast(string filename,double h100,double OmegaCDM0,double OmegaBaryon0)
 {
  FILE *file = fopen(filename.c_str(),"r");
  if(file==NULL) return -1;
+ cout<<"TransfertTabulate::ReadCMBFast: fn="<<filename<<" h100="<<h100
+     <<" OmegaCDM0="<<OmegaCDM0<<" OmegaBaryon0="<<OmegaBaryon0<<endl;
 
  const int lenline = 512;
@@ -336 +336 @@
    double k,tc,tb,tf;
    sscanf(line,"%lf %lf %lf",&k,&tc,&tb);
-   k *= h100_;     // convert h^-1 Mpc  ->  Mpc
-   tf = (Oc_*tc+Ob_*tb)/(Oc_+Ob_);
+   k *= h100;     // convert h Mpc^-1  ->  Mpc^-1
+   tf = (OmegaCDM0*tc+OmegaBaryon0*tb)/(OmegaCDM0+OmegaBaryon0);
    if(tf>tmax) tmax = tf;
    k_.push_back(k);

trunk/Cosmo/SimLSS/pkspectrum.h

@@ -55 +55 @@
 class TransfertTabulate : public GenericFunc {
 public:
-  TransfertTabulate(double h100,double OmegaCDM0,double OmegaBaryon0);
+  TransfertTabulate(void);
   TransfertTabulate(TransfertTabulate& tf);
   virtual ~TransfertTabulate(void);
@@ -61 +61 @@
   int NPoints(void) {return k_.size();}
   void SetInterpTyp(int typ=0);
-  int ReadCMBFast(string filename);
+  int ReadCMBFast(string filename,double h100,double OmegaCDM0,double OmegaBaryon0);
 protected:
-  double Oc_,Ob_,h100_;
   double kmin_,kmax_;
   int interptyp_;