Changeset 3952 in Sophya for trunk/Cosmo/SimLSS/cmvtuniv.cc

Timestamp:

Feb 22, 2011, 4:32:25 PM (15 years ago)

Author:

cmv

Message:

ajout evolution de w, cmv 22/02/2011

File:

• trunk/Cosmo/SimLSS/cmvtuniv.cc (modified) (7 diffs)

trunk/Cosmo/SimLSS/cmvtuniv.cc

@@ -27 +27 @@
  <<"cmvtuniv [options] z1,z2"<<endl
  <<"  -D dz"<<endl
- <<"  -U h100,om0,or0,ol0,w0"<<endl
+ <<"  -U h100,om0,or0,ol0,w0,wa"<<endl
  <<"  -F flat(0,1,2)"<<endl
  <<"  -I perc,dzinc,dzmax,glorder"<<endl
@@ -44 +44 @@
  unsigned short flat = 0;
  // -- WMAP
- double h100=0.71, om0=0.267804, or0=7.9e-05, ol0=0.73,w0=-1.;
+ double h100=0.71, om0=0.267804, or0=7.9e-05, ol0=0.73,w0=-1.,wa=0.;
  // -- ouvert matter only
- //double h100=0.71, om0=0.3, or0=0., ol0=0.,w0=-1.;
+ //double h100=0.71, om0=0.3, or0=0., ol0=0.,w0=-1,wa=0..;
  // -- plat matter only
- //double h100=0.71, om0=1., or0=0., ol0=0.,w0=-1.; flat = 1;
+ //double h100=0.71, om0=1., or0=0., ol0=0.,w0=-1.,wa=0.; flat = 1;
  // -- plat lambda only
- //double h100=0.71, om0=0., or0=0., ol0=1.,w0=-1.; flat = 2;
+ //double h100=0.71, om0=0., or0=0., ol0=1.,w0=-1.,wa=0.; flat = 2;
 
  // -- parametre d'integration
@@ -70 +70 @@
     break;
   case 'U' :
-    sscanf(optarg,"%lf,%lf,%lf,%lf,%lf",&h100,&om0,&or0,&ol0,&w0);
+    sscanf(optarg,"%lf,%lf,%lf,%lf,%lf,%lf",&h100,&om0,&or0,&ol0,&w0,&wa);
     break;
   case 'F' :
@@ -94 +94 @@
  cout<<"z1="<<z1<<"  z2="<<z2<<"  dz="<<dz<<endl;
  cout<<"perc="<<perc<<" dzinc="<<dzinc<<" dzmax="<<dzmax<<" glorder="<<glorder<<endl;
- cout<<"h100="<<h100<<" om0="<<om0<<" or0="<<or0<<" ol0="<<ol0<<" w0="<<w0<<" flat="<<flat<<endl;
+ cout<<"h100="<<h100<<" om0="<<om0<<" or0="<<or0<<" ol0="<<ol0<<" w0="<<w0<<" wa="<<wa<<" flat="<<flat<<endl;
  cout<<"todo ="<<todo<<endl;
 
  CosmoCalc univ1(flat,true,z2);
  univ1.SetInteg(perc,dzinc,dzmax,glorder);
- univ1.SetDynParam(h100,om0,or0,ol0,w0);
+ univ1.SetDynParam(h100,om0,or0,ol0,w0,wa);
  univ1.PrtInteg();
  univ1.Print();
@@ -108 +108 @@
    CosmoCalc univ2(flat,false,z2);
    univ2.SetInteg(perc,dzinc,dzmax,glorder);
-   univ2.SetDynParam(h100,om0,or0,ol0,w0);
+   univ2.SetDynParam(h100,om0,or0,ol0,w0,wa);
    univ2.PrtInteg();
    univ2.Print();
@@ -115 +115 @@
  else if(todo==3) tstspeed(univ1,z1,z2,dz);
  else if(todo==4) tstntuple(univ1,z1,z2,dz);
- else if(todo==5)tstinterp(univ1,z1,z2,dz);
+ else if(todo==5) tstinterp(univ1,z1,z2,dz);
  else cout<<"Unknown job to be done !!!!!  todo="<<todo<<endl;
 
@@ -215 +215 @@
    nt.Fill(xnt);
  }
+
  cout<<">>>> Ecriture"<<endl;
+ nt.Info()["flat"] = univ.Flat();
+ nt.Info()["h100"] = univ.h100();
+ nt.Info()["Olambda0"] = univ.Olambda0();
+ nt.Info()["W0"] = univ.W0();
+ nt.Info()["Wa"] = univ.Wa();
+ nt.Info()["Omatter0"] = univ.Omatter0();
+ nt.Info()["Obaryon0"] = univ.Obaryon0();
+ nt.Info()["Orelat0"] = univ.Orelat0();
+ nt.Info()["Ocurv0"] = univ.Ocurv0();
+ nt.Info()["Otot0"] = univ.Otot0();
+ nt.Info()["ZMax"] = univ.ZMax();
+
  string tag = "cmvtuniv_nt.ppf";
  POutPersist pos(tag);