[Debian-astro-commits] [gyoto] 46/221: Port to current Lorene (with namespace), remove linking against liblorenef77
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit ec9accf5215558b315f5a7fb05773cc6d9217056
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Mon Oct 13 21:53:38 2014 +0200
Port to current Lorene (with namespace), remove linking against liblorenef77
---
configure | 2 +-
configure.ac | 2 +-
include/GyotoNumericalMetricLorene.h | 53 +++++++++++++++++++-----------------
include/GyotoRotStar3_1.h | 6 ++--
lib/NumericalMetricLorene.C | 2 ++
lib/RotStar3_1.C | 4 ++-
6 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/configure b/configure
index a1d1276..5d8ffc4 100755
--- a/configure
+++ b/configure
@@ -18416,7 +18416,7 @@ conftest.make:
%: conftest.make
@echo \$(\$@)
_ACEOF
- LORENELDFLAGS="-L$HOME_LORENE/Lib -llorene -llorenef77"
+ LORENELDFLAGS="-L$HOME_LORENE/Lib -llorene"
LORENELDFLAGS="$LORENELDFLAGS `$MAKE_S HOME_LORENE=$HOME_LORENE -f conftest.make LIB_LAPACK | tr -d '\n\r'`"
LORENELDFLAGS="$LORENELDFLAGS `$MAKE_S HOME_LORENE=$HOME_LORENE -f conftest.make LIB_GSL | tr -d '\n\r'`"
LORENELDFLAGS="$LORENELDFLAGS `$MAKE_S HOME_LORENE=$HOME_LORENE -f conftest.make LIB_PGPLOT | tr -d '\n\r'`"
diff --git a/configure.ac b/configure.ac
index a0a053d..0cfb721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,7 +621,7 @@ conftest.make:
%: conftest.make
@echo \$(\$@)
_ACEOF
- LORENELDFLAGS="-L$HOME_LORENE/Lib -llorene -llorenef77"
+ LORENELDFLAGS="-L$HOME_LORENE/Lib -llorene"
LORENELDFLAGS="$LORENELDFLAGS `$MAKE_S HOME_LORENE=$HOME_LORENE -f conftest.make LIB_LAPACK | tr -d '\n\r'`"
LORENELDFLAGS="$LORENELDFLAGS `$MAKE_S HOME_LORENE=$HOME_LORENE -f conftest.make LIB_GSL | tr -d '\n\r'`"
LORENELDFLAGS="$LORENELDFLAGS `$MAKE_S HOME_LORENE=$HOME_LORENE -f conftest.make LIB_PGPLOT | tr -d '\n\r'`"
diff --git a/include/GyotoNumericalMetricLorene.h b/include/GyotoNumericalMetricLorene.h
index 8c5dd9b..5cc2b18 100644
--- a/include/GyotoNumericalMetricLorene.h
+++ b/include/GyotoNumericalMetricLorene.h
@@ -22,10 +22,13 @@ namespace Gyoto {
class FactoryMessenger;
}
-class Scalar;
-class Vector;
-class Sym_tensor;
-class Valeur;
+// Forward declarations of Lorene classes
+namespace Lorene {
+ class Scalar;
+ class Vector;
+ class Sym_tensor;
+ class Valeur;
+}
#include <GyotoMetric.h>
#include <GyotoWorldline.h>
@@ -57,17 +60,17 @@ class Gyoto::Metric::NumericalMetricLorene
double h0_refine_; ///< Imposed integration step for refined integration
int refine_; ///< 1 if refined integration needed
double initial_time_; ///< Time at which (first) metric is given
- Scalar** lapse_tab_;
- Vector** shift_tab_;
- Sym_tensor** gamcov_tab_;
- Sym_tensor** gamcon_tab_;
- Sym_tensor** kij_tab_;
+ Lorene::Scalar** lapse_tab_;
+ Lorene::Vector** shift_tab_;
+ Lorene::Sym_tensor** gamcov_tab_;
+ Lorene::Sym_tensor** gamcon_tab_;
+ Lorene::Sym_tensor** kij_tab_;
double* times_; ///< Coordinate times at which metrics are given
int nb_times_; ///< Nb of time slices
- Valeur** nssurf_tab_; ///< Metric source (e.g. star) surface (if any)
- Vector** vsurf_tab_; ///< 4-velocity at surface (if any)
- Scalar** lorentz_tab_; ///< Lorentz factor at surface (if any)
- Valeur** hor_tab_; ///< Apparent horizon (if any)
+ Lorene::Valeur** nssurf_tab_; ///< Metric source (e.g. star) surface (if any)
+ Lorene::Vector** vsurf_tab_; ///< 4-velocity at surface (if any)
+ Lorene::Scalar** lorentz_tab_; ///< Lorentz factor at surface (if any)
+ Lorene::Valeur** hor_tab_; ///< Apparent horizon (if any)
double risco_; ///< ISCO coordinate radius
double rmb_; ///< Marginally bound orbit coordinate radius
@@ -84,22 +87,22 @@ class Gyoto::Metric::NumericalMetricLorene
*/
virtual void setMetricSource();
char const * getFileName() const;
- Vector** getShift_tab() const;
- Scalar** getLapse_tab() const;
- Sym_tensor** getGamcon_tab() const;
+ Lorene::Vector** getShift_tab() const;
+ Lorene::Scalar** getLapse_tab() const;
+ Lorene::Sym_tensor** getGamcon_tab() const;
double* getTimes() const;
int getNbtimes() const;
- Valeur** getNssurf_tab() const;
- Vector** getVsurf_tab() const;
- Scalar** getLorentz_tab() const;
- Valeur** getHor_tab() const;
+ Lorene::Valeur** getNssurf_tab() const;
+ Lorene::Vector** getVsurf_tab() const;
+ Lorene::Scalar** getLorentz_tab() const;
+ Lorene::Valeur** getHor_tab() const;
double getRisco() const;
double getRmb() const;
- void setLapse_tab(Scalar* lapse, int ii);
- void setShift_tab(Vector* shift, int ii);
- void setGamcov_tab(Sym_tensor* gamcov, int ii);
- void setGamcon_tab(Sym_tensor* gamcon, int ii);
- void setKij_tab(Sym_tensor* kij, int ii);
+ void setLapse_tab(Lorene::Scalar* lapse, int ii);
+ void setShift_tab(Lorene::Vector* shift, int ii);
+ void setGamcov_tab(Lorene::Sym_tensor* gamcov, int ii);
+ void setGamcon_tab(Lorene::Sym_tensor* gamcon, int ii);
+ void setKij_tab(Lorene::Sym_tensor* kij, int ii);
void setTimes(double time,int ii);
/**
diff --git a/include/GyotoRotStar3_1.h b/include/GyotoRotStar3_1.h
index 1cab1ed..fdc92ae 100644
--- a/include/GyotoRotStar3_1.h
+++ b/include/GyotoRotStar3_1.h
@@ -31,7 +31,9 @@
#include <iostream>
#include <fstream>
-class Star_rot;
+namespace Lorene{
+ class Star_rot;
+}
namespace Gyoto {
namespace Metric { class RotStar3_1; }
@@ -54,7 +56,7 @@ class Gyoto::Metric::RotStar3_1 : public Gyoto::Metric::Generic {
private:
char* filename_; ///< Lorene output file name
- Star_rot * star_; ///< Pointer to underlying Lorene Star_rot instance
+ Lorene::Star_rot * star_; ///< Pointer to underlying Lorene Star_rot instance
int integ_kind_;///< 1 if RotStar3_1::myrk4(), 0 if Metric::myrk4()
public:
diff --git a/lib/NumericalMetricLorene.C b/lib/NumericalMetricLorene.C
index 8afe3f3..443f4de 100644
--- a/lib/NumericalMetricLorene.C
+++ b/lib/NumericalMetricLorene.C
@@ -6,6 +6,8 @@
#include "graphique.h"
#include "cmp.h"
+using namespace Lorene;
+
//Gyoto headers
#include "GyotoUtils.h"
#include "GyotoNumericalMetricLorene.h"
diff --git a/lib/RotStar3_1.C b/lib/RotStar3_1.C
index e5e6cff..f904822 100644
--- a/lib/RotStar3_1.C
+++ b/lib/RotStar3_1.C
@@ -25,6 +25,8 @@
#include "nbr_spx.h"
#include "unites.h"
+using namespace Lorene;
+
#include "GyotoUtils.h"
#include "GyotoRotStar3_1.h"
#include "GyotoError.h"
@@ -95,7 +97,7 @@ void RotStar3_1::fileName(char const * lorene_res) {
Mg3d* mg = new Mg3d(resfile);
Map_et* mps = new Map_et(*mg,resfile);
Eos* p_eos = Eos::eos_from_file(resfile);
- star_ = new Star_rot(*mps,*p_eos,resfile);
+ star_ = new Lorene::Star_rot(*mps,*p_eos,resfile);
star_ -> equation_of_state();
star_ -> update_metric();
star_ -> hydro_euler();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list