FEAT: restart both grids, clean code

Author: aaronjridley

src/main/main.cpp

@@ -24,7 +24,6 @@ int main() {
   try {
     // Create inputs (reading the input file):
     input = Inputs(time);
-
     if (!input.is_ok())
       throw std::string("input initialization failed!");
 
@@ -37,57 +36,48 @@ int main() {
     // cubesphere (6 root)
     Quadtree quadtree(input.get_grid_shape("neuGrid"));
     Quadtree quadtree_ion(input.get_grid_shape("ionGrid"));
-
     if (!quadtree.is_ok())
       throw std::string("quadtree initialization failed!");
 
     // Initialize MPI and parallel aspects of the code:
     didWork = init_parallel(quadtree, quadtree_ion);
-
     if (!didWork)
       throw std::string("init_parallel failed!");
 
     // Everything should be set for the inputs now, so write a restart file:
     didWork = input.write_restart();
-
     if (!didWork)
       throw std::string("input.write_restart failed!");
 
     // Initialize the EUV system:
     Euv euv;
-
     if (!euv.is_ok())
       throw std::string("EUV initialization failed!");
 
     // Initialize the planet:
     Planets planet;
-    MPI_Barrier(aether_comm);
-
     if (!planet.is_ok())
       throw std::string("planet initialization failed!");
 
     // Initialize the indices, read the files, and perturb:
     Indices indices;
     didWork = read_and_store_indices(indices);
-    MPI_Barrier(aether_comm);
-
     if (!didWork)
       throw std::string("read_and_store_indices failed!");
 
     // Perturb the inputs if user has asked for this
     indices.perturb();
-    MPI_Barrier(aether_comm);
 
     // Initialize Geographic grid:
     Grid gGrid("neuGrid");
     didWork = gGrid.init_geo_grid(quadtree, planet);
-    MPI_Barrier(aether_comm);
-
     if (!didWork)
       throw std::string("init_geo_grid failed!");
 
     // Find interpolation coefs for the ghostcells if cubesphere grid
-    didWork = find_ghostcell_interpolation_coefs(gGrid);
+    //didWork = find_ghostcell_interpolation_coefs(gGrid);
+    //if (!didWork)
+    //  throw std::string("find_ghostcell_interpolation_coefs failed!");
 
     // Calculate centripetal acceleration, since this is a constant
     // vector on the grid:
@@ -107,14 +97,13 @@ int main() {
       didWork = mGrid.init_geo_grid(quadtree, planet);
       mGrid.set_IsGeoGrid(false);
     }
-    // Initialize Neutrals on geographic grid:
+
+    // Initialize Neutrals on geographic and magnetic grids:
     Neutrals neutrals(gGrid, planet, time, indices);
-    // Initialize Neutrals on magnetic grid:
     Neutrals neutralsMag(mGrid, planet, time, indices);
 
-    // Initialize Ions on geographic grid:
+    // Initialize Ions on geographic and magnetic grids:
     Ions ions(gGrid, planet);
-    // Initialize Ions on magnetic grid:
     Ions ionsMag(mGrid, planet);
 
     // -----------------------------------------------------------------
@@ -151,9 +140,8 @@ int main() {
     read_collision_file(neutrals, ions);
     read_collision_file(neutralsMag, ionsMag);
 
-    // Initialize ion temperatures from neutral temperature
+    // Initialize ion temperatures from neutral temperature (both grids)
     ions.init_ion_temperature(neutrals, gGrid);
-    // Initialize ion temperatures from neutral temperature (on Mag Grid)
     ionsMag.init_ion_temperature(neutralsMag, mGrid);
 
     // Initialize electrodynamics and check if electrodynamics times
@@ -239,12 +227,14 @@ int main() {
       if (!time.check_time_gate(input.get_dt_write_restarts())) {
         report.print(3, "Writing restart files");
 
-        didWork = neutrals.restart_file(input.get_restartout_dir(), DoWrite);
+        didWork = neutrals.restart_file(input.get_restartout_dir(), gGrid.get_gridtype(), DoWrite);
+        didWork = neutralsMag.restart_file(input.get_restartout_dir(), mGrid.get_gridtype(), DoWrite);
 
         if (!didWork)
           throw std::string("Writing Restart for Neutrals Failed!!!\n");
 
-        didWork = ions.restart_file(input.get_restartout_dir(), DoWrite);
+        didWork = ions.restart_file(input.get_restartout_dir(), gGrid.get_gridtype(), DoWrite);
+        didWork = ionsMag.restart_file(input.get_restartout_dir(), mGrid.get_gridtype(), DoWrite);
 
         if (!didWork)
           throw std::string("Writing Restart for Ions Failed!!!\n");