From 336e35d60fe5f11e6af098ca82e5ed8e3d02175f Mon Sep 17 00:00:00 2001
From: Dominic Marcello <dmarce504@gmail.com>
Date: Wed, 14 Jun 2017 11:12:58 -0600
Subject: [PATCH] Removed un-used code

---
 src/defs.hpp                  |  1 +
 src/node_server.hpp           |  4 ---
 src/node_server_actions_3.cpp | 60 +----------------------------------
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/src/defs.hpp b/src/defs.hpp
index c93e9ce5c..fd541fa59 100644
--- a/src/defs.hpp
+++ b/src/defs.hpp
@@ -22,6 +22,7 @@
 #endif
 
 #define REGRID_CHECK
+#define CHANNEL_CHECK
 //#define OCTOTIGER_HAVE_RADIATION
 
 #ifdef OCTOTIGER_HAVE_RADIATION
diff --git a/src/node_server.hpp b/src/node_server.hpp
index 93210df76..749bf7d46 100644
--- a/src/node_server.hpp
+++ b/src/node_server.hpp
@@ -320,9 +320,6 @@ class node_server: public hpx::components::managed_component_base<node_server> {
     void rho_move(real);
     HPX_DEFINE_COMPONENT_ACTION(node_server,rho_move, rho_move_action);
 
-    void check_channels() const;
-    HPX_DEFINE_COMPONENT_ACTION(node_server,check_channels, check_channels_action);
-
     void run_scf(std::string const& data_dir);
 
 #ifdef RADIATION
@@ -421,7 +418,6 @@ HPX_REGISTER_ACTION_DECLARATION(node_server::get_ptr_action);
 HPX_REGISTER_ACTION_DECLARATION(node_server::diagnostics_action);
 HPX_REGISTER_ACTION_DECLARATION(node_server::timestep_driver_ascend_action);
 HPX_REGISTER_ACTION_DECLARATION(node_server::scf_params_action);
-HPX_REGISTER_ACTION_DECLARATION(node_server::check_channels_action);
 
 #ifdef RADIATION
 HPX_REGISTER_ACTION_DECLARATION(node_server::send_rad_boundary_action);
diff --git a/src/node_server_actions_3.cpp b/src/node_server_actions_3.cpp
index f7d1a5201..c7bf17a7e 100644
--- a/src/node_server_actions_3.cpp
+++ b/src/node_server_actions_3.cpp
@@ -11,59 +11,6 @@
 
 extern options opts;
 
-typedef node_server::check_channels_action check_channels_action_type;
-HPX_REGISTER_ACTION(check_channels_action_type);
-
-hpx::future<void> node_client::check_channels() const {
-	return hpx::async<typename node_server::check_channels_action>(get_unmanaged_gid());
-}
-
-void node_server::check_channels() const {
-	std::vector<hpx::future<void>> futs;
-#ifdef CHANNEL_CHECK
-	if (is_refined) {
-		for (integer c = 0; c != NCHILD; ++c) {
-			futs.push_back(children[c].check_channels());
-		}
-	}
-	for (auto& c : sibling_hydro_channels) {
-		if (c.message_count() > 0) {
-			printf("SIBLING HYDRO CHANNEL FAILURE\n");
-			abort();
-		}
-	}
-	for (auto& c : neighbor_gravity_channels) {
-		if (c.message_count() > 0) {
-			printf("NEIGHBOR GRAVITY CHANNEL FAILURE\n");
-			abort();
-		}
-	}
-	for (auto& c : child_hydro_channels) {
-		if (c.message_count() > 0) {
-			printf("CHILD_HYDRO CHANNEL FAILURE\n");
-			abort();
-		}
-	}
-	for (auto& c : child_gravity_channels) {
-		if (c.message_count() > 0) {
-			printf("CHILD GRAVITY CHANNEL FAILURE\n");
-			abort();
-		}
-	}
-	for (auto i = 0; i != NFACE; ++i) {
-		for (auto& c : niece_hydro_channels[i]) {
-			if (c.message_count() > 0) {
-				printf("NIECE HYDRO CHANNEL FAILURE\n");
-				abort();
-			}
-		}
-	}
-	for( auto& f : futs ) {
-		f.get();
-	}
-#endif
-}
-
 typedef node_server::send_gravity_boundary_action send_gravity_boundary_action_type;
 HPX_REGISTER_ACTION (send_gravity_boundary_action_type);
 
@@ -773,12 +720,7 @@ hpx::future<std::pair<real, diagnostics_t> > node_client::step_with_diagnostics(
 hpx::future<std::pair<real, diagnostics_t> > node_server::step_with_diagnostics(integer steps,
     const std::pair<space_vector, space_vector>& axis, const std::pair<real, real>& l1, real c1, real c2)
 {
-#ifdef CHANNEL_CHECK
-	if( my_location.level() == 0 ) {
-		check_channels();
-	}
-#endif
-    if (is_refined)
+	if (is_refined)
     {
         std::array<hpx::future<std::pair<real, diagnostics_t> >, NCHILD> child_futs;
         for (integer ci = 0; ci != NCHILD; ++ci) {