Changeset 3572 in Sophya for trunk/Cosmo/SimLSS/genefluct3d.cc

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

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

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -106 +106 @@
                 <<" D="<<dx<<","<<dy<<","<<dz<<endl;
  if(nx<=0 || dx<=0.) {
-   char *bla = "GeneFluct3D::setsize_Error: bad value(s) for nn/dx";
+   const char *bla = "GeneFluct3D::setsize_Error: bad value(s) for nn/dx";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -228 +228 @@
  if(kredshref<0.) {
    if(Nz_<=0) {
-     char *bla = "GeneFluct3D::SetObservator_Error: for kredsh_ref<0 define cube geometry first";
+     const char *bla = "GeneFluct3D::SetObservator_Error: for kredsh_ref<0 define cube geometry first";
      cout<<bla<<endl; throw ParmError(bla);
    }
@@ -265 +265 @@
 
  if(cosmo_ == NULL || redsh_ref_<0.) {
-   char *bla = "GeneFluct3D::LosComRedshift_Error: set Observator and Cosmology first";
+   const char *bla = "GeneFluct3D::LosComRedshift_Error: set Observator and Cosmology first";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -561 +561 @@
   else if(array_type==2) nvar = 4;
   else return;
-  char *vname[4] = {"t","z","re","im"};
+  const char *vname[4] = {"t","z","re","im"};
   float xnt[4];
   NTuple nt(nvar,vname);
@@ -852 +852 @@
 
  if(growth_ == NULL) {
-   char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: set GrowthFactor first";
+   const char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: set GrowthFactor first";
    cout<<bla<<endl; throw ParmError(bla);
  }
  if(type_evol<1 || type_evol>2) {
-   char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: bad type_evol value";
+   const char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: bad type_evol value";
    cout<<bla<<endl; throw ParmError(bla);
  }
 
  InterpFunc interpinv(loscom2zred_min_,loscom2zred_max_,loscom2zred_);
- unsigned short ok;
+ //unsigned short ok;
 
  //CHECK: Histo hgr(0.9*zred_[0],1.1*zred_[n-1],1000);
@@ -1421 +1421 @@
  if(type_evol<0) type_evol = 0;
  if(type_evol>2) {
-   char *bla = "GeneFluct3D::AddNoise2Real_Error: bad type_evol value";
+   const char *bla = "GeneFluct3D::AddNoise2Real_Error: bad type_evol value";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -1436 +1436 @@
    //      Mlim ~ sqrt(DNu) * (Dlum)^2 / Dtrcom
    if(cosmo_ == NULL || redsh_ref_<0.| loscom2zred_.size()<1) {
-     char *bla = "GeneFluct3D::AddNoise2Real_Error: set Observator and Cosmology first";
+     const char *bla = "GeneFluct3D::AddNoise2Real_Error: set Observator and Cosmology first";
      cout<<bla<<endl; throw ParmError(bla);
    }