guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed unit_vel in Ramses. Added a new type alias in FourierMap

Browse Source
This commit is contained in:
Guilhem Lavaux 2014-04-02 09:52:06 +02:00
parent a2373d8919
commit 9ae42a2442
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fourier/base_types.hpp
View File

@ -55,6 +55,7 @@ namespace CosmoTool
protected: protected:
SpectrumFunction() {} SpectrumFunction() {}
public: public:
typedef T type;
typedef Eigen::Array<T, 1, Eigen::Dynamic> VecType; typedef Eigen::Array<T, 1, Eigen::Dynamic> VecType;
typedef Eigen::Map<VecType, Eigen::Aligned> MapType; typedef Eigen::Map<VecType, Eigen::Aligned> MapType;
typedef Eigen::Map<VecType const, Eigen::Aligned> ConstMapType; typedef Eigen::Map<VecType const, Eigen::Aligned> ConstMapType;
@ -88,6 +89,7 @@ namespace CosmoTool
FourierMap() {} FourierMap() {}
public: public:
typedef T type;
typedef Eigen::Array<T, 1, Eigen::Dynamic> VecType; typedef Eigen::Array<T, 1, Eigen::Dynamic> VecType;
typedef Eigen::Map<VecType, Eigen::Aligned> MapType; typedef Eigen::Map<VecType, Eigen::Aligned> MapType;
typedef Eigen::Map<VecType const, Eigen::Aligned> ConstMapType; typedef Eigen::Map<VecType const, Eigen::Aligned> ConstMapType;
@ -190,6 +192,7 @@ namespace CosmoTool
class MapUtilityFunction class MapUtilityFunction
{ {
public: public:
typedef T type;
typedef SpectrumFunction<T> Spectrum; typedef SpectrumFunction<T> Spectrum;
typedef boost::shared_ptr<Spectrum> Spectrum_ptr; typedef boost::shared_ptr<Spectrum> Spectrum_ptr;
typedef FourierMap<std::complex<T> > FMap; typedef FourierMap<std::complex<T> > FMap;

2
src/loadRamses.cpp
View File

@ -309,7 +309,7 @@ CosmoTool::SimuData *CosmoTool::loadRamsesSimu(const char *basename, int outputI
double hubble = info.aexp*info.aexp/info.unit_t / (1e5/CM_IN_MPC); double hubble = info.aexp*info.aexp/info.unit_t / (1e5/CM_IN_MPC);
double L0 = info.boxSize*info.unitLength*hubble/100/CM_IN_MPC/info.aexp; double L0 = info.boxSize*info.unitLength*hubble/100/CM_IN_MPC/info.aexp;
double unit_vel = L0*hubble/info.aexp; double unit_vel = L0*100/info.aexp;
while (1) while (1)
{ {