[Debian-astro-commits] [gyoto] 08/221: Removing DS_Store file
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:28 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 65e3700fa71ad2510fb42149db7e9fb3cc630cf8
Author: Frederic <frederic at MacFrederic.local>
Date: Wed Sep 3 16:07:55 2014 +0200
Removing DS_Store file
---
.gitignore | 8 ++++++++
aclocal.m4 | 3 +--
configure | 1 -
lib/Astrobj.C | 17 ++++++++++++++++-
lib/PolishDoughnut.C | 39 +++++++++++++++++++++++++++++----------
lib/WorldlineIntegState.C | 10 +++++++++-
6 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9c7e7fb..a652e69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,11 @@ yorick/yorick
yorick/setpaths.i
yorick/gyoto.info
yorick/yorick1
+*.aux
+*.bbl
+*.blg
+*.log
+*.out
+*.pdf
+*.toc
+
diff --git a/aclocal.m4 b/aclocal.m4
index 6dc027a..07ed599 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -573,8 +573,7 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi
-])
+fi])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff --git a/configure b/configure
index aa9ae4e..2adc9a7 100755
--- a/configure
+++ b/configure
@@ -3284,7 +3284,6 @@ END
fi
-
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/lib/Astrobj.C b/lib/Astrobj.C
index 08716d2..8e79052 100644
--- a/lib/Astrobj.C
+++ b/lib/Astrobj.C
@@ -295,7 +295,9 @@ void Generic::processHitQuantities(Photon* ph, double* coord_ph_hit,
double * Inu = new double[nbnuobs];
double * Taunu = new double[nbnuobs];
double * nuem = new double[nbnuobs];
+ // cout << "red fact= " << ggredm1 << endl;
for (size_t ii=0; ii<nbnuobs; ++ii) {
+ // cout << "i,nu= " << ii << " " << nuobs[ii] << endl;
nuem[ii]=nuobs[ii]*ggredm1;
}
GYOTO_DEBUG_ARRAY(nuobs, nbnuobs);
@@ -307,19 +309,32 @@ void Generic::processHitQuantities(Photon* ph, double* coord_ph_hit,
emission(Inu, nuem, nbnuobs, dsem, coord_ph_hit, coord_obj_hit);
}
for (size_t ii=0; ii<nbnuobs; ++ii) {
+ //cout << "i,nu= " << ii << " " << nuobs[ii] << endl;
inc = Inu[ii] * ph -> getTransmission(ii) * ggred*ggred*ggred;
+ //if (inc < 1.) inc = 0.; //TEST
# ifdef HAVE_UDUNITS
if (data -> spectrum_converter_)
inc = (*data -> spectrum_converter_)(inc);
# endif
data->spectrum[ii*data->offset] += inc;
-
if (!radiativeq_){
ph -> transmit(ii,transmission(nuem[ii],dsem,coord_ph_hit));
}else{
ph -> transmit(ii,Taunu[ii]);
}
+
+ double GYOTO_C2_CGS_M1= 1.1126500560536184087938986e-21;
+ double Msgr = gg_->mass()*1e3; // cgs
+ double delta_s =
+ dsem*GYOTO_G_CGS*Msgr*GYOTO_C2_CGS_M1; // cgs
+ double jnu = Inu[ii]/Taunu[ii]/delta_s/GYOTO_INU_CGS_TO_SI; // cgs
+ double anu = -log(Taunu[ii])/delta_s; // cgs
+ double depth = -log(ph -> getTransmission(ii));
+ /*if (depth > 1. && depth<10.) {
+ data->spectrum[ii*data->offset]=jnu/anu * GYOTO_INU_CGS_TO_SI * ggred*ggred*ggred; // in SI to fit the standard case
+ }*/
+ //cout << "in astrobj, opt dep, jnu*ds, Snu, data [all cgs]= " << depth << " " << Inu[ii]/Taunu[ii]/GYOTO_INU_CGS_TO_SI << " " << jnu/anu << " " << data->spectrum[ii*data->offset]/GYOTO_INU_CGS_TO_SI << endl;
# if GYOTO_DEBUG_ENABLED
GYOTO_DEBUG
diff --git a/lib/PolishDoughnut.C b/lib/PolishDoughnut.C
index 9bdc488..1e2da68 100644
--- a/lib/PolishDoughnut.C
+++ b/lib/PolishDoughnut.C
@@ -457,12 +457,14 @@ double PolishDoughnut::emissionSynchro_komissarov_PL_direction(
const {
// From Petrosian & McTiernan 1983, Phys. Fluids 26 (10), eq. 32
// cout << "stuff= " << number_density_PL << " " << nuem << " " << nuc << " " << theta_mag << endl;
+ double expoPL=expoPL_;
+ // if (nuem < 1e11) expoPL-=1.; // TEST!!!
double emis_synch =
sqrt(3.)*M_PI*GYOTO_ELEMENTARY_CHARGE_CGS*GYOTO_ELEMENTARY_CHARGE_CGS
*nuc*sin(theta_mag)/(2.*GYOTO_C_CGS)
- *number_density_PL*(expoPL_-1.)
- *pow(3.*nuc*(expoPL_+1.)*sin(theta_mag)/(4.*nuem),0.5*(expoPL_-1.))
- *exp(-0.5*(expoPL_+1.));
+ *number_density_PL*(expoPL-1.)
+ *pow(3.*nuc*(expoPL+1.)*sin(theta_mag)/(4.*nuem),0.5*(expoPL-1.))
+ *exp(-0.5*(expoPL+1.));
if (emis_synch!=emis_synch) {
throwError("In PolishDoughnut::emissionSynchro_komissarov_PL_direction: "
@@ -477,15 +479,29 @@ double PolishDoughnut::emissionSynchro_komissarov_PL_direction(
double PolishDoughnut::absorptionSynchro_komissarov_PL_direction(
double number_density_PL,double nuem, double nuc, double theta_mag)
const {
+ // cout << "OZEL STUFF: " << number_density_PL <<" " << nuem << " " << nuc << endl;
// From Petrosian & McTiernan 1983, Phys. Fluids 26 (10), eq. 32
- double abs_synch =
+ double CC = 10.23; // for p=3.5
+ double abs_synch_ozel =
+ CC/GYOTO_ELECTRON_MASS_CGS
+ *GYOTO_ELEMENTARY_CHARGE_CGS*GYOTO_ELEMENTARY_CHARGE_CGS/GYOTO_C_CGS
+ *number_density_PL
+ *pow(nuc/nuem,0.5*(expoPL_+3.))
+ *1./nuem;
+ double expoPL=expoPL_;
+ // if (nuem < 1e11) expoPL+=1.; // TEST!!!
+ double abs_synch_petro =
sqrt(3.)*M_PI*GYOTO_ELEMENTARY_CHARGE_CGS*GYOTO_ELEMENTARY_CHARGE_CGS
*nuc*sin(theta_mag)/(2.*GYOTO_C_CGS)
- *number_density_PL*(expoPL_-1.)
- *pow(3.*nuc*(expoPL_+2.)*sin(theta_mag)/(4.*nuem),0.5*expoPL_)
- *exp(-0.5*(expoPL_+2.))
- *(expoPL_+2.)
- /(GYOTO_ELECTRON_MASS_CGS*nuem*nuem);
+ *number_density_PL*(expoPL-1.)
+ *pow(3.*nuc*(expoPL+2.)*sin(theta_mag)/(4.*nuem),0.5*expoPL)
+ *exp(-0.5*(expoPL+2.))
+ *(expoPL+2.)
+ /(GYOTO_ELECTRON_MASS_CGS*pow(nuem,2.)); // 2.5 for Ozel and co...*/
+ // /(GYOTO_ELECTRON_MASS_CGS*nuem*nuem);
+
+ //cout << "diff anu= " << abs_synch_ozel << " " << abs_synch_petro << endl;
+ double abs_synch = abs_synch_petro;
if (abs_synch!=abs_synch) {
throwError("In PolishDoughnut::absorptionSynchro_komissarov_PL_direction: "
@@ -1205,6 +1221,7 @@ void PolishDoughnut::radiativeQ(double Inu[], // output
spectrumBB_->temperature(T_electron);
double Bnu =(*spectrumBB_)(nuem)/GYOTO_INU_CGS_TO_SI; // BB in cgs
+ // cout << "Te= " << T_electron << " " << Theta_elec << endl;
// ***Synchrotron emission coef.
if (!angle_averaged_){
emis_synch_ther=
@@ -1217,7 +1234,8 @@ void PolishDoughnut::radiativeQ(double Inu[], // output
nuem,nuc,theta_mag);
abs_synch_PL=
absorptionSynchro_komissarov_PL_direction(number_density_PL,
- nuem,nuc,theta_mag);
+ nuem,nuc,theta_mag);
+ // emis_synch_PL/Bnu; // TEST!!!
}
}else{
emis_synch_ther=
@@ -1236,6 +1254,7 @@ void PolishDoughnut::radiativeQ(double Inu[], // output
emis_synch=emis_synch_ther+emis_synch_PL;
abs_synch=abs_synch_ther+abs_synch_PL;
+ //cout << "jnu,anu TH,PL= " << emis_synch_PL/emis_synch_ther << " " << abs_synch_ther/abs_synch_PL << endl;
// ***Final increment to intensity (in SI units)
double delta_s =
diff --git a/lib/WorldlineIntegState.C b/lib/WorldlineIntegState.C
index 83e4c5e..8217808 100644
--- a/lib/WorldlineIntegState.C
+++ b/lib/WorldlineIntegState.C
@@ -221,7 +221,15 @@ Worldline::IntegState::Boost::init(Worldline * line,
int Worldline::IntegState::Boost::nextStep(double coord[8], double h1max) {
GYOTO_DEBUG << h1max << endl;
-
+
+ double rr=coord[1], th=coord[2], ph=coord[3];
+ //cout << "r th x y z: " << rr << " " << th << " " << rr*sin(th)*cos(ph) << " " << rr*sin(th)*sin(ph) << " " << rr*cos(th) << endl;
+ //cout << "t r th ph= " << setprecision(17) << coord[0] << " " << rr << " " << th << " " << ph << endl;
+ //cout << "tgt= " << coord[4] << " " << coord[5] << " " << coord[6] << " " << coord[7] << endl;
+ //cout << "norm= " << norm_ << endl;
+ //cout << setprecision(10) << coord[0] << " " << rr << endl;
+ //cout << "delta= " << delta_ << endl;
+
// We first make a C++ std::array out of the bare C array:
std::array<double, 8> inout = {
coord[0], coord[1], coord[2], coord[3],
--
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