cleanup code.

Author: MFraters

source/world_builder/world.cc

@@ -306,12 +306,11 @@ namespace WorldBuilder
 
     const std::array<double, 3> point_3d_cartesian = this->parameters.coordinate_system->natural_to_cartesian_coordinates(coord_3d.get_array());
 
-    // Todo: convert 3d velocity to 2d velocity
     std::vector<double> results = this->properties(point_3d_cartesian, depth, properties);
     unsigned int counter = 0;
-    for (unsigned int i = 0; i < properties.size(); ++i)
+    for (auto property : properties)
       {
-        switch (properties[i][0])
+        switch (property[0])
           {
             case 1:   // temperature
             {
@@ -337,13 +336,8 @@ namespace WorldBuilder
             {
               // convert 3d velocity vector to a 2d one
               Point<2> vector = Point<2>(cartesian);
-              //vector[0] = (results[counter]-cross_section[0][0])/surface_coord_conversions[0];
-              //vector[1] = results[counter+2];
               vector[0] = surface_coord_conversions[0]*results[counter]+surface_coord_conversions[1]*results[counter+1];
               vector[1] = results[counter+2];
-              //vector[2] = 0;
-              //if(vector.norm_square() > delaunator::EPSILON)
-              //  std::cout << counter << ": case 5: vec = " << vector << ", ("<< results[counter] << ":" << results[counter+1] << ":" << results[counter+2] << ")" << ", results[counter] = " << results[counter] << ", cross_section[0][0] = " << cross_section[0][0] << ", surface_coord_conversions[0] = " << surface_coord_conversions[0] << ", 2nd: " << ", cross_section[0][1] = " << cross_section[0][1] << ", surface_coord_conversions[1] = " << surface_coord_conversions[1]<< std::endl;
               results[counter] = surface_coord_conversions[0]*results[counter]+surface_coord_conversions[1]*results[counter+1];
               results[counter+1] = results[counter+2];
               results[counter+2] = 0;
@@ -352,15 +346,15 @@ namespace WorldBuilder
             }
             default:
             {
-              WBAssertThrow(false,
-                            "Internal error: Unimplemented property provided. " <<
+              WBAssert(false,
+                            "Internal error: Unimplemented property provided by internal process. " <<
                             "Only temperature (1), composition (2), grains (3), tag (4) or velocity (5) are allowed. "
-                            "Provided property number was: " << properties[i][0]);
+                            "Provided property number was: " << property[0]);
             }
           }
 
       }
-    return results;//this->properties(point_3d_cartesian, depth, properties);
+    return results;
   }