[sunrise] 6 new revisions pushed by trqu...@gmail.com on 2014-09-26 16:12 GMT

[sun...@googlecode.com]

6 new revisions:

Revision: fb4fdd8b5ea3
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Thu Sep 25 19:55:43 2014 UTC
Log: GCC needs boost/serialization headers included.
https://code.google.com/p/sunrise/source/detail?r=fb4fdd8b5ea3

Revision: b7ae3159353a
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Thu Sep 25 20:04:55 2014 UTC
Log: mcrx::generic_dust_model does not have a scatterers_ attribute.
https://code.google.com/p/sunrise/source/detail?r=b7ae3159353a

Revision: 96934eb04ed8
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Thu Sep 25 20:22:05 2014 UTC
Log: Neither mcrx::grid_cell_emission nor its base classes have a
cell_...
https://code.google.com/p/sunrise/source/detail?r=96934eb04ed8

Revision: 9bae573fd6be
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Thu Sep 25 20:26:24 2014 UTC
Log: mcrx::adaptive_grid does not have a g_ attribute.
https://code.google.com/p/sunrise/source/detail?r=9bae573fd6be

Revision: 4ae1eba99fa8
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Fri Sep 26 00:05:35 2014 UTC
Log: Help gcc with two confusions: 1) return type of...
https://code.google.com/p/sunrise/source/detail?r=4ae1eba99fa8

Revision: 2e3ce662555b
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Fri Sep 26 00:10:53 2014 UTC
Log: Fix gcc confusion over T_data as both a template parameter and
a...
https://code.google.com/p/sunrise/source/detail?r=2e3ce662555b

==============================================================================
Revision: fb4fdd8b5ea3
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Thu Sep 25 19:55:43 2014 UTC
Log: GCC needs boost/serialization headers included.
https://code.google.com/p/sunrise/source/detail?r=fb4fdd8b5ea3

Modified:
/src/mono_poly_abstract.h
/src/ray.h

=======================================
--- /src/mono_poly_abstract.h Wed Mar 21 18:21:06 2012 UTC
+++ /src/mono_poly_abstract.h Thu Sep 25 19:55:43 2014 UTC
@@ -27,6 +27,7 @@
#include "blitz/array.h"
#include "threadlocal.h"
#include <limits>
+#include "boost/serialization/array.hpp"

