fixup and cleanup

Author: MFraters

source/world_builder/parameters.cc

@@ -790,11 +790,8 @@ namespace WorldBuilder
                   {
                     WBAssertThrow(false, "Could not convert values of /Litho1.0 path into a String. ");
                   }
-                //std::cout << "flag 160" << std::endl;
-                //WBAssertThrow(false,"Got it! path = " << litho_1_0_path);
                 constexpr int n1 = 40962;
                 constexpr int n_layers = 9;
-                float location_data[40962 * 2];
                 float depth_data[40962 * 9];
                 char tessfile[200];
                 sprintf(tessfile, "%s/litho_depth_data.bin", litho_1_0_path.c_str());
@@ -814,24 +811,18 @@ namespace WorldBuilder
                     WBAssertThrow(false, "ERROR: Could not open file " << tessfile);
                   }
 
-                // fread(&depth_data, sizeof(float), n1 * n_layers, fp);
-                //std::cout << std::endl << litho_1_0_path << std::endl;
-                int counter_location_data = 0;
+                size_t counter_location_data = 0;
                 float latitude, glatitude, longitude = 0;
                 while (fscanf(fp, "%f %f %f", &latitude, &glatitude, &longitude) != EOF)
                   {
-                    const size_t global_index = (counter_location_data/2)*n_layers+layer_type;
+                    const size_t global_index = (counter_location_data/2)*n_layers+static_cast<size_t> (layer_type);
                     result.first.emplace_back(depth_data[global_index]);
                     result.second.emplace_back(longitude * Consts::PI / 180.);
                     result.second.emplace_back(latitude * Consts::PI / 180.);
-                    //std::cout << counter_location_data << "long:lat:depth = " << longitude << ":"
-                    //          << latitude << ", " << ", "
-                    //          << ":" << depth_data[global_index] << " (node:global index:local index = " << counter_location_data/2 << ":" << global_index << ":" << layer_type << ")"<< std::endl;
                     counter_location_data += 2;
                   }
 
                 fclose(fp);
-                // float depth_data[40962 * 9];
               }
             else
               {