Changeset 3952 in Sophya for trunk/Cosmo/SimLSS/cosmocalc.h

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/cosmocalc.h (modified) (4 diffs)

trunk/Cosmo/SimLSS/cosmocalc.h

@@ -25 +25 @@
   void PrtInteg(void);
 
-  void SetDynParam(double h100,double om0,double or0,double ol0,double w0=-1.);
+  void SetDynParam(double h100,double om0,double or0,double ol0,double w0=-1.,double wa=0.);
   void SetObaryon0(double v);
   void DefaultParam(void);
@@ -34 +34 @@
   inline double Olambda0(void) {return _Olambda0;}
   inline double W0(void) {return _W0;}
+  inline double Wa(void) {return _Wa;}
   inline double Omatter0(void) {return _Omatter0;}
   inline double Obaryon0(void) {return _Obaryon0;}
@@ -43 +44 @@
   inline double H(double z) {return _H0 * E(z);}
   double Olambda(double z);
+  inline double W(double z) {return _W0 + _Wa * z/(1.+z);} // W(z) = W0 + Wa*(1-a)
   double Omatter(double z);
   double Obaryon(double z);
@@ -76 +78 @@
   unsigned short _flat;
   double _h100, _H0;  /* km/s/Mpc */
-  double _Olambda0,_W0;
+  double _Olambda0,_W0,_Wa;
   double _Omatter0,_Obaryon0;
   double _Orelat0;