Changeset 3349 in Sophya for trunk/Cosmo/SimLSS/genefluct3d.h

Timestamp:

Oct 11, 2007, 4:39:58 PM (18 years ago)

Author:

cmv

Message:

• gros changements dans la structure de la classe GeneFluct3D (constructeur et logique d'aloocation memoire, init_fftw etc...)
• suppression des valeurs de masse<0 mises a -999. directement mises a zero
• suppression de TurnMass2HIMass qui fait maintenant la meme chose que TurnMass2MeanNumber
• legere restructuration de cmvobserv3d.cc pour compat.

cmv 11/10/2007

File:

• trunk/Cosmo/SimLSS/genefluct3d.h (modified) (5 diffs)

trunk/Cosmo/SimLSS/genefluct3d.h

@@ -24 +24 @@
 class GeneFluct3D {
 public:
-  GeneFluct3D(TArray< complex<r_8 > >& T);
+  GeneFluct3D(long nx,long ny,long nz,double dx,double dy,double dz,unsigned short nthread=0,int lp=0);  // Mpc
+  GeneFluct3D(unsigned short nthread=0);
   virtual ~GeneFluct3D(void);
 
-  void SetNThread(unsigned short nthread=0) {nthread_ = nthread;}
-  void SetSize(long nx,long ny,long nz,double dx,double dy,double dz);  // Mpc
   // Distance los comobile a l'observateur
   void SetObservator(double redshref=0.,double kredshref=0.);
@@ -111 +110 @@
 
   void TurnFluct2Mass(void);
-  double TurnMass2HIMass(double m_by_mpc3);
-  double TurnMass2MeanNumber(double n_by_mpc3);
+  double TurnMass2MeanNumber(double val_by_mpc3);
   double ApplyPoisson(void);
   double TurnNGal2Mass(FunRan& massdist,bool axeslog=false);
   double TurnNGal2MassQuick(SchechterMassDist& schmdist);
   double TurnMass2Flux(void);
-  void AddAGN(double lfjy,double lsigma,double powlaw=0.);
+  //void AddAGN(double lfjy,double lsigma,double powlaw=0.);
   void AddNoise2Real(double snoise,int type_evol=0);
 
@@ -133 +131 @@
 
 protected:
+  void init_default(void);
   void setsize(long nx,long ny,long nz,double dx,double dy,double dz);
   void setalloc(void);
   void setpointers(bool from_real);
   void init_fftw(void);
+  void delete_fftw(void);
   long manage_coefficients(void);
   double compute_power_carte(void);
@@ -157 +157 @@
 
   // la gestion de la FFT
+  bool is_set_fftw_plan;
   fftw_plan pf_,pb_;
   unsigned short nthread_;
@@ -163 +164 @@
   // le stockage du Cube de donnees et les pointeurs
   bool array_allocated_;  // true if array has been allocated
-  TArray< complex<r_8> >& T_;
+  TArray< complex<r_8> > T_;
   fftw_complex *fdata_;
   TArray<r_8> R_;