Changeset 3325 in Sophya for trunk/Cosmo


Ignore:
Timestamp:
Sep 13, 2007, 5:20:29 PM (18 years ago)
Author:
cmv
Message:

Mise en conformite / SOPHYA lib:

  1. on enleve #include "sopnamsp.h" dans les .cc de la librairie
  2. on encadre par "namespace SOPHYA { ... }" tout le code des .cc de la librairie y compris les fonctions
  3. on met les fcts des .h dans le "namespace SOPHYA { ... }"
  4. on met #include "sopnamsp.h" dans tous les cmv*.cc cad les main programs

cmv le mauvais eleve (sur les conseils de Reza) 13/09/2007

Location:
trunk/Cosmo/SimLSS
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Cosmo/SimLSS/agnjackson.cc

    r3260 r3325  
    1 #include "sopnamsp.h"
    21#include "machdefs.h"
    32#include <iostream>
    … …  
    1615#include "agnjackson.h"
    1716
     17namespace SOPHYA {
    1818
    1919AGNJackson::AGNJackson(void)
    … …  
    9595  yjack = yjack_;
    9696}
     97
     98}  // Fin namespace SOPHYA

  • trunk/Cosmo/SimLSS/agnjackson.h

    r3196 r3325  
    3535};
    3636
    37 }
     37}  // Fin namespace SOPHYA
    3838
    3939#endif

  • trunk/Cosmo/SimLSS/cosmocalc.cc

    r3285 r3325  
    1 #include "sopnamsp.h"
    21#include "machdefs.h"
    32#include <iostream>
    … …  
    1514#include "geneutils.h"
    1615
     16namespace SOPHYA {
    1717
    1818///////////////////////////////////////////////////////////
    … …  
    456456  return _nspl;
    457457}
     458
     459}  // Fin namespace SOPHYA

  • trunk/Cosmo/SimLSS/cosmocalc.h

    r3312 r3325  
    9696};
    9797
    98 } // Fin du namespace
     98} // Fin du namespace SOPHYA
    9999
    100100#endif

  • trunk/Cosmo/SimLSS/genefluct3d.cc

    r3320 r3325  
    1 #include "sopnamsp.h"
    21#include "machdefs.h"
    32#include <iostream>
    … …  
    2827
    2928#define MODULE2(_x_) ((double)((_x_).real()*(_x_).real() + (_x_).imag()*(_x_).imag()))
     29
     30namespace SOPHYA {
    3031
    3132//-------------------------------------------------------
    … …  
    13231324 if(intercor!=NULL) delete intercor;
    13241325}
     1326
     1327}  // Fin namespace SOPHYA

  • trunk/Cosmo/SimLSS/genefluct3d.h

    r3320 r3325  
    169169};
    170170
    171 } // Fin du namespace
     171} // Fin du namespace SOPHYA
    172172
    173173#endif

  • trunk/Cosmo/SimLSS/genericfunc.h

    r3141 r3325  
    4040};
    4141
    42 }
     42}  // Fin namespace SOPHYA
    4343
    4444#endif

  • trunk/Cosmo/SimLSS/geneutils.cc

    r3320 r3325  
    1 #include "sopnamsp.h"
    21#include "machdefs.h"
    32#include <iostream>
    … …  
    1514
    1615#include "geneutils.h"
     16
     17namespace SOPHYA {
    1718
    1819//-------------------------------------------------------------------
    … …  
    461462   }
    462463}
     464
     465}  // Fin namespace SOPHYA

  • trunk/Cosmo/SimLSS/geneutils.h

    r3196 r3325  
    7676};
    7777
    78 }
    79 
    8078//----------------------------------------------------
    8179double InterpTab(double x0,vector<double>& X,vector<double>& Y,unsigned short typint=0);
    … …  
    10199void Compute_GaussLeg(unsigned short glorder,vector<double>& x,vector<double>& w,double x1=0.,double x2=1.);
    102100
     101}  // Fin namespace SOPHYA
     102
    103103#endif

  • trunk/Cosmo/SimLSS/pkspectrum.cc

    r3318 r3325  
    1 #include "sopnamsp.h"
    21#include "machdefs.h"
    32#include <iostream>
    … …  
    1413#include "pkspectrum.h"
    1514
     15namespace SOPHYA {
    1616
    1717///////////////////////////////////////////////////////////
    … …  
    668668  return rc;
    669669}
     670
     671}  // Fin namespace SOPHYA

  • trunk/Cosmo/SimLSS/pkspectrum.h

    r3318 r3325  
    145145};
    146146
    147 } // Fin du namespace
     147} // Fin du namespace SOPHYA
    148148
    149149#endif

  • trunk/Cosmo/SimLSS/planckspectra.cc

    r3115 r3325  
    1 #include "sopnamsp.h"
    21#include "machdefs.h"
    32#include <iostream>
    … …  
    1110#include "constcosmo.h"
    1211#include "planckspectra.h"
     12
     13namespace SOPHYA {
    1314
    1415/*
    … …  
    336337  return xmax;
    337338}
     339
     340}  // Fin namespace SOPHYA

  • trunk/Cosmo/SimLSS/planckspectra.h

    r3115 r3325  
    4141};
    4242
    43 } // Fin du namespace
     43} // Fin du namespace SOPHYA
    4444
    4545#endif

  • trunk/Cosmo/SimLSS/schechter.cc

    r3320 r3325  
    1 #include "sopnamsp.h"
    21#include "machdefs.h"
    32#include <iostream>
    … …  
    1615#include "geneutils.h"
    1716#include "schechter.h"
     17
     18namespace SOPHYA {
    1819
    1920///////////////////////////////////////////////////////////
    … …  
    401402}
    402403
    403 
    404404///////////////////////////////////////////////////////////
    405405//***************** Fonctions de Check ******************//
    … …  
    457457}
    458458
     459
     460}  // Fin namespace SOPHYA

  • trunk/Cosmo/SimLSS/schechter.h

    r3320 r3325  
    8989};
    9090
    91 } // Fin du namespace
    92 
    9391//-----------------------------------------------------------------------------------
    9492bool IsCompatible(Schechter& sch1,Schechter& sch2,double eps=1.e-4);
    … …  
    9896double FluxHI2Msol(double f,double d);
    9997
     98} // Fin du namespace SOPHYA
     99
    100100#endif
Note: See TracChangeset for help on using the changeset viewer.