diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2013-08-04 00:21:21 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2013-08-04 00:21:21 -0400 |
| commit | dbe1636f5ed6ec4859719ff08f731735e123c59e (patch) | |
| tree | fc221043d2c9ac3a31cb1b630f6a3713e51fbded | |
| parent | 25b21b980e695c15c23b106c28a562822ae4bbf9 (diff) | |
Carpet: Do not use dynamic_cast
| -rw-r--r-- | Carpet/CarpetLib/src/data.cc | 9 | ||||
| -rw-r--r-- | Carpet/CarpetRegrid/src/automatic.cc | 8 | ||||
| -rw-r--r-- | CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc index fa1b3c92e..4f98f7ffa 100644 --- a/Carpet/CarpetLib/src/data.cc +++ b/Carpet/CarpetLib/src/data.cc @@ -573,7 +573,8 @@ copy_from_innerloop (gdata const * const gsrc, ibbox const & srcregbox, islab const * restrict const slabinfo) { - data const * const src = dynamic_cast <data const *> (gsrc); + //data const * const src = dynamic_cast <data const *> (gsrc); + data const * const src = (data const *) gsrc; assert (has_storage() and src->has_storage()); assert (proc() == src->proc()); @@ -665,7 +666,8 @@ transfer_time (vector <gdata const *> const & gsrcs, tmps.AT(tl)->allocate (dstbox, this->proc()); assert (gsrcs.AT(tl)); - data const * const src = dynamic_cast <data const *> (gsrcs.AT(tl)); + // data const * const src = dynamic_cast <data const *> (gsrcs.AT(tl)); + data const * const src = (data const *) gsrcs.AT(tl); tmps.AT(tl)->transfer_p_r (src, dstbox, srcbox, slabinfo, order_space); } @@ -681,7 +683,8 @@ transfer_time (vector <gdata const *> const & gsrcs, assert ((int)gsrcs.size() > timelevel0); assert ((int)times.size() > timelevel0); - data const * const src = dynamic_cast <data const *> (gsrcs.AT(timelevel0)); + // data const * const src = dynamic_cast <data const *> (gsrcs.AT(timelevel0)); + data const * const src = (data const *) gsrcs.AT(timelevel0); transfer_p_r (src, dstbox, srcbox, slabinfo, order_space); diff --git a/Carpet/CarpetRegrid/src/automatic.cc b/Carpet/CarpetRegrid/src/automatic.cc index a524edae4..6ce3a5547 100644 --- a/Carpet/CarpetRegrid/src/automatic.cc +++ b/Carpet/CarpetRegrid/src/automatic.cc @@ -46,9 +46,11 @@ namespace CarpetRegrid { assert (CCTK_GroupDimI(gi) == dim); assert (arrdata.at(gi).at(Carpet::map).data.at(vi-v1)); - const gf<CCTK_REAL>& errorgf - = (*dynamic_cast<const gf<CCTK_REAL>*> - (arrdata.at(gi).at(Carpet::map).data.at(vi-v1))); + // const gf<CCTK_REAL>& errorgf + // = (*dynamic_cast<const gf<CCTK_REAL>*> + // (arrdata.at(gi).at(Carpet::map).data.at(vi-v1))); + const gf<CCTK_REAL>& errorgf = + *(const gf<CCTK_REAL>*)arrdata.at(gi).at(Carpet::map).data.at(vi-v1); assert (not smart_outer_boundaries); diff --git a/CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc b/CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc index b8d3041cc..0fe45da38 100644 --- a/CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc +++ b/CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc @@ -84,8 +84,10 @@ namespace CarpetIOF5 { assert (all (coarse_delta > (CCTK_REAL) 0)); assert (all (level_offset_denominator > 0)); + // mesh_refinement_topology_t * mesh_refinement_topology + // = dynamic_cast<mesh_refinement_topology_t *> (& topology); mesh_refinement_topology_t * mesh_refinement_topology - = dynamic_cast<mesh_refinement_topology_t *> (& topology); + = (mesh_refinement_topology_t *) (& topology); assert (mesh_refinement_topology != 0); mesh_refinement_topology ->calculate_level_origin_delta (coarse_origin, coarse_delta, |