STY: Astyle, yo

Author: aaronjridley

src/containers_io.cpp

@@ -212,15 +212,15 @@ bool OutputContainer::write() {
 
 bool OutputContainer::read() {
 
-    bool didWork = true;
+  bool didWork = true;
 
-    if (output_type == binary_type)
-        didWork = read_container_binary();
+  if (output_type == binary_type)
+    didWork = read_container_binary();
 
-    if (output_type == netcdf_type)
-        didWork = read_container_netcdf();
+  if (output_type == netcdf_type)
+    didWork = read_container_netcdf();
 
-    return didWork;
+  return didWork;
 }
 
 
@@ -307,62 +307,64 @@ bool OutputContainer::write_container_header() {
 
 bool OutputContainer::read_container_binary() {
 
-    std::string function = "OutputContainer::read_container_binary";
-    static int iFunction = -1;
-    report.enter(function, iFunction);
-
-    bool didWork = true;
-    std::string bin_filename = directory + "/" + filename + ".bin";
-    std::string json_filename = directory + "/" + filename + ".json";
+  std::string function = "OutputContainer::read_container_binary";
+  static int iFunction = -1;
+  report.enter(function, iFunction);
 
-    json header = read_json(json_filename);
+  bool didWork = true;
+  std::string bin_filename = directory + "/" + filename + ".bin";
+  std::string json_filename = directory + "/" + filename + ".json";
 
-    if (report.test_verbose(2)) {
-        std::cout << "reading binary restart\n --> json header is here:\n";
-        std::cout << std::setw(2) << header;
-    }
+  json header = read_json(json_filename);
 
-    int64_t iVar, nVars = header["nVars"];
-    int64_t iX, nX = header["nX"];
-    int64_t iY, nY = header["nY"];
-    int64_t iZ, nZ = header["nZ"];
-    int64_t iTotalSize = nX * nY * nZ;
+  if (report.test_verbose(2)) {
+    std::cout << "reading binary restart\n --> json header is here:\n";
+    std::cout << std::setw(2) << header;
+  }
 
-    float *variable_array = new float[iTotalSize];
-    arma_cube value_scgc;
-    value_scgc.set_size(nX, nY, nZ);
-    int64_t index;
+  int64_t iVar, nVars = header["nVars"];
+  int64_t iX, nX = header["nX"];
+  int64_t iY, nY = header["nY"];
+  int64_t iZ, nZ = header["nZ"];
+  int64_t iTotalSize = nX * nY * nZ;
 
-    std::ifstream binary;
-    binary.open(bin_filename, ios::binary | ios::in);
+  float *variable_array = new float[iTotalSize];
+  arma_cube value_scgc;
+  value_scgc.set_size(nX, nY, nZ);
+  int64_t index;
 
-    // Now, read and store variable-by-variable
+  std::ifstream binary;
+  binary.open(bin_filename, ios::binary | ios::in);
 
-    for (iVar = 0; iVar < nVars; iVar++) {
+  // Now, read and store variable-by-variable
 
-        // Read from the binary file
-        binary.read((char *) variable_array, iTotalSize * sizeof(float));
+  for (iVar = 0; iVar < nVars; iVar++) {
 
-        for (iZ = 0; iZ < nZ; iZ++) {
-            for (iY = 0; iY < nY; iY++) {
-                for (iX = 0; iX < nX; iX++) {
-                    // Python ordering!
-                    index = iX + iY * nX + iZ * nY * nX;
-                    value_scgc(iX, iY, iZ) = variable_array[index];
-                }
-            }
-        }
+    // Read from the binary file
+    binary.read((char *) variable_array, iTotalSize * sizeof(float));
 
-        // Store in the container:
-        if (report.test_verbose(2)) {
-            std::cout << "Storing Variable : ";
-            std::cout << header["variables"][iVar] << " : " << value_scgc(int(nX/2), int(nY/2), int(nZ/2)) << "\n";
+    for (iZ = 0; iZ < nZ; iZ++) {
+      for (iY = 0; iY < nY; iY++) {
+        for (iX = 0; iX < nX; iX++) {
+          // Python ordering!
+          index = iX + iY * nX + iZ * nY * nX;
+          value_scgc(iX, iY, iZ) = variable_array[index];
         }
+      }
+    }
 
-        store_variable(header["variables"][iVar], header["units"][iVar], value_scgc);
+    // Store in the container:
+    if (report.test_verbose(2)) {
+      std::cout << "Storing Variable : ";
+      std::cout << header["variables"][iVar] << " : " << value_scgc(int(nX / 2),
+                int(nY / 2), int(nZ / 2)) << "\n";
     }
-    report.exit(function);
-    return didWork;
+
+    store_variable(header["variables"][iVar], header["units"][iVar], value_scgc);
+  }
+
+  report.exit(function);
+  return didWork;
 }
 
 //----------------------------------------------------------------------

src/exchange_messages.cpp

@@ -30,7 +30,7 @@
 
 // -----------------------------------------------------------------------------
 // This is the main exchange messages for the neutrals.
-//   We are exchanging densities, temperatures, and velocities   
+//   We are exchanging densities, temperatures, and velocities
 // -----------------------------------------------------------------------------
 
 
@@ -1116,6 +1116,7 @@ bool test_ghostcell_interpolation(Grid &grid) {
       }
     }
   }
+
   report.exit(function);
   return didWork;
 }

src/init_geo_grid.cpp

@@ -955,8 +955,9 @@ bool Grid::init_geo_grid(Quadtree quadtree,
     DidWork = read_restart(input.get_restartin_dir());
   } else {
     if (input.get_is_cubesphere()) {
-      if (input.get_do_restart()) 
+      if (input.get_do_restart())
         report.print(0, "Not restarting the grid - it is too complicated!");
+
       create_cubesphere_grid(quadtree);
     } else
       create_sphere_grid(quadtree);

src/output.cpp

@@ -328,6 +328,7 @@ bool output(const Neutrals &neutrals,
       AllOutputContainers[iOutput].clear_variables();
 
     }
+
     if (!didWork)
       break;
   }