CarpetIOF5: Explicitly convert vect<int> to vect<CCTK_REAL>

darcs-hash:20060606225144-dae7b-d2a4357af5c7e144759a5746126b5fec22147573.gz

2 files changed, 10 insertions, 9 deletions

diff --git a/CarpetDev/CarpetIOF5/src/coordinate_system.cc b/CarpetDev/CarpetIOF5/src/coordinate_system.cc
index 3e0aa8fd8..b7660c0b1 100644
--- a/CarpetDev/CarpetIOF5/src/coordinate_system.cc
+++ b/CarpetDev/CarpetIOF5/src/coordinate_system.cc
@@ -64,7 +64,7 @@ namespace CarpetIOF5 {
         m_level_origin (level_origin),
         m_level_delta (level_delta)
     {
-      assert (all (m_level_delta > 0));
+      assert (all (m_level_delta > (CCTK_REAL) 0));
       
       init();
       
@@ -81,7 +81,7 @@ namespace CarpetIOF5 {
                                    vect<int, dim> const & level_offset_denominator)
       : coordinate_system_t (topology)
     {
-      assert (all (coarse_delta > 0));
+      assert (all (coarse_delta > (CCTK_REAL) 0));
       assert (all (level_offset_denominator > 0));
       
       mesh_refinement_topology_t * mesh_refinement_topology
@@ -111,7 +111,7 @@ namespace CarpetIOF5 {
     void Cartesian_coordinate_system_t::
     init ()
     {
-      assert (all (m_level_delta > 0));
+      assert (all (m_level_delta > (CCTK_REAL) 0));
       
       ostringstream namebuf;
       namebuf << "Cartesian 3D, x0=" << m_level_origin
@@ -136,7 +136,7 @@ namespace CarpetIOF5 {
       const
     {
       return (coordinate_system_t::invariant()
-              and all (m_level_delta > 0));
+              and all (m_level_delta > (CCTK_REAL) 0));
     }
     
   } // namespace F5
diff --git a/CarpetDev/CarpetIOF5/src/topology.cc b/CarpetDev/CarpetIOF5/src/topology.cc
index 9779dc040..85188c7ac 100644
--- a/CarpetDev/CarpetIOF5/src/topology.cc
+++ b/CarpetDev/CarpetIOF5/src/topology.cc
@@ -132,15 +132,16 @@ namespace CarpetIOF5 {
                                   vect<CCTK_REAL, dim> & level_delta)
       const
     {
-      assert (all (coarse_delta > 0));
+      assert (all (coarse_delta > (CCTK_REAL) 0));
       assert (all (level_offset_denominator > 0));
       
-      vect<CCTK_REAL, dim> const one = 1;
-      level_delta = coarse_delta / m_level_refinement_factor;
+      level_delta
+        = coarse_delta / vect<CCTK_REAL, dim> (m_level_refinement_factor);
       level_origin
         = (coarse_origin
-           + (level_offset * one / level_offset_denominator
-              / m_max_refinement_factor));
+           + (vect<CCTK_REAL, dim> (level_offset)
+              / vect<CCTK_REAL, dim> (level_offset_denominator)
+              / vect<CCTK_REAL, dim> (m_max_refinement_factor)));
     }