namespace mcrx {
template<typename T, bool b> struct ispod {};
=======================================
--- /src/ray.h Thu Mar 22 19:50:47 2012 UTC
+++ /src/ray.h Thu Sep 25 19:55:43 2014 UTC
@@ -33,6 +33,7 @@
#include <boost/serialization/serialization.hpp>
#include <boost/serialization/base_object.hpp>
#include <boost/serialization/split_member.hpp>
+#include <boost/serialization/collection_size_type.hpp>
#endif

namespace mcrx {

==============================================================================
Revision: b7ae3159353a
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Thu Sep 25 20:04:55 2014 UTC
Log: mcrx::generic_dust_model does not have a scatterers_ attribute.
https://code.google.com/p/sunrise/source/detail?r=b7ae3159353a

Modified:
/src/dust_model.h

=======================================
--- /src/dust_model.h Wed Mar 21 19:54:13 2012 UTC
+++ /src/dust_model.h Thu Sep 25 20:04:55 2014 UTC
@@ -70,7 +70,7 @@

// no-op implementations of all the dust_model members
void set_wavelength(const T_lambda& lambda) {assert(0); };
- int n_scatterers() const {return scatterers_.size();};
+ int n_scatterers() const {assert(0); return 0;};
const T_scatterer get_scatterer (int i) const {
assert(0); return T_scatterer(); };
T_scatterer get_scatterer (int i) {

==============================================================================
Revision: 96934eb04ed8
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Thu Sep 25 20:22:05 2014 UTC
Log: Neither mcrx::grid_cell_emission nor its base classes have a cell_
attribute. mcrx::divergent_floodlight_emission has a radius_ not a
radius attribute.
https://code.google.com/p/sunrise/source/detail?r=96934eb04ed8

Modified:
/src/emission.h

=======================================
--- /src/emission.h Fri Apr 27 19:23:32 2012 UTC
+++ /src/emission.h Thu Sep 25 20:22:05 2014 UTC
@@ -703,7 +703,7 @@
/** Returns the cell pointer. This is needed because if cells are
unified, we need to be able to restore the cell pointers (very
hoaky) */
- const T_cell* cell() const { return cell_; };
+ const T_cell* cell() const { assert(0); return NULL; };
/** Updates the emitter with geometry from the specified cell. This
is needed because if cells are unified, we need to be able to
restore the cell pointers (very hoaky) */
@@ -962,7 +962,8 @@
// probability is 1/area from position and 1/omega from direction.
const T_float sinhalftheta = sin(0.5*theta_);
const T_float omega = 4*constants::pi*sinhalftheta*sinhalftheta;
- prob = 1.0/(constants::pi*radius*radius*omega);
+ prob = 1.0/(constants::pi*radius_*radius_*omega);
+ assert(0);

// Make a vector of the emission direction and rotate it into the
// correct direction

==============================================================================
Revision: 9bae573fd6be
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Thu Sep 25 20:26:24 2014 UTC
Log: mcrx::adaptive_grid does not have a g_ attribute.
https://code.google.com/p/sunrise/source/detail?r=9bae573fd6be

Modified:
/src/grid.h

=======================================
--- /src/grid.h Wed May 9 21:43:31 2012 UTC
+++ /src/grid.h Thu Sep 25 20:26:24 2014 UTC
@@ -313,9 +313,10 @@
mcrx::adaptive_grid<cell_data_type>::
adaptive_grid (const vec3d & mi, const vec3d & ma,
const std::vector<bool>& structure) :
- g_(), min_(mi), max_(ma), subgrid_block_ (0)
+ min_(mi), max_(ma), subgrid_block_ (0)
{
create_structure(structure);
+ assert(0);
}



==============================================================================
Revision: 4ae1eba99fa8
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Fri Sep 26 00:05:35 2014 UTC
Log: Help gcc with two confusions: 1) return type of
mcrx::xferr<dust_model_type, grid_type>::pop_ray(int& r)
2) integrate_ray as both a template parameter and a method.
https://code.google.com/p/sunrise/source/detail?r=4ae1eba99fa8

Modified:
/src/xfer_impl.h

=======================================
--- /src/xfer_impl.h Tue Apr 24 18:14:23 2012 UTC
+++ /src/xfer_impl.h Fri Sep 26 00:05:35 2014 UTC
@@ -764,7 +764,7 @@
/** Pops a ray, including its cell tracker and action, off of the
local_pending queue. */
template <typename dust_model_type, typename grid_type>
-mcrx::xfer<dust_model_type, grid_type>::T_action
+typename mcrx::xfer<dust_model_type, grid_type>::T_action
mcrx::xfer<dust_model_type, grid_type>::pop_ray(int& r)
{
T_queue_item rso;
@@ -916,7 +916,7 @@
*/
template <typename dust_model_type, typename grid_type>
template <bool do_scatter, bool keep_traversed, bool add_intensity_here,
- bool integrate_ray>
+ bool integrate_ray_>
bool
mcrx::xfer<dust_model_type, grid_type>::
propagate (T_float max_length)
@@ -948,7 +948,7 @@
const T_float dreftau = dust_model.total_reference_abs_length(dn_, b_);
assert (dreftau >= -1e-10);

- if (integrate_ray) {
+ if (integrate_ray_) {
// we are doing ray integrations
assert(!do_scatter);assert(!add_intensity_here);


==============================================================================
Revision: 2e3ce662555b
Branch: gcc-fixes
Author: Tom Quinn <t...@astro.washington.edu>
Date: Fri Sep 26 00:10:53 2014 UTC
Log: Fix gcc confusion over T_data as both a template parameter and a
typedef.
https://code.google.com/p/sunrise/source/detail?r=2e3ce662555b

Modified:
/src/create_grid.h

=======================================
--- /src/create_grid.h Wed Feb 8 23:11:55 2012 UTC
+++ /src/create_grid.h Fri Sep 26 00:10:53 2014 UTC
@@ -85,13 +85,13 @@
aux_grid<adaptive_grid<T_data>, sampling_policy, rng_policy>*)
{
typedef aux_grid<adaptive_grid<T_data>, sampling_policy, rng_policy>
T_grid;
- typedef typename T_grid::T_data T_data;
+ typedef typename T_grid::T_data T_data_;
CCfits::ExtHDU& structure_hdu = open_HDU(input_file, "GRIDSTRUCTURE");
CCfits::ExtHDU& data_hdu = open_HDU(input_file, "GRIDDATA");

// first create the adaptive grid
- boost::shared_ptr<adaptive_grid<T_data> > gg
- (new adaptive_grid<T_data> (structure_hdu, decomp_level));
+ boost::shared_ptr<adaptive_grid<T_data_> > gg
+ (new adaptive_grid<T_data_> (structure_hdu, decomp_level));
// and then the aux_grid
return boost::shared_ptr<T_grid>
(new T_grid (gg, structure_hdu, data_hdu));
@@ -112,7 +112,7 @@
ir_grid<adaptive_grid<T_data>, sampling_policy, rng_policy>*)
{
typedef ir_grid<adaptive_grid<T_data>, sampling_policy, rng_policy>
T_grid;
- typedef typename T_grid::T_data T_data;
+ typedef typename T_grid::T_data T_data_;

CCfits::ExtHDU& structure_hdu = open_HDU(input_file, "GRIDSTRUCTURE");
CCfits::ExtHDU& data_hdu = open_HDU(input_file, "GRIDDATA");
@@ -137,14 +137,14 @@
ir_grid<adaptive_grid<T_data>, sampling_policy, rng_policy>*)
{
typedef ir_grid<adaptive_grid<T_data>, sampling_policy, rng_policy>
T_grid;
- typedef typename T_grid::T_data T_data;
+ typedef typename T_grid::T_data T_data_;

CCfits::ExtHDU& structure_hdu = open_HDU(input_file, "GRIDSTRUCTURE");
CCfits::ExtHDU& data_hdu = open_HDU(input_file, "GRIDDATA");

// first create the adaptive grid
- boost::shared_ptr<adaptive_grid<T_data> > gg
- (new adaptive_grid<T_data> (structure_hdu, decomp_level));
+ boost::shared_ptr<adaptive_grid<T_data_> > gg
+ (new adaptive_grid<T_data_> (structure_hdu, decomp_level));
// then the ir_grid
return boost::shared_ptr<T_grid>
(new T_grid (gg, structure_hdu, data_hdu, dg, lambda));