Changeset 3317 in Sophya for trunk/Cosmo/SimLSS

Timestamp:

Aug 28, 2007, 11:40:41 AM (18 years ago)

Author:

cmv

Message:

hu_power et hu_tf_fit NE PEUVENT ETRE apples dans le meme program sans interferer l'un avec l'autre cvstatcvstat cmv 28/08/2007

Location:

trunk/Cosmo/SimLSS

Files:

• Makefile (modified) (2 diffs)
• cmvchkwhu.cc (modified) (9 diffs)

trunk/Cosmo/SimLSS/Makefile

@@ -204 +204 @@
 cmvchkwhu: $(EXE)cmvchkwhu
         echo $@ " done"
-$(EXE)cmvchkwhu: $(OBJ)cmvchkwhu.o $(OBJ)hu_tf_fit.o $(OBJ)hu_power.o $(LIBR)
-        $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvchkwhu.o $(OBJ)hu_tf_fit.o $(OBJ)hu_power.o $(MYLIB) 
+$(EXE)cmvchkwhu: $(OBJ)cmvchkwhu.o $(OBJ)hu_tf_fit.o $(LIBR)
+        $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvchkwhu.o $(OBJ)hu_tf_fit.o $(MYLIB) 
 $(OBJ)cmvchkwhu.o: cmvchkwhu.cc
         $(CXXCOMPILE) $(CXXREP) -I$(MYEXTINC) -o $@ cmvchkwhu.cc
 $(OBJ)hu_tf_fit.o: hu_tf_fit.c hu_tf_fit.h
         $(CCOMPILE) -o $@ hu_tf_fit.c
-$(OBJ)hu_power.o: hu_power.c hu_power.h
-        $(CCOMPILE) -o $@ hu_power.c
 
 hu_sigma8: $(EXE)hu_sigma8
@@ -219 +217 @@
 $(OBJ)hu_sigma8.o: hu_sigma8.c
         $(CCOMPILE) -o $@ hu_sigma8.c
+$(OBJ)hu_power.o: hu_power.c hu_power.h
+        $(CCOMPILE) -o $@ hu_power.c
 
 ##############################################################################

trunk/Cosmo/SimLSS/cmvchkwhu.cc

@@ -1 +1 @@
 // Check cmv / Wayne Hu coding of the transfert functions
+// ATTENTION: ne pas appeler hu_power.c ici car il ecrase les initialisations de hu_tf_fit.c
 #include "sopnamsp.h"
 #include "machdefs.h"
@@ -13 +14 @@
 #include "pkspectrum.h"
 #include "hu_tf_fit.h"
-#include "hu_power.h"
 
 int main(int narg,char *arg[])
@@ -19 +19 @@
  double k1 = 1e-6, k2 = 10.; int_4 npt = 10000;
  double h100 = 0.71, Om0 = 0.267804, Ob0 = 0.0444356, tcmb = T_CMB_Par;
- // Modele MDM (hu_power.c)  Eisenstein & Hu Apj 511 p5-15, 1999 (ou astro-ph/9710252)
- double Ohdm = 0.0, Ol0 = 0.7, redshift=0.;
- int degen_hdm = 0;
 
  cout<<"k1="<<k1<<"  k2="<<k2<<" npt="<<npt<<endl;
@@ -45 +42 @@
  TransfertEisenstein Tnob(h100,Om0,0.,tcmb,true,1);
 
- cout<<endl<<"TFmdm_set_cosm"<<endl;
- int rcmdm = TFmdm_set_cosm(Om0,Ob0,Ohdm,degen_hdm,Ol0,h100,redshift);
- cout<<"  rc="<<rcmdm<<endl;
-
  cout<<endl<<"Compare kpeak"<<endl;
  double kpeak = Tfull.KPeak();
@@ -54 +47 @@
  cout<<"kpeak = "<<kpeak<<" "<<kpeakhu<<"  Mpc^-1  -> diff "<<kpeak-kpeakhu<<endl;
 
- const int n = 12;
+ const int n = 11;
  char *vname[n] = {"k","tf","tfnw","tfnb","tfc","tfb"
-                  ,"hutf","hutfnw","hutfnb","hutfc","hutfb"
-                  ,"hutfmdm"};
+                  ,"hutf","hutfnw","hutfnb","hutfc","hutfb"};
  NTuple nt(n,vname);
  double xnt[n];
@@ -76 +68 @@
    double hutfnw = TFnowiggles(Om0,fbaryon,h100,tcmb,k/h100);
    double hutfnb = TFzerobaryon(Om0,h100,tcmb,k/h100);
-   double hutfmdm = TFmdm_onek_mpc(k);
 
 
@@ -88 +79 @@
    xnt[1]=tf; xnt[2]=tfnw; xnt[3]=tfnb; xnt[4]=tfc; xnt[5]=tfb;
    xnt[6]=hutf; xnt[7]=hutfnw; xnt[8]=hutfnb; xnt[9]=hutfc; xnt[10]=hutfb;
-   xnt[11] = hutfmdm;
    nt.Fill(xnt);
  }
@@ -149 +139 @@
 n/plot nt.tfnw%$k ! ! "nsta connectpoints red same"
 n/plot nt.tfnb%$k ! ! "nsta connectpoints blue same"
-n/plot nt.hutfmdm%$k ! ! "nsta connectpoints green same"
 
 zone
@@ -155 +144 @@
 n/plot nt.hutf/hutfnw%$k hutfnw>0. ! "nsta connectpoints same blue"
 addline -1000 1 1000 1 "red"
+
+zone
+n/plot nt.tf/tfnb%$k tfnb>0. ! "nsta connectpoints"
+n/plot nt.hutf/hutfnb%$k hutfnb>0. ! "nsta connectpoints same blue"
+addline -1000 1 1000 1 "red"
 */