Changeset 3281 in Sophya for trunk/Cosmo/SimLSS

Timestamp:

Jul 10, 2007, 7:23:38 PM (18 years ago)

Author:

cmv

Message:

ecriture fichiers de tranches du cube cmv 10/07/2007

Location:

trunk/Cosmo/SimLSS

Files:

• Makefile (modified) (1 diff)
• cmvobserv3d.cc (modified) (10 diffs)
• genefluct3d.cc (modified) (2 diffs)
• genefluct3d.h (modified) (1 diff)

trunk/Cosmo/SimLSS/Makefile

@@ -11 +11 @@
 
 MYEXTINC = ${EXTLIBDIR}/Include
-MYLIB = $(SOPHYAEXTSLBLIST) -L$(LIB) -lcmvsimbao -lfftw3 -lm
-#MYLIB = $(SOPHYAEXTSLBLIST) -L$(LIB) -lcmvsimbao -lfftw3_threads -lfftw3 -lm
+#MYLIB = $(SOPHYAEXTSLBLIST) -L$(LIB) -lcmvsimbao -lfftw3 -lm
+MYLIB = $(SOPHYAEXTSLBLIST) -L$(LIB) -lcmvsimbao -lfftw3_threads -lfftw3 -lm
 
 #---- Les programmes utilitaires de calcul de cartes

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -39 +39 @@
      <<" -W : write cube in FITS format (complex cube is coded as real cube)"<<endl
      <<" -P : write cube in PPF format"<<endl
+     <<" -S : write cube slices in PPF format"<<endl
      <<" -V : compute variance from real space (for check, default: no)"<<endl
+     <<" -T nth : nombre de threads (si compil multi-thread, default: 0)"<<endl
      <<endl;
 }
@@ -91 +93 @@
  bool computefourier0=false;
  bool use_growth_factor = false;
- unsigned short nthread=4;
+ unsigned short nthread=0;
 
  // *** What to do
@@ -97 +99 @@
  bool wfits = false;
  bool wppf = false;
+ bool wslice = false;
  bool compvarreal = false;
 
@@ -106 +109 @@
 
  char c;
- while((c = getopt(narg,arg,"ha0PWV2Gx:y:z:s:Z:M:A:")) != -1) {
+ while((c = getopt(narg,arg,"ha0PWSV2Gx:y:z:s:Z:M:A:T:")) != -1) {
+  int nth = 0;
   switch (c) {
   case 'a' :
@@ -150 +154 @@
   case 'P' :
     wppf = true;
+    break;
+  case 'S' :
+    wslice = true;
+    break;
+  case 'T' :
+    sscanf(optarg,"%d",&nth);
+    nthread = (nth<1)? 0: nth;
     break;
   case 'h' :
@@ -410 +421 @@
    PrtTim(">>>> End WritePPF");
  }
+ if(wslice) {
+   fluct3d.WriteSlicePPF("cmvobserv3d_s_r0.ppf");
+   PrtTim(">>>> End WriteSlicePPF");
+ }
 
  int_8 nm;
@@ -448 +463 @@
    nm = fluct3d.MeanSigma2(rm,rs2,0.,1e200,true,0.);
  PrtTim(">>>> End Apply poisson on galaxy number");
+ if(wslice) {
+   fluct3d.WriteSlicePPF("cmvobserv3d_s_rn.ppf");
+   PrtTim(">>>> End WriteSlicePPF");
+ }
 
  cout<<"\n--- Convert Galaxy number to HI mass"<<endl;
@@ -479 +498 @@
    PrtTim(">>>> End WritePPF");
  }
+ if(wslice) {
+   fluct3d.WriteSlicePPF("cmvobserv3d_s_r.ppf");
+   PrtTim(">>>> End WriteSlicePPF");
+ }
 
  if(do_agn) {
@@ -502 +525 @@
    fluct3d.WritePPF("cmvobserv3d_rf.ppf",true);
    PrtTim(">>>> End WritePPF");
+ }
+ if(wslice) {
+   fluct3d.WriteSlicePPF("cmvobserv3d_s_rf.ppf");
+   PrtTim(">>>> End WriteSlicePPF");
  }
 
@@ -591 +618 @@
 
 ######################################################
+openppf cmvobserv3d_s_r0.ppf
+openppf cmvobserv3d_s_rn.ppf
+openppf cmvobserv3d_s_r.ppf
+openppf cmvobserv3d_s_rf.ppf
+
+######################################################
 openppf cmvobserv3d.ppf
 

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -25 +25 @@
 #include "genefluct3d.h"
 
-//#define FFTW_THREAD
+#define FFTW_THREAD
 
 #define MODULE2(_x_) ((double)((_x_).real()*(_x_).real() + (_x_).imag()*(_x_).imag()))
@@ -437 +437 @@
    init_fftw();
    SetObservator(zref,kzref);
+ } catch (PThrowable & exc) {
+   cout<<"Exception : "<<(string)typeid(exc).name()
+       <<" - Msg= "<<exc.Msg()<<endl;
+   return;
+ } catch (...) {
+   cout<<" some other exception was caught !"<<endl;
+   return;
+ }
+}
+
+void GeneFluct3D::WriteSlicePPF(string cfname)
+// On ecrit 3 tranches du cube selon chaque axe
+{
+ cout<<"--- GeneFluct3D::WriteSlicePPF: Writing Cube Slices"<<cfname<<endl;
+ try {
+
+   POutPersist pos(cfname.c_str());
+   TMatrix<r_4> S;
+   char str[16];
+   long i,j,l;
+
+   // Tranches en Z
+   for(int s=0;s<3;s++) {
+     S.ReSize(Nx_,Ny_);
+     if(s==0) l=0; else if(s==1) l=(Nz_+1)/2; else  l=Nz_-1;
+     sprintf(str,"z%d",l);
+     for(i=0;i<Nx_;i++) for(j=0;j<Ny_;j++) S(i,j)=data_[IndexR(i,j,l)];
+     pos<<PPFNameTag(str)<<S; S.RenewObjId();
+   }
+
+   // Tranches en Y
+   for(int s=0;s<3;s++) {
+     S.ReSize(Nz_,Nx_);
+     if(s==0) j=0; else if(s==1) j=(Ny_+1)/2; else  j=Ny_-1;
+     sprintf(str,"y%d",j);
+     for(i=0;i<Nx_;i++) for(l=0;l<Nz_;l++) S(l,i)=data_[IndexR(i,j,l)];
+     pos<<PPFNameTag(str)<<S; S.RenewObjId();
+   }
+
+   // Tranches en X
+   for(int s=0;s<3;s++) {
+     S.ReSize(Nz_,Ny_);
+     if(s==0) i=0; else if(s==1) i=(Nx_+1)/2; else  i=Nx_-1;
+     sprintf(str,"x%d",i);
+     for(j=0;j<Ny_;j++) for(l=0;l<Nz_;l++) S(l,j)=data_[IndexR(i,j,l)];
+     pos<<PPFNameTag(str)<<S; S.RenewObjId();
+   }
+
  } catch (PThrowable & exc) {
    cout<<"Exception : "<<(string)typeid(exc).name()

trunk/Cosmo/SimLSS/genefluct3d.h

@@ -100 +100 @@
   void WritePPF(string cfname,bool write_real=true);
   void ReadPPF(string cfname);
+  void WriteSlicePPF(string cfname);
 
   void SetPrtLevel(int lp=0) {lp_ = lp;